From ffa2ca90d54cee938def492abe97894f784d8a78 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 8 Jul 2013 21:15:13 +0000
Subject: [PATCH] Update documentation to not embed unstable configuration
 values, now that man pages are part of the repository...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11109 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 configure.in                         |   1 -
 doc/Makefile                         |   1 -
 doc/help/man-client.conf.html        |  11 +-
 doc/help/man-cups-deviced.html       |   4 +-
 doc/help/man-cups-driverd.html       |   6 +-
 doc/help/man-cups-files.conf.html    |   2 +-
 doc/help/man-cups-lpd.html           |   4 +-
 doc/help/man-cups-snmp.html          |   5 +-
 doc/help/man-cupsaddsmb.html         |  35 +-----
 doc/help/man-cupsd.conf.html         |   4 +-
 doc/help/man-cupsd.html              |   2 +-
 doc/help/man-lpoptions.html          |   4 +-
 doc/help/ref-cups-files-conf.html.in |  47 +++----
 doc/help/ref-cupsd-conf.html.in      |  25 ++--
 doc/help/standard.html.in            | 181 ---------------------------
 man/client.conf.man.in               |   6 +-
 man/cups-deviced.man.in              |   6 +-
 man/cups-driverd.man.in              |  10 +-
 man/cups-files.conf.man.in           |   4 +-
 man/cups-lpd.man.in                  |   6 +-
 man/cups-snmp.man.in                 |   9 +-
 man/cupsaddsmb.man.in                |  44 +------
 man/cupsd.conf.man.in                |   6 +-
 man/cupsd.man.in                     |   4 +-
 man/lpoptions.man.in                 |   6 +-
 25 files changed, 89 insertions(+), 344 deletions(-)
 delete mode 100644 doc/help/standard.html.in

diff --git a/configure.in b/configure.in
index fd0e079db..c9bde6700 100644
--- a/configure.in
+++ b/configure.in
@@ -70,7 +70,6 @@ AC_OUTPUT(Makedefs
 	  desktop/cups.desktop
 	  doc/help/ref-cups-files-conf.html
 	  doc/help/ref-cupsd-conf.html
-	  doc/help/standard.html
 	  doc/index.html
 	  man/client.conf.man
 	  man/cups-deviced.man
diff --git a/doc/Makefile b/doc/Makefile
index b6af04c1f..620ad128c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -125,7 +125,6 @@ HELPFILES	=	\
 			help/spec-ppd.html \
 			help/spec-raster.html \
 			help/spec-stp.html \
-			help/standard.html \
 			help/translation.html \
 			help/whatsnew.html
 
diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index dfcac80f6..a18e8dca2 100644
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -11,7 +11,7 @@
 client.conf - client configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <i>client.conf</i> file configures the CUPS client and is
-normally located in the <i>/private/etc/cups</i> or <i>~/.cups</i>
+normally located in the <i>/etc/cups</i> or <i>~/.cups</i>
 directory. Each line in the file can be a configuration
 directive, a blank line, or a comment. Comment lines start with
 the # character.
@@ -36,7 +36,7 @@ location.
 <dd>Specifies the Kerberos service name that is used for authentication, typically
 "host", "http", or "ipp". CUPS adds the remote hostname
 ("name@server.example.com") for you. The default name is
-"host".
+"http".
 </dd>
 <dt>ServerName hostname-or-ip-address[:port]
 </dt>
@@ -47,6 +47,13 @@ location.
 <dd>Specifies the address and optionally the port to use when connecting to the
 server. <b>Note: Not supported on OS X 10.7 or later.</b>
 </dd>
+<dt>ServerName hostname-or-ip-address[:port]/version=1.1
+</dt>
+<dd></dd>
+<dd>Specifies the address and optionally the port to use when connecting to a
+server running CUPS 1.3.12 and earlier. <b>Note: Not supported on OS X 10.7 or
+later.</b>
+</dd>
 <dt>User name
 </dt>
 <dd></dd>
diff --git a/doc/help/man-cups-deviced.html b/doc/help/man-cups-deviced.html
index a64b7a707..df2525085 100644
--- a/doc/help/man-cups-deviced.html
+++ b/doc/help/man-cups-deviced.html
@@ -14,8 +14,8 @@ cups-deviced - cups device daemon
 </b><i>request-id limit user-id options
 </i><h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 <i>cups-deviced</i> polls the backends in
-<i>/usr/libexec/cups/backend</i> for a list of available devices.
-It is run by <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a> in response to a
+<i>/usr/lib/cups/backend</i> or <i>/usr/libexec/cups/backend</i> (OS X) for a
+list of available devices. It is run by <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a> in response to a
 <i>CUPS-Get-Devices</i> request. The output format is an IPP
 response message. The <i>request-id</i> argument is the request ID
 from the original IPP request, typically 1. The <i>limit</i>
diff --git a/doc/help/man-cups-driverd.html b/doc/help/man-cups-driverd.html
index 1fe857272..0fc9183a6 100644
--- a/doc/help/man-cups-driverd.html
+++ b/doc/help/man-cups-driverd.html
@@ -36,9 +36,9 @@ accordingly.
 <h2 class="title"><a name="DRIVERS">Drivers</a></h2>
 Drivers can be static PPD files under the
 <i>/usr/share/cups/model</i> directory or programs under the
-<i>/usr/libexec/cups/driver</i> directory. Static PPD files must
-conform to the Adobe PPD File Format Specification version 4.3
-and may be compressed using the <i>gzip(1)</i> program. Driver
+<i>/usr/lib/cups/driver</i> or <i>/usr/libexec/cups/driver</i> (OS X) directories.
+Static PPD files must conform to the Adobe PPD File Format Specification version
+4.3 and may be compressed using the <i>gzip(1)</i> program. Driver
 programs must implement the command-line interface shown in the
 next section.
 <h3><a name="DRIVER_PROGRAMS">Driver Programs</a></h3>
diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 2d686e9e2..8c3a610fd 100644
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -12,7 +12,7 @@ cups-files.conf - file and directory configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <i>cups-files.conf</i> file configures the files and directories used by the
 CUPS scheduler, <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a>.  It is normally located in the
-<i>/private/etc/cups</i> directory.
+<i>/etc/cups</i> directory.
 <p>Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
 <h2 class="title"><a name="DIRECTIVES">Directives</a></h2>
diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index 69f098db4..fc891605a 100644
--- a/doc/help/man-cups-lpd.html
+++ b/doc/help/man-cups-lpd.html
@@ -27,7 +27,7 @@ add the following line to the <i>inetd.conf</i> file to enable the
 <br>
 <pre>
 
-    printer stream tcp nowait lp /usr/libexec/cups/daemon/cups-lpd cups-lpd \
+    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \
         -o document-format=application/octet-stream
 </pre>
 <p><p><b>Note:</b> If you are using Solaris 10 or higher, you must run
@@ -46,7 +46,7 @@ named <i>/etc/xinetd.d/cups</i> containing the following lines:
         user = lp
 	group = sys
 	passenv =
-        server = /usr/libexec/cups/daemon/cups-lpd
+        server = /usr/lib/cups/daemon/cups-lpd
 	server_args = -o document-format=application/octet-stream
     }
 </pre>
diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index c354a6206..d3d1a6a7a 100644
--- a/doc/help/man-cups-snmp.html
+++ b/doc/help/man-cups-snmp.html
@@ -10,6 +10,9 @@
 <h2 class="title"><a name="NAME">Name</a></h2>
 snmp - cups snmp backend
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
+<b>/usr/lib/cups/backend/snmp
+</b><i>ip-address-or-hostname
+</i><br>
 <b>/usr/libexec/cups/backend/snmp
 </b><i>ip-address-or-hostname
 </i><br>
@@ -34,7 +37,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port
 Monitor MIBs along with some vendor private MIBs and intelligent port probes to
 determine the correct device URI and make and model for each printer.
 <h2 class="title"><a name="CONFIGURATION">Configuration</a></h2>
-The SNMP backend reads the /private/etc/cups/snmp.conf configuration file, if
+The SNMP backend reads the /etc/cups/snmp.conf configuration file, if
 present, to set the default broadcast address, community name, and logging
 level. The configuration file is documented in <a href='man-cups-snmp.conf.html?TOPIC=Man+Pages'>cups-snmp.conf(5)</a>. The
 DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL environment
diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html
index 37349460e..0bb0ddcd9 100644
--- a/doc/help/man-cupsaddsmb.html
+++ b/doc/help/man-cupsaddsmb.html
@@ -114,10 +114,7 @@ Windows 2000 or higher in the
 drivers and
 %WINDIR%\SYSTEM32\SPOOL\DRIVERS\X64\3 folder for 64-bit
 drivers.
-<p>The CUPS printer driver is preferred over the Microsoft driver
-since it supports the page-label, job-billing, and
-job-hold-until options fully on all printers. However, currently
-only Windows 2000 and higher is supported by the Microsoft
+<p>However, currently only Windows 2000 and higher is supported by the Microsoft
 driver, so you will also need to get the Adobe driver to support
 Windows 95, 98, and Me clients. The Adobe and Microsoft drivers
 for Windows 2000 are identical.
@@ -137,36 +134,6 @@ as named below:
 you use the lowercase filenames shown above, otherwise
 <i>cupsaddsmb</i> will fail to export the drivers.
 
-<h2 class="title"><a name="CUPS_POSTSCRIPT_DRIVERS_FOR_WINDOWS">Cups Postscript Drivers For Windows</a></h2>
-<i>cupsaddsmb</i> can use the CUPS v6 PostScript printer driver
-for Windows, which is available for download from the CUPS web
-site.
-<p>The CUPS printer driver is preferred over the Adobe and
-Microsoft drivers since it supports the page-label, job-billing,
-and job-hold-until options fully on all printers. However,
-currently only Windows 2000 and higher is supported by the CUPS
-driver, so you will also need to get the Adobe driver to support
-Windows 95, 98, and Me clients.
-<p>Once you have extracted the driver files, copy the 32-bit drivers
-to the <i>/usr/share/cups/drivers</i> directory and the 64-bit
-drivers to the <i>/usr/share/cups/drivers/x64</i> directory exactly
-as named below:
-<pre>
-
-    [Windows 2000 and higher]
-    cups6.inf (from www.cups.org)
-    cups6.ini (from www.cups.org)
-    cupsps6.dll (from www.cups.org)
-    cupsui6.dll (from www.cups.org)
-    ps5ui.dll (from your Windows system)
-    pscript.hlp (from your Windows system)
-    pscript.ntf (from your Windows system)
-    pscript5.dll (from your Windows system)
-</pre>
-<p><b>Note:</b> Unlike Windows, case is significant - make sure that
-you use the lowercase filenames shown above, otherwise
-<i>cupsaddsmb</i> will fail to export the drivers.
-
 <h2 class="title"><a name="ADOBE_POSTSCRIPT_DRIVERS_FOR_WINDOWS_95,_98,_AND_ME">Adobe Postscript Drivers For Windows 95, 98, And Me</a></h2>
 <i>cupsaddsmb</i> can use the Adobe PostScript printer driver for
 Windows 95, 98, and ME, which are available for download from the
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 032b8db87..227ccfe2f 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -11,7 +11,7 @@
 cupsd.conf - server configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <i>cupsd.conf</i> file configures the CUPS scheduler, <a href='man-cupsd.html?TOPIC=Man+Pages'>cupsd(8)</a>.  It
