From 0d53bff197149d4328d388093e9a71786e37415e Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 30 Jun 2015 15:57:39 +0000
Subject: [PATCH] Documentation changes (STR #4651)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12767 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 CHANGES-2.0.txt              | 1 +
 doc/help/man-cupsd.conf.html | 5 +++--
 man/cupsd.conf.man.in        | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 55a4eb777b..771fd6b8f3 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -7,6 +7,7 @@ CHANGES IN CUPS V2.0.4
 	- Fixed redirection in the web interface (STR #4538)
 	- The IPP backend did not respond to side-channel requests (STR #4645)
 	- The scheduler did not start all pending jobs at once (STR #4646)
+	- Documentation changes (STR #4651)
 
 
 CHANGES IN CUPS V2.0.3
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index f378bffa7e..c2ef877e2c 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -240,7 +240,8 @@ The following percent sequences are recognized:
     "%u" inserts the username.
 
 </pre>
-The default is "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}".
+The default is the empty string, which disables page logging.
+The string "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}" creates a page log with the standard items.
 <dt><a name="PassEnv"></a><b>PassEnv </b><i>variable </i>[ ... <i>variable </i>]
 <dd style="margin-left: 5.0em">Passes the specified environment variable(s) to child processes.
 <dt><a name="Policy"></a><b>&lt;Policy </b><i>name</i><b>> </b>... <b>&lt;/Policy></b>
@@ -588,7 +589,7 @@ Require authentication for accesses from outside the 10. network:
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2014 by Apple Inc.
+Copyright &copy; 2007-2015 by Apple Inc.
 
 </body>
 </html>
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index a9e8893fb8..5cf8c88061 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -3,7 +3,7 @@
 .\"
 .\" cupsd.conf man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2015 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,7 +12,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" "20 October 2014" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "30 June 2015" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -369,7 +369,8 @@ The following percent sequences are recognized:
     "%u" inserts the username.
 
 .fi
-The default is "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}".
+The default is the empty string, which disables page logging.
+The string "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}" creates a page log with the standard items.
 .\"#PassEnv
 .TP 5
 \fBPassEnv \fIvariable \fR[ ... \fIvariable \fR]
@@ -869,7 +870,7 @@ 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-2014 by Apple Inc.
+Copyright \[co] 2007-2015 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"
-- 
2.47.2