From e1555341e3d67da1bbebc0153782361db8c82e05 Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 30 Apr 2007 17:45:57 +0000 Subject: [PATCH] Generate the cupsd.conf reference help file (STR #2356) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6488 7a7537e8-13f0-0310-91df-b6672ffda945 --- Makefile | 3 +- configure.in | 4 +- ...cupsd-conf.html => ref-cupsd-conf.html.in} | 86 +++++++++---------- 3 files changed, 46 insertions(+), 47 deletions(-) rename doc/help/{ref-cupsd-conf.html => ref-cupsd-conf.html.in} (98%) diff --git a/Makefile b/Makefile index eec52149ac..dc0d547a28 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,8 @@ clean: distclean: clean $(RM) Makedefs config.h config.log config.status $(RM) cups-config conf/cupsd.conf conf/pam.std - $(RM) doc/help/standard.html doc/index.html + $(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html + $(RM) doc/index.html $(RM) init/cups.sh init/cups-lpd $(RM) man/client.conf.man $(RM) man/cups-deviced.man man/cups-driverd.man diff --git a/configure.in b/configure.in index 2afaef202c..aff0c73516 100644 --- a/configure.in +++ b/configure.in @@ -77,8 +77,8 @@ AC_SUBST(UNINSTALL_LANGUAGES) AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config conf/cupsd.conf conf/pam.std doc/index.html - doc/help/standard.html man/client.conf.man - man/cups-deviced.man man/cups-driverd.man + doc/help/ref-cupsd-conf.html doc/help/standard.html + man/client.conf.man man/cups-deviced.man man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man man/cupsd.conf.man man/lpoptions.man templates/edit-config.tmpl templates/header.tmpl diff --git a/doc/help/ref-cupsd-conf.html b/doc/help/ref-cupsd-conf.html.in similarity index 98% rename from doc/help/ref-cupsd-conf.html rename to doc/help/ref-cupsd-conf.html.in index 997b479a33..e15c6c1d4f 100644 --- a/doc/help/ref-cupsd-conf.html +++ b/doc/help/ref-cupsd-conf.html.in @@ -67,7 +67,7 @@ server activity.

information to the system log instead of a plain file.

The default access log file is -/var/log/cups/access_log.

+@CUPS_LOGDIR@/access_log.

Allow

@@ -521,8 +521,7 @@ BrowseLocalProtocols cups dns-sd

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, which is a -broadcast-based protocol.

+with spaces. The default is @CUPS_BROWSE_REMOTE_PROTOCOLS@.

BrowseOrder

@@ -616,7 +615,10 @@ BrowseProtocols cups dns-sd protocols to use when showing and advertising shared printers on the local network. Multiple protocols can be specified by separating them with spaces. The default protocol is -cups, which is a broadcast-based protocol.

+@CUPS_BROWSE_LOCAL_PROTOCOLS@ for +BrowseLocalProtocols and +@CUPS_BROWSE_REMOTE_PROTOCOLS@ for +BrowseRemoteProtocols.

Note: @@ -698,8 +700,7 @@ BrowseRemoteProtocols cups dns-sd

The BrowseRemoteProtocols directive specifies the protocols to use when finding remote shared printers on the network. Multiple protocols can be specified by separating them -with spaces. The default is cups, which is a -broadcast-based protocol.

+with spaces. The default is @CUPS_BROWSE_REMOTE_PROTOCOLS@.

BrowseShortNames

@@ -720,7 +721,7 @@ Short names are just the remote printer name, without the server same name, the printers will have long names ("printer@server1", "printer@server2".)

-

The default value for this option is Yes.

+

The default value for this option is @CUPS_BROWSE_SHORT_NAMES@.

BrowseTimeout

@@ -759,7 +760,7 @@ Browsing Off

The Browsing directive controls whether or not network printer browsing is enabled. The default setting is -On.

+@CUPS_BROWSING@.

This directive does not enable sharing of local printers by itself; you must also use the The ConfigFilePerm directive specifies the permissions to use when writing configuration files. The default -is 0640.

+is @CUPS_CONFIG_FILE_PERM@.

DataDir

@@ -956,7 +957,7 @@ DefaultShared no

The DefaultShared directive specifies whether printers are shared (published) by default. The default is -yes.

+@CUPS_DEFAULT_SHARED@.

Deny

@@ -1020,13 +1021,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 ServerRoot directory. The -default directory is /usr/share/doc/cups.

+default directory is @CUPS_DOCROOT@.

Documents are first looked up in a sub-directory for the primary language requested by the client (e.g. -/usr/share/doc/cups/fr/...) and then directly under +@CUPS_DOCROOT@/fr/...) and then directly under the DocumentRoot directory (e.g. -/usr/share/doc/cups/...), so it is possible to +@CUPS_DOCROOT@/...), so it is possible to localize the web content by providing subdirectories for each language needed.

