Documentation changes (Issue #4781)

diff --git a/CHANGES.txt b/CHANGES.txt
index b9fe4ff8656fed4c3ab52a6dbb36235d8f79c4af..4a61f266b3fdd3add2b27b235b95b23241f92f67 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
-CHANGES.txt - 2.2b1 - 2016-03-24
+CHANGES.txt - 2.2b1 - 2016-03-30
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
 
+       - Documentation changes (Issue #4781)
        - The LPD mini-daemon now detects invalid UTF-8 sequences in job,
          document, and user names (Issue #4748)
        - The IPP backend now continues on to the next job when the remote

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 5cf8c88061b473049b2b233d1ecb41485c1c006f..a05c4a657b284e7736cefa1922c6852cb8473f8b 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,9 +1,7 @@
 .\"
-.\" "$Id$"
-.\"
 .\" cupsd.conf man page for CUPS.
 .\"
-.\" Copyright 2007-2015 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,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 cupsd.conf 5 "CUPS" "30 June 2015" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "29 March 2016" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -780,6 +778,7 @@ The group name "@SYSTEM" corresponds to the list of groups defined by the System
 .BR cups-files.conf (5)
 file.
 The group name "@OWNER" corresponds to the owner of the resource, for example the person that submitted a print job.
+Note: The 'root' user is not special and must be granted privileges like any other user account.
 .TP 5
 \fBRequire valid-user\fR
 Specifies that any authenticated user is acceptable.
@@ -870,7 +869,4 @@ Require authentication for accesses from outside the 10. network:
 .BR subscriptions.conf (5),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2015 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
+Copyright \[co] 2007-2016 by Apple Inc.

diff --git a/man/lpadmin.man b/man/lpadmin.man
index c0283f2da438760f25f15c60f046f5f7eb17623a..757e631b3e9de51e17f259e7b7ef6910df2ce027 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,9 +1,7 @@
 .\"
-.\" "$Id$"
-.\"
 .\" lpadmin man page for CUPS.
 .\"
-.\" Copyright 2007-2015 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,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 lpadmin 8 "CUPS" "19 October 2015" "Apple Inc."
+.TH lpadmin 8 "CUPS" "29 March 2016" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -171,6 +169,7 @@ If the resulting class becomes empty it is removed.
 Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
+Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 .TP 5
 \fB\-v "\fIdevice-uri\fB"\fR
 Sets the \fIdevice-uri\fR attribute of the printer queue.
@@ -211,7 +210,4 @@ Create an IPP Everywhere print queue:
 .BR lpoptions (1),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2015 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
+Copyright \[co] 2007-2016 by Apple Inc.