-is normally located in the <i>/private/etc/cups</i> directory. <b>Note:</b>
+is normally located in the <i>/etc/cups</i> directory. <b>Note:</b>
 File, directory, and user configuration directives that used to be allowed in
 the <i>cupsd.conf</i> file are now stored in the <a href='man-cups-files.conf.html?TOPIC=Man+Pages'>cups-files.conf(5)</a> instead
 in order to prevent certain types of privilege escalation attacks.
@@ -242,7 +242,7 @@ are run to print a job.
 </dt>
 <dd></dd>
 <dd>Specifies the service name when using Kerberos authentication. The default
-service name is "host".
+service name is "http".
 </dd>
 <dt>HostNameLookups On
 </dt>
diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index 6df5475fc..b292cba20 100644
--- a/doc/help/man-cupsd.html
+++ b/doc/help/man-cupsd.html
@@ -18,7 +18,7 @@ cupsd - cups scheduler
 <i>cupsd</i> is the scheduler for CUPS. It implements a printing system based
 upon the Internet Printing Protocol, version 2.1.  If no options are specified
 on the command-line then the default configuration file
-<i>/private/etc/cups/cupsd.conf</i> will be used.
+<i>/etc/cups/cupsd.conf</i> will be used.
 <h2 class="title"><a name="OPTIONS">Options</a></h2>
 <dl>
 <dt>-c config-file
diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index c342652cc..c5c2fa7ca 100644
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -118,14 +118,14 @@ standard output.
 <h2 class="title"><a name="ROOT_ACCOUNT_OPTIONS">Root Account Options</a></h2>
 When run by the root user, <i>lpoptions</i> gets and sets default
 options and instances for <i>all users</i> in the
-/private/etc/cups/lpoptions file.
+/etc/cups/lpoptions file.
 <h2 class="title"><a name="COMPATIBILITY">Compatibility</a></h2>
 The <i>lpoptions</i> command is unique to CUPS.
 <h2 class="title"><a name="FILES">Files</a></h2>
 ~/.cups/lpoptions - user defaults and instances created by non-root
 users.
 <br>
-/private/etc/cups/lpoptions - system-wide defaults and instances
+/etc/cups/lpoptions - system-wide defaults and instances
 created by the root user.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <a href='man-cancel.html?TOPIC=Man+Pages'>cancel(1)</a>, <a href='man-lp.html?TOPIC=Man+Pages'>lp(1)</a>, <a href='man-lpadmin.html?TOPIC=Man+Pages'>lpadmin(8)</a>, <a href='man-lpr.html?TOPIC=Man+Pages'>lpr(1)</a>,
diff --git a/doc/help/ref-cups-files-conf.html.in b/doc/help/ref-cups-files-conf.html.in
index fa922cb23..171950c54 100644
--- a/doc/help/ref-cups-files-conf.html.in
+++ b/doc/help/ref-cups-files-conf.html.in
@@ -37,7 +37,7 @@ server activity.</P>
 information to the system log instead of a plain file.</P>
 
 <P>The default access log file is
-<VAR>@CUPS_LOGDIR@/access_log</VAR>.</P>
+<VAR>/var/log/access_log</VAR>.</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="ConfigFilePerm">ConfigFilePerm</A></H2>
@@ -51,7 +51,7 @@ ConfigFilePerm 0640
 
 <H3>Description</H3>
 
-<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.</P>
+<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is 644 on OS X and 640 on all other operating systems.</P>
 
 <BLOCKQUOTE><B>Note:</B>
 
@@ -89,13 +89,13 @@ DocumentRoot /foo/bar/doc/cups
 of web content for the HTTP server in CUPS. If an absolute path
 is not specified then it is assumed to be relative to the <A
 HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default directory is <VAR>@CUPS_DOCROOT@</VAR>.</P>
+default directory is <VAR>/usr/share/doc/cups</VAR>.</P>
 
 <P>Documents are first looked up in a sub-directory for the
 primary language requested by the client (e.g.
-<VAR>@CUPS_DOCROOT@/fr/...</VAR>) and then directly under
+<VAR>/usr/share/doc/cups/fr/...</VAR>) and then directly under
 the <CODE>DocumentRoot</CODE> directory (e.g.
-<VAR>@CUPS_DOCROOT@/...</VAR>), so it is possible to
+<VAR>/usr/share/doc/cups/...</VAR>), so it is possible to
 localize the web content by providing subdirectories for each
 language needed.</P>
 
@@ -116,7 +116,7 @@ ErrorLog syslog
 log file. If the filename is not absolute then it is assumed to
 be relative to the <A
 HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default error log file is <VAR>@CUPS_LOGDIR@/error_log</VAR>.</P>
+default error log file is <VAR>/var/log/cups/error_log</VAR>.</P>
 
 <P>The server name can be included in the filename by using
 <CODE>%s</CODE> in the name.</P>