@@ -1069,7 +1070,7 @@ ErrorLog syslog log file. If the filename is not absolute then it is assumed to be relative to the ServerRoot directory. The -default error log file is /var/log/cups/error_log.

+default error log file is @CUPS_LOGDIR@/error_log.

The server name can be included in the filename by using %s in the name.

@@ -1283,25 +1284,6 @@ performance problems with hostname lookups. Set this option to required.

-

ImplicitClasses

- -

Examples

- -
-ImplicitClasses On
-ImplicitClasses Off
-
- -

Description

- -

The ImplicitClasses directive controls whether -implicit classes are created based upon the available network -printers and classes. The default setting is On but -is automatically turned Off if Browsing is turned -Off.

- -

CUPS 1.1.10ImplicitAnyClasses

Examples

@@ -1322,6 +1304,25 @@ setting is Off.

must be enabled for this directive to have any effect.

+

ImplicitClasses

+ +

Examples

+ +
+ImplicitClasses On
+ImplicitClasses Off
+
+ +

Description

+ +

The ImplicitClasses directive controls whether +implicit classes are created based upon the available network +printers and classes. The default setting is +@CUPS_IMPLICIT_CLASSES@ but is automatically turned +Off if Browsing is turned +Off.

+ +

CUPS 1.1.9Include

Examples

@@ -1819,7 +1820,7 @@ LogFilePerm 0600

The LogFilePerm directive specifies the permissions to use when writing configuration files. The default -is 0644.

+is @CUPS_LOG_FILE_PERM@.

LogLevel

@@ -1934,7 +1935,7 @@ MaxCopies 65535

The MaxCopies directive controls the maximum number of copies that a user can print of a job. The default is -100 copies.

+@CUPS_MAX_COPIES@ copies.

Note: @@ -2107,7 +2108,7 @@ PageLog syslog log file. If the filename is not absolute then it is assumed to be relative to the ServerRoot directory. The -default page log file is /var/log/cups/page_log.

+default page log file is @CUPS_LOGDIR@/page_log.

The server name can be included in the filename by using %s in the name.

@@ -2349,7 +2350,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 ServerRoot directory. The -default request directory is /var/spool/cups.

+default request directory is @CUPS_REQUESTS@.

CUPS 1.1.7Require

@@ -2700,10 +2701,7 @@ SystemGroup root lpadmin

The SystemGroup directive specifies the system administration group for System authentication. Multiple groups can be listed, separated with spaces. The default -is system-dependent and generally consists of all of the -following groups, if present: lpadmin, -root, sys, and/or -system.

+group list is @CUPS_SYSTEM_GROUPS@.

TempDir

@@ -2719,7 +2717,7 @@ TempDir /foo/bar/tmp

The TempDir directive specifies an absolute path for the directory to use for temporary files. The default -directory is /var/spool/cups/tmp.

+directory is @CUPS_REQUESTS@/tmp.

Temporary directories must be world-writable and should have the "sticky" permission bit enabled so that other users cannot @@ -2768,7 +2766,7 @@ advertising a default printer, the client's default printer is set to the first discovered printer, or to the implicit class for the same printer available from multiple servers.

-

The default is yes.

+

The default is @CUPS_USE_NETWORK_DEFAULT@.

User

@@ -2784,7 +2782,7 @@ User guest

The User directive specifies the UNIX user that filter and CGI programs run as. The default user is -lp.

+@CUPS_USER@.

Note: -- 2.47.2