From ffa2ca90d54cee938def492abe97894f784d8a78 Mon Sep 17 00:00:00 2001
From: msweet Each line in the file can be a configuration directive, a blank line,
or a comment. Comment lines start with the # character.
Note: If you are using Solaris 10 or higher, you must run
@@ -46,7 +46,7 @@ named /etc/xinetd.d/cups 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
}
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 @@
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.
@@ -137,36 +134,6 @@ as named below:
you use the lowercase filenames shown above, otherwise
cupsaddsmb will fail to export the drivers.
- 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.
- Once you have extracted the driver files, copy the 32-bit drivers
-to the /usr/share/cups/drivers directory and the 64-bit
-drivers to the /usr/share/cups/drivers/x64 directory exactly
-as named below:
- Note: Unlike Windows, case is significant - make sure that
-you use the lowercase filenames shown above, otherwise
-cupsaddsmb will fail to export the drivers.
-
Description
The client.conf file configures the CUPS client and is
-normally located in the /private/etc/cups or ~/.cups
+normally located in the /etc/cups or ~/.cups
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.
Description
cups-deviced polls the backends in
-/usr/libexec/cups/backend for a list of available devices.
-It is run by cupsd(8) in response to a
+/usr/lib/cups/backend or /usr/libexec/cups/backend (OS X) for a
+list of available devices. It is run by cupsd(8) in response to a
CUPS-Get-Devices request. The output format is an IPP
response message. The request-id argument is the request ID
from the original IPP request, typically 1. The limit
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.
Drivers
Drivers can be static PPD files under the
/usr/share/cups/model directory or programs under the
-/usr/libexec/cups/driver directory. Static PPD files must
-conform to the Adobe PPD File Format Specification version 4.3
-and may be compressed using the gzip(1) program. Driver
+/usr/lib/cups/driver or /usr/libexec/cups/driver (OS X) directories.
+Static PPD files must conform to the Adobe PPD File Format Specification version
+4.3 and may be compressed using the gzip(1) program. Driver
programs must implement the command-line interface shown in the
next section.
Driver Programs
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
Description
The cups-files.conf file configures the files and directories used by the
CUPS scheduler, cupsd(8). It is normally located in the
-/private/etc/cups directory.
+/etc/cups directory.
Directives
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 inetd.conf file to enable the
- 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
Name
snmp - cups snmp backend
Synopsis
+/usr/lib/cups/backend/snmp
+ip-address-or-hostname
+
/usr/libexec/cups/backend/snmp
ip-address-or-hostname
@@ -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.
Configuration
-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 cups-snmp.conf(5). 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.
-Cups Postscript Drivers For Windows
-cupsaddsmb can use the CUPS v6 PostScript printer driver
-for Windows, which is available for download from the CUPS web
-site.
-
-
- [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)
-
-Adobe Postscript Drivers For Windows 95, 98, And Me
cupsaddsmb 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
Description
The cupsd.conf file configures the CUPS scheduler, cupsd(8). It
-is normally located in the /private/etc/cups directory. Note:
+is normally located in the /etc/cups directory. Note:
File, directory, and user configuration directives that used to be allowed in
the cupsd.conf file are now stored in the cups-files.conf(5) instead
in order to prevent certain types of privilege escalation attacks.
@@ -242,7 +242,7 @@ are run to print a job.
Options
Root Account Options
When run by the root user, lpoptions gets and sets default
options and instances for all users in the
-/private/etc/cups/lpoptions file.
+/etc/cups/lpoptions file.
Compatibility
The lpoptions command is unique to CUPS.
Files
~/.cups/lpoptions - user defaults and instances created by non-root
users.
-/private/etc/cups/lpoptions - system-wide defaults and instances
+/etc/cups/lpoptions - system-wide defaults and instances
created by the root user.
See Also
cancel(1), lp(1), lpadmin(8), lpr(1),
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.
The default access log file is -@CUPS_LOGDIR@/access_log.
+/var/log/access_log.The ConfigFilePerm
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@.
The ConfigFilePerm
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.
Note: @@ -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 theServerRoot
directory. The -default directory is @CUPS_DOCROOT@. +default directory is /usr/share/doc/cups.Documents are first looked up in a sub-directory for the primary language requested by the client (e.g. -@CUPS_DOCROOT@/fr/...) and then directly under +/usr/share/doc/cups/fr/...) and then directly under the
@@ -116,7 +116,7 @@ ErrorLog syslog log file. If the filename is not absolute then it is assumed to be relative to theDocumentRoot
directory (e.g. -@CUPS_DOCROOT@/...), so it is possible to +/usr/share/doc/cups/...), so it is possible to localize the web content by providing subdirectories for each language needed.ServerRoot
directory. The -default error log file is @CUPS_LOGDIR@/error_log. +default error log file is /var/log/cups/error_log.The server name can be included in the filename by using
@@ -172,7 +172,7 @@ errors are fatal. The following kinds of errors are currently recognized:%s
in the name.Multiple errors can be listed, and the form "-kind" can be used with
+all
to remove specific kinds of errors. The default setting is -@CUPS_FATAL_ERRORS@
.config
.CUPS 1.1.18FileDevice
@@ -255,7 +255,7 @@ LogFilePerm 0600The
+is 644.LogFilePerm
directive specifies the permissions to use when writing log files. The default -is @CUPS_LOG_FILE_PERM@.PageLog
@@ -274,7 +274,7 @@ PageLog syslog log file. If the filename is not absolute then it is assumed to be relative to theServerRoot
directory. The -default page log file is @CUPS_LOGDIR@/page_log. +default page log file is /var/log/cups/page_log.The server name can be included in the filename by using
@@ -296,17 +296,9 @@ Printcap /Library/Preferences/org.cups.printers.plist%s
in the name.Description
-The
+Printcap
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 @CUPS_DEFAULT_PRINTCAP@.The
-Printcap
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 /Library/Preferences.org.cups.printers.plist on OS X and /etc/printcap on all other operating systems.When a filename is specified (e.g. @CUPS_DEFAULT_PRINTCAP@), -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.
+When a filename is specified (e.g. /etc/printcap), 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.
PrintcapFormat
@@ -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 theServerRoot
directory. The -default request directory is @CUPS_REQUESTS@. +default request directory is /var/spool/cups.ServerBin
@@ -451,10 +443,7 @@ SystemGroup root lpadminDescription
-The
+SystemGroup
directive specifies the system -administration group forSystem
authentication. -Multiple groups can be listed, separated with spaces. The default -group list is@CUPS_SYSTEM_GROUPS@
.The
SystemGroup
directive specifies the system administration group forSystem
authentication. Multiple groups can be listed, separated with spaces. The default group list isadmin
on OS X andlpadmin
,root
,sys
, and/orsystem
on other operating systems.TempDir
@@ -470,7 +459,7 @@ TempDir /foo/bar/tmpThe
+directory is /var/spool/cups/tmp.TempDir
directive specifies an absolute path for the directory to use for temporary files. The default -directory is @CUPS_REQUESTS@/tmp.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 chmod a+rwxt /foo/bar/tmp +
Note: + ++The
TempDir
cannot be pointed at a standard system temporary directory such as /tmp or /var/tmp for security reasons.User
@@ -495,9 +488,7 @@ User guestDescription
-The
+User
directive specifies the UNIX user that -filter and CGI programs run as. The default user is -@CUPS_USER@
.The
User
directive specifies the UNIX user that filter and CGI programs run as. The default user is_lp
,lp
, ornobody
(whichever is found first).Note: 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 dnssdDescription
-The
+BrowseLocalProtocols
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 "@CUPS_BROWSE_LOCAL_PROTOCOLS@
".The
BrowseLocalProtocols
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 "dnssd
" on systems that support Bonjour and "none
" on all others.BrowseWebIF
@@ -280,9 +277,7 @@ Browsing OffDescription
-The
+Browsing
directive controls whether or not -printer sharing is enabled. The default setting is -@CUPS_BROWSING@
.The
Browsing
directive controls whether or not printer sharing is enabled. The default setting isOn
.CUPS 1.1.7Classification
@@ -430,15 +425,13 @@ and other job operations.Examples
-DefaultShared yes -DefaultShared no +DefaultShared Yes +DefaultShared NoDescription
-The
+DefaultShared
directive specifies whether -printers are shared (published) by default. The default is -@CUPS_DEFAULT_SHARED@
.The
DefaultShared
directive specifies whether printers are shared (published) by default. The default isYes
.Deny
@@ -628,7 +621,7 @@ GSSServiceName ippDescription
-The
+GSSServiceName
directive sets the Kerberos service name to use. The default is@CUPS_DEFAULT_GSSSERVICE_NAME@
for compatibility with Microsoft Windows.The
GSSServiceName
directive sets the Kerberos service name to use. The default ishttp
for compatibility with Microsoft Windows.HostNameLookups
@@ -2150,13 +2143,13 @@ to wait before an active HTTP or IPP request times out in seconds (no suffix), mExamples
-WebInterface yes -WebInterface no +WebInterface Yes +WebInterface NoDescription
-The
+WebInterface
directive specifies whether the web interface is enabled. The default value is@CUPS_WEBIF@
.The
WebInterface
directive specifies whether the web interface is enabled. The default value isNo
on OS X andYes
on all other operating systems.