@@ -172,7 +172,7 @@ errors are fatal. The following kinds of errors are currently recognized:</P>
 
 <P>Multiple errors can be listed, and the form "-kind" can be used with
 <CODE>all</CODE> to remove specific kinds of errors. The default setting is
-<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
+<CODE>config</CODE>.</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
@@ -255,7 +255,7 @@ LogFilePerm 0600
 
 <P>The <CODE>LogFilePerm</CODE> directive specifies the
 permissions to use when writing log files. The default
-is @CUPS_LOG_FILE_PERM@.</P>
+is 644.</P>
 
 
 <H2 CLASS="title"><A NAME="PageLog">PageLog</A></H2>
@@ -274,7 +274,7 @@ PageLog syslog
 log file. If the filename is not absolute then it is assumed to
 be relative to the <A
 HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default page log file is <VAR>@CUPS_LOGDIR@/page_log</VAR>.</P>
+default page log file is <VAR>/var/log/cups/page_log</VAR>.</P>
 
 <P>The server name can be included in the filename by using
 <CODE>%s</CODE> in the name.</P>
@@ -296,17 +296,9 @@ Printcap /Library/Preferences/org.cups.printers.plist
 
 <H3>Description</H3>
 
-<P>The <CODE>Printcap</CODE> directive controls whether or not a
-printcap file is automatically generated and updated with a list
-of available printers. If specified with no value, then no
-printcap file will be generated. The default is to generate a
-file named <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>.</P>
+<P>The <CODE>Printcap</CODE> directive controls whether or not a printcap file is automatically generated and updated with a list of available printers. If specified with no value, then no printcap file will be generated. The default is to generate a file named <VAR>/Library/Preferences.org.cups.printers.plist</VAR> on OS X and <VAR>/etc/printcap</VAR> on all other operating systems.</P>
 
-<P>When a filename is specified (e.g. <VAR>@CUPS_DEFAULT_PRINTCAP@</VAR>),
-the printcap file is written whenever a printer is added or
-removed. The printcap file can then be used by applications that
-are hardcoded to look at the printcap file for the available
-printers.</P>
+<P>When a filename is specified (e.g. <VAR>/etc/printcap</VAR>), the printcap file is written whenever a printer is added or removed. The printcap file can then be used by applications that are hardcoded to look at the printcap file for the available printers.</P>
 
 
 <H2 CLASS="title"><A NAME="PrintcapFormat">PrintcapFormat</A></H2>
@@ -359,7 +351,7 @@ RequestRoot /foo/bar/spool/cups
 incoming IPP requests and HTML forms. If an absolute path is not
 provided then it is assumed to be relative to the <A
 HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
-default request directory is <VAR>@CUPS_REQUESTS@</VAR>.</P>
+default request directory is <VAR>/var/spool/cups</VAR>.</P>
 
 
 <H2 CLASS="title"><A NAME="ServerBin">ServerBin</A></H2>
@@ -451,10 +443,7 @@ SystemGroup root lpadmin
 
 <H3>Description</H3>
 
-<P>The <CODE>SystemGroup</CODE> directive specifies the system
-administration group for <CODE>System</CODE> authentication.
-Multiple groups can be listed, separated with spaces. The default
-group list is <CODE>@CUPS_SYSTEM_GROUPS@</CODE>.</P>
+<P>The <CODE>SystemGroup</CODE> directive specifies the system administration group for <CODE>System</CODE> authentication. Multiple groups can be listed, separated with spaces. The default group list is <CODE>admin</CODE> on OS X and <CODE>lpadmin</CODE>, <CODE>root</CODE>, <CODE>sys</CODE>, and/or <CODE>system</CODE> on other operating systems.</P>
 
 
 <H2 CLASS="title"><A NAME="TempDir">TempDir</A></H2>
@@ -470,7 +459,7 @@ TempDir /foo/bar/tmp
 
 <P>The <CODE>TempDir</CODE> directive specifies an absolute path
 for the directory to use for temporary files. The default
-directory is <VAR>@CUPS_REQUESTS@/tmp</VAR>.</P>
+directory is <VAR>/var/spool/cups/tmp</VAR>.</P>
 
 <P>Temporary directories must be world-writable and should have
 the "sticky" permission bit enabled so that other users cannot
@@ -483,6 +472,10 @@ an appropriate temporary directory called
 <KBD>chmod a+rwxt /foo/bar/tmp</KBD>
 </PRE>
 
+<BLOCKQUOTE><B>Note:</B>
+
+<P>The <CODE>TempDir</CODE> cannot be pointed at a standard system temporary directory such as <VAR>/tmp</VAR> or <VAR>/var/tmp</VAR> for security reasons.</P></BLOCKQUOTE>
+
 
 <H2 CLASS="title"><A NAME="User">User</A></H2>
 
@@ -495,9 +488,7 @@ User guest
 
 <H3>Description</H3>
 
-<P>The <CODE>User</CODE> directive specifies the UNIX user that
-filter and CGI programs run as. The default user is
-<CODE>@CUPS_USER@</CODE>.</P>
+<P>The <CODE>User</CODE> directive specifies the UNIX user that filter and CGI programs run as. The default user is <CODE>_lp</CODE>, <CODE>lp</CODE>, or <CODE>nobody</CODE> (whichever is found first).</P>
 
 <BLOCKQUOTE><B>Note:</B>
 
diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index 43ca20b64..dc9ee70cb 100644
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -247,10 +247,7 @@ BrowseLocalProtocols dnssd
 
 <H3>Description</H3>
 
-<P>The <CODE>BrowseLocalProtocols</CODE> directive specifies the
-protocols to use when advertising local shared printers on the
-network. Multiple protocols can be specified by separating them
-with spaces. The default is "<CODE>@CUPS_BROWSE_LOCAL_PROTOCOLS@</CODE>".</P>
+<P>The <CODE>BrowseLocalProtocols</CODE> directive specifies the protocols to use when advertising local shared printers on the network. Multiple protocols can be specified by separating them with spaces. The default is "<CODE>dnssd</CODE>" on systems that support Bonjour and "<CODE>none</CODE>" on all others.</P>
 
 
 <H2 CLASS="title"><A NAME="BrowseWebIF">BrowseWebIF</A></H2>
@@ -280,9 +277,7 @@ Browsing Off
 
 <H3>Description</H3>
 
-<P>The <CODE>Browsing</CODE> directive controls whether or not
-printer sharing is enabled. The default setting is
-<CODE>@CUPS_BROWSING@</CODE>.</P>
+<P>The <CODE>Browsing</CODE> directive controls whether or not printer sharing is enabled. The default setting is <CODE>On</CODE>.</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.7</SPAN><A NAME="Classification">Classification</A></H2>
@@ -430,15 +425,13 @@ and other job operations.</P>
 <H3>Examples</H3>
 
 <PRE CLASS="command">
-DefaultShared yes
-DefaultShared no
+DefaultShared Yes
+DefaultShared No
 </PRE>
 
 <H3>Description</H3>
 
-<P>The <CODE>DefaultShared</CODE> directive specifies whether
-printers are shared (published) by default. The default is
-<CODE>@CUPS_DEFAULT_SHARED@</CODE>.</P>
+<P>The <CODE>DefaultShared</CODE> directive specifies whether printers are shared (published) by default. The default is <CODE>Yes</CODE>.</P>
 
 
 <H2 CLASS="title"><A NAME="Deny">Deny</A></H2>
@@ -628,7 +621,7 @@ GSSServiceName ipp
 
 <H3>Description</H3>
 
-<P>The <CODE>GSSServiceName</CODE> directive sets the Kerberos service name to use. The default is <CODE>@CUPS_DEFAULT_GSSSERVICE_NAME@</CODE> for compatibility with Microsoft Windows.</P>
+<P>The <CODE>GSSServiceName</CODE> directive sets the Kerberos service name to use. The default is <CODE>http</CODE> for compatibility with Microsoft Windows.</P>
 
 
 <H2 CLASS="title"><A NAME="HostNameLookups">HostNameLookups</A></H2>
@@ -2150,13 +2143,13 @@ to wait before an active HTTP or IPP request times out in seconds (no suffix), m
 <H3>Examples</H3>
 
 <PRE CLASS="command">
-WebInterface yes
-WebInterface no
+WebInterface Yes
+WebInterface No
 </PRE>
 
 <H3>Description</H3>
 
-<P>The <CODE>WebInterface</CODE> directive specifies whether the web interface is enabled. The default value is <CODE>@CUPS_WEBIF@</CODE>.</P>
+<P>The <CODE>WebInterface</CODE> directive specifies whether the web interface is enabled. The default value is <CODE>No</CODE> on OS X and <CODE>Yes</CODE> on all other operating systems.</P>
 
 </BODY>
 </HTML>
diff --git a/doc/help/standard.html.in b/doc/help/standard.html.in
deleted file mode 100644
index f957fe249..000000000
--- a/doc/help/standard.html.in
+++ /dev/null
@@ -1,181 +0,0 @@
-<HTML>
-<!-- SECTION: Getting Started -->
-<HEAD>
-	<TITLE>Standard Configuration</TITLE>
-	<LINK REL="STYLESHEET" TYPE="text/css" HREF="../cups-printable.css">
-</HEAD>
-<BODY>
-
-<H1 CLASS="title">Standard Configuration</H1>
-
-<P>This document describes the standard configuration for this CUPS
-server.</P>
-
-<BLOCKQUOTE><B>Note:</B>
-
-<!-- Packagers: Change the following statement and the following sections
-     if you make any changes to the standard CUPS distribution that are
-     not automatically updated by the configure script. -->
-<P>This file reflects the standard CUPS configuration as distributed
-by Apple Inc, the developer of CUPS.</P>
-
-</BLOCKQUOTE>
-
-
-<H2 CLASS="title"><A NAME="CUPSD">cupsd Configuration</A></H2>
-
-<P><CODE>cupsd(8)</CODE> is configured by default to show
-printers shared by other systems and only allow local access to
-the system and its printers. Administration operations require
-Basic authentication with membership in the group
-"@CUPS_GROUP@".</P>
-
-<P>Connections are accepted via domain socket
-(<VAR>@CUPS_DEFAULT_DOMAINSOCKET@</VAR>) or "localhost"
-(127.0.0.1).</P>
-
-<H3><A NAME="SETTINGS">Settings</A></H3>
-
-<DIV CLASS="table"><TABLE SUMMARY="Default Values">
-<CAPTION>Table 1: Default Values</CAPTION>
-<TR>
-	<TH>Directive</TH>
-	<TH>Value</TH>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#Browsing">Browsing</A></CODE></TD>
-	<TD><CODE>@CUPS_BROWSING@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#BrowseLocalProtocols">BrowseLocalProtocols</A></CODE></TD>
-	<TD><CODE>@CUPS_BROWSE_LOCAL_PROTOCOLS@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#BrowseRemoteProtocols">BrowseRemoteProtocols</A></CODE></TD>
-	<TD><CODE>@CUPS_BROWSE_REMOTE_PROTOCOLS@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#BrowseShortNames">BrowseShortNames</A></CODE></TD>
-	<TD><CODE>@CUPS_BROWSE_SHORT_NAMES@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#ConfigFilePerm">ConfigFilePerm</A></CODE></TD>
-	<TD><CODE>@CUPS_CONFIG_FILE_PERM@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#DefaultShared">DefaultShared</A></CODE></TD>
-	<TD><CODE>@CUPS_DEFAULT_SHARED@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#ImplicitClasses">ImplicitClasses</A></CODE></TD>
-	<TD><CODE>@CUPS_IMPLICIT_CLASSES@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#LogFilePerm">LogFilePerm</A></CODE></TD>
-	<TD><CODE>@CUPS_LOG_FILE_PERM@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#MaxCopies">MaxCopies</A></CODE></TD>
-	<TD><CODE>@CUPS_MAX_COPIES@</CODE></TD>
-</TR>
-<TR>
-	<TD><CODE><A HREF="ref-cupsd-conf.html#UseNetworkDefault">UseNetworkDefault</A></CODE></TD>
-	<TD><CODE>@CUPS_USE_NETWORK_DEFAULT@</CODE></TD>
-</TR>
-</TABLE></DIV>
-
-
-<H2 CLASS="title"><A NAME="DIRECTORIES">Directories</A></H2>
-
-<DIV CLASS="table"><TABLE SUMMARY="Directories">
-<CAPTION>Table 2: Directories</CAPTION>
-<TR>
-	<TH>Directory</TH>
-	<TH>Purpose</TH>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_SERVERROOT@</VAR></TD>
-	<TD>The location of configuration files such as
-	<VAR>printers.conf</VAR>. Overridden by the <A
-	HREF="ref-cupsd-conf.html#ServerRoot"><CODE>ServerRoot</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@bindir@</VAR></TD>
-	<TD>The location of user programs.</TD>
-</TR>
-<TR>
-	<TD><VAR>@includedir@</VAR></TD>
-	<TD>The location of CUPS include files.</TD>
-</TR>
-<TR>
-	<TD><VAR>@libdir@</VAR></TD>
-	<TD>The location of CUPS library files.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_SERVERBIN@</VAR></TD>
-	<TD>The location of server programs such as backends and
-	filters. Overridden by the <A
-	HREF="ref-cupsd-conf.html#ServerBin"><CODE>ServerBin</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@sbindir@</VAR></TD>
-	<TD>The location of administrator programs.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_DATADIR@</VAR></TD>
-	<TD>The location of data files such as fonts. Overridden
-	by the <A
-	HREF="ref-cupsd-conf.html#DataDir"><CODE>DataDir</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_DOCROOT@</VAR></TD>
-	<TD>The location of documentation files. Overridden by
-	the <A
-	HREF="ref-cupsd-conf.html#DocumentRoot"><CODE>DocumentRoot</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_LOCALEDIR@</VAR></TD>
-	<TD>The location of localization files.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_CACHEDIR@</VAR></TD>
-	<TD>The location of cache files such as
-	<VAR>ppds.dat</VAR> and <VAR>remote.cache</VAR>.
-	Overridden by the <A
-	HREF="ref-cupsd-conf.html#CacheDir"><CODE>CacheDir</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_LOGDIR@</VAR></TD>
-	<TD>The location of the <VAR>access_log</VAR>,
-	<VAR>error_log</VAR>, and <VAR>page_log</VAR> files.
-	Overridden by the <A
-	HREF="ref-cupsd-conf.html#AccessLog"><CODE>AccessLog</CODE></A>,
-	<A
-	HREF="ref-cupsd-conf.html#ErrorLog"><CODE>ErrorLog</CODE></A>,
-	<A
-	HREF="ref-cupsd-conf.html#PageLog"><CODE>PageLog</CODE></A>,
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_STATEDIR@</VAR></TD>
-	<TD>The location of the domain socket file and state data
-	such as authentication certificates. Overridden by the <A
-	HREF="ref-cupsd-conf.html#StateDir"><CODE>StateDir</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-<TR>
-	<TD><VAR>@CUPS_REQUESTS@</VAR></TD>
-	<TD>The location of spooled print jobs. Overridden by the
-	<A
-	HREF="ref-cupsd-conf.html#RequestRoot"><CODE>RequestRoot</CODE></A>
-	directive in <VAR>cupsd.conf</VAR>.</TD>
-</TR>
-</TABLE></DIV>
-
-</BODY>
-</HTML>
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 06a307d44..a078ac9df 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -12,12 +12,12 @@
 .\"   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 client.conf 5 "CUPS" "25 June 2013" "Apple Inc."
+.TH client.conf 5 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
 The \fIclient.conf\fR file configures the CUPS client and is
-normally located in the \fI@CUPS_SERVERROOT@\fR or \fI~/.cups\fR
+normally located in the \fI/etc/cups\fR or \fI~/.cups\fR
 directory. Each line in the file can be a configuration
 directive, a blank line, or a comment. Comment lines start with
 the # character.
@@ -38,7 +38,7 @@ GSSServiceName name
 Specifies the Kerberos service name that is used for authentication, typically
 "host", "http", or "ipp". CUPS adds the remote hostname
 ("name@server.example.com") for you. The default name is
-"@CUPS_DEFAULT_GSSSERVICENAME@".
+"http".
 .TP 5
 ServerName hostname-or-ip-address[:port]
 .TP 5
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 62b248231..4aa8f432a 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -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 cups-deviced 8 "CUPS" "16 June 2008" "Apple Inc."
+.TH cups-deviced 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cups-deviced \- cups device daemon
 .SH SYNOPSIS
@@ -20,8 +20,8 @@ cups-deviced \- cups device daemon
 .I request-id limit user-id options
 .SH DESCRIPTION
 \fIcups-deviced\fR polls the backends in
-\fI@CUPS_SERVERBIN@/backend\fR for a list of available devices.
-It is run by \fIcupsd(8)\fR in response to a
+\fI/usr/lib/cups/backend\fR or \fI/usr/libexec/cups/backend\fR (OS X) for a
+list of available devices. It is run by \fIcupsd(8)\fR in response to a
 \fICUPS-Get-Devices\fR request. The output format is an IPP
 response message. The \fIrequest-id\fR argument is the request ID
 from the original IPP request, typically 1. The \fIlimit\fR
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index 802a58ce9..3cb3fef00 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -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 cups-driverd 8 "CUPS" "6 January 2011" "Apple Inc."
+.TH cups-driverd 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cups-driverd \- cups driver daemon
 .SH SYNOPSIS
@@ -42,10 +42,10 @@ is a space-delimited list of attributes ("name=value name=value
 accordingly.
 .SH DRIVERS
 Drivers can be static PPD files under the
-\fI@CUPS_DATADIR@/model\fR directory or programs under the
-\fI@CUPS_SERVERBIN@/driver\fR directory. Static PPD files must
-conform to the Adobe PPD File Format Specification version 4.3
-and may be compressed using the \fIgzip(1)\fR program. Driver
+\fI/usr/share/cups/model\fR directory or programs under the
+\fI/usr/lib/cups/driver\fR or \fI/usr/libexec/cups/driver\fR (OS X) directories.
+Static PPD files must conform to the Adobe PPD File Format Specification version
+4.3 and may be compressed using the \fIgzip(1)\fR program. Driver
 programs must implement the command-line interface shown in the
 next section.
 .SS DRIVER PROGRAMS
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 7682533c2..294dc0b33 100644
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -12,13 +12,13 @@
 .\"   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" "19 November 2012" "Apple Inc."
+.TH cups-files.conf 5 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cups-files.conf \- file and directory configuration file for cups
 .SH DESCRIPTION
 The \fIcups-files.conf\fR file configures the files and directories used by the
 CUPS scheduler, \fIcupsd(8)\fR.  It is normally located in the
-\fI@CUPS_SERVERROOT@\fR directory.
+\fI/etc/cups\fR directory.
 .LP
 Each line in the file can be a configuration directive, a blank line,
 or a comment. Comment lines start with the # character.
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index b7e45ec20..e49c2ba54 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -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 cups-lpd 8 "CUPS" "4 August 2008" "Apple Inc."
+.TH cups-lpd 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cups-lpd \- receive print jobs and report printer status to lpd clients
 .SH SYNOPSIS
@@ -33,7 +33,7 @@ add the following line to the \fIinetd.conf\fR file to enable the
 .br
 .nf
 
-    printer stream tcp nowait lp @CUPS_SERVERBIN@/daemon/cups-lpd cups-lpd \\
+    printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd \\
         -o document-format=application/octet-stream
 .fi
 .LP
@@ -55,7 +55,7 @@ named \fI/etc/xinetd.d/cups\fR containing the following lines:
         user = lp
 	group = sys
 	passenv =
-        server = @CUPS_SERVERBIN@/daemon/cups-lpd
+        server = /usr/lib/cups/daemon/cups-lpd
 	server_args = -o document-format=application/octet-stream
     }
 .fi
diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in
index e6f6c7448..ae07f248d 100644
--- a/man/cups-snmp.man.in
+++ b/man/cups-snmp.man.in
@@ -11,11 +11,14 @@
 .\"   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-snmp 8 "CUPS" "23 April 2012" "Apple Inc."
+.TH cups-snmp 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 snmp \- cups snmp backend
 .SH SYNOPSIS
-.B @CUPS_SERVERBIN@/backend/snmp
+.B /usr/lib/cups/backend/snmp
+.I ip-address-or-hostname
+.br
+.B /usr/libexec/cups/backend/snmp
 .I ip-address-or-hostname
 .br
 .B lpinfo -v --include-schemes snmp
@@ -41,7 +44,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port
 Monitor MIBs along with some vendor private MIBs and intelligent port probes to
 determine the correct device URI and make and model for each printer.
 .SH CONFIGURATION
-The SNMP backend reads the @CUPS_SERVERROOT@/snmp.conf configuration file, if
+The SNMP backend reads the /etc/cups/snmp.conf configuration file, if
 present, to set the default broadcast address, community name, and logging
 level. The configuration file is documented in \fIcups-snmp.conf(5)\fR. The
 DebugLevel value can be overridden using the CUPS_DEBUG_LEVEL environment
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 447dfa467..ee0d0adb3 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -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 cupsaddsmb 8 "CUPS" "25 July 2007" "Apple Inc."
+.TH cupsaddsmb 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cupsaddsmb \- export printers to samba for windows clients
 
@@ -115,17 +115,14 @@ drivers and
 %WINDIR%\\SYSTEM32\\SPOOL\\DRIVERS\\X64\\3 folder for 64-bit
 drivers.
 .LP
-The CUPS printer driver is preferred over the Microsoft driver
-since it supports the page-label, job-billing, and
-job-hold-until options fully on all printers. However, currently
-only Windows 2000 and higher is supported by the Microsoft
+However, currently only Windows 2000 and higher is supported by the Microsoft
 driver, so you will also need to get the Adobe driver to support
 Windows 95, 98, and Me clients. The Adobe and Microsoft drivers
 for Windows 2000 are identical.
 .LP
 Once you have extracted the driver files, copy the 32-bit drivers
-to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit
-drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly
+to the \fI/usr/share/cups/drivers\fR directory and the 64-bit
+drivers to the \fI/usr/share/cups/drivers/x64\fR directory exactly
 as named below:
 .nf
 
@@ -140,39 +137,6 @@ as named below:
 you use the lowercase filenames shown above, otherwise
 \fIcupsaddsmb\fR will fail to export the drivers.
 
-.SH CUPS POSTSCRIPT DRIVERS FOR WINDOWS
-\fIcupsaddsmb\fR can use the CUPS v6 PostScript printer driver
-for Windows, which is available for download from the CUPS web
-site.
-.LP
-The CUPS printer driver is preferred over the Adobe and
-Microsoft drivers since it supports the page-label, job-billing,
-and job-hold-until options fully on all printers. However,
-currently only Windows 2000 and higher is supported by the CUPS
-driver, so you will also need to get the Adobe driver to support
-Windows 95, 98, and Me clients.
-.LP
-Once you have extracted the driver files, copy the 32-bit drivers
-to the \fI@CUPS_DATADIR@/drivers\fR directory and the 64-bit
-drivers to the \fI@CUPS_DATADIR@/drivers/x64\fR directory exactly
-as named below:
-.nf
-
-    [Windows 2000 and higher]
-    cups6.inf (from www.cups.org)
-    cups6.ini (from www.cups.org)
-    cupsps6.dll (from www.cups.org)
-    cupsui6.dll (from www.cups.org)
-    ps5ui.dll (from your Windows system)
-    pscript.hlp (from your Windows system)
-    pscript.ntf (from your Windows system)
-    pscript5.dll (from your Windows system)
-.fi
-.LP
-\fBNote:\fR Unlike Windows, case is significant - make sure that
-you use the lowercase filenames shown above, otherwise
-\fIcupsaddsmb\fR will fail to export the drivers.
-
 .SH ADOBE POSTSCRIPT DRIVERS FOR WINDOWS 95, 98, AND ME
 \fIcupsaddsmb\fR can use the Adobe PostScript printer driver for
 Windows 95, 98, and ME, which are available for download from the
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index e98148d6c..60c61f7da 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -12,12 +12,12 @@
 .\"   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" "19 November 2012" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
 The \fIcupsd.conf\fR file configures the CUPS scheduler, \fIcupsd(8)\fR.  It
-is normally located in the \fI@CUPS_SERVERROOT@\fR directory. \fBNote:\fR
+is normally located in the \fI/etc/cups\fR directory. \fBNote:\fR
 File, directory, and user configuration directives that used to be allowed in
 the \fIcupsd.conf\fR file are now stored in the \fIcups-files.conf(5)\fR instead
 in order to prevent certain types of privilege escalation attacks.
@@ -192,7 +192,7 @@ are run to print a job.
 GSSServiceName name
 .br
 Specifies the service name when using Kerberos authentication. The default
-service name is "@CUPS_DEFAULT_GSSSERVICENAME@".
+service name is "http".
 .TP 5
 HostNameLookups On
 .TP 5
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 66e39fcd2..9fdcc2227 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -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 8 "CUPS" "9 March 2009" "Apple Inc."
+.TH cupsd 8 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 cupsd \- cups scheduler
 .SH SYNOPSIS
@@ -24,7 +24,7 @@ cupsd \- cups scheduler
 \fIcupsd\fR is the scheduler for CUPS. It implements a printing system based
 upon the Internet Printing Protocol, version 2.1.  If no options are specified
 on the command-line then the default configuration file
-\fI@CUPS_SERVERROOT@/cupsd.conf\fR will be used.
+\fI/etc/cups/cupsd.conf\fR will be used.
 .SH OPTIONS
 .TP 5
 -c config-file
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index 860d8bf0a..e04365b45 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -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 lpoptions 1 "CUPS" "29 August 2008" "Apple Inc."
+.TH lpoptions 1 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 lpoptions \- display or set printer options and defaults
 .SH SYNOPSIS
@@ -115,14 +115,14 @@ Options set with the \fIlpoptions\fR command are used by the
 .SH ROOT ACCOUNT OPTIONS
 When run by the root user, \fIlpoptions\fR gets and sets default
 options and instances for \fIall users\fR in the
-@CUPS_SERVERROOT@/lpoptions file.
+/etc/cups/lpoptions file.
 .SH COMPATIBILITY
 The \fIlpoptions\fR command is unique to CUPS.
 .SH FILES
 ~/.cups/lpoptions - user defaults and instances created by non-root
 users.
 .br
-@CUPS_SERVERROOT@/lpoptions - system-wide defaults and instances
+/etc/cups/lpoptions - system-wide defaults and instances
 created by the root user.
 .SH SEE ALSO
 \fIcancel(1)\fR, \fIlp(1)\fR, \fIlpadmin(8)\fR, \fIlpr(1)\fR,
-- 
2.39.2