Re-document that file devices do not work with raw queues, and move FileDevice

to the list of deprecated configuration directives (Issue #5117)

diff --git a/CHANGES.md b/CHANGES.md
index d79faa8b1164ad2df8c9dc90e190924a6f9ca028..5b1fd2cadb432081102e2bdf8b92b3df4837633b 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,6 +40,9 @@ CHANGES IN CUPS V2.2.5
 - The scheduler woke up once per second to remove old temporary queues
   (Issue #5100)
 - Added USB quirk rule for Kyocera printer (Issue #5102, Issue #5103)
+- Re-documented the limits of `file:///...` device URIs and moved the FileDevice
+  directive in `cups-files.conf` to the list of deprecated configuration
+  directives (Issue #5117)
 - `httpAddrConnect` leaked sockets in certain circumstances, causing some
   printers to hang (rdar://31965686)
 - Fixed an issue with Chinese localizations on macOS (rdar://32419311)

diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 965450550bbb3a3f2bf127dece2972a60942a450..2ed4686616ff738834f6fafe9e2c5ab5792bbbfa 100644 (file)
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -10,7 +10,7 @@
 .\" which should have been included with this file.  If this file is
 .\" file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cups-files.conf 5 "CUPS" "28 August 2017" "Apple Inc."
+.TH cups-files.conf 5 "CUPS" "21 September 2017" "Apple Inc."
 .SH NAME
 cups\-files.conf \- file and directory configuration file for cups
 .SH DESCRIPTION
@@ -129,13 +129,6 @@ Log file creation or write errors are fatal.
 .B permissions
 Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions.
 .RE
-.\"#FileDevice
-.TP 5
-\fBFileDevice Yes\fR
-.TP 5
-\fBFileDevice No\fR
-Specifies whether the file pseudo-device can be used for new printer queues.
-The URI "file:///dev/null" is always allowed.
 .\"#Group
 .TP 5
 \fBGroup \fIgroup-name-or-number\fR
@@ -229,6 +222,16 @@ Specifies the user name or ID that is used when running external programs.
 The default is "lp".
 .SS DEPRECATED DIRECTIVES
 The following directives are deprecated and will be removed from a future version of CUPS:
+.\"#FileDevice
+.TP 5
+\fBFileDevice Yes\fR
+.TP 5
+\fBFileDevice No\fR
+Specifies whether the file pseudo-device can be used for new printer queues.
+The URI "file:///dev/null" is always allowed.
+File devices cannot be used with "raw" print queues - a PPD file is required.
+The specified file is overwritten for every print job.
+Writing to directories is not supported.
 .\"#FontPath
 .TP 5
 \fBFontPath \fIdirectory[:...:directoryN]\fR