diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-05-16 03:15:15 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-05-16 03:15:15 +0000 |
| commit | 01ce6322ca3809ac0260c8ef28abbc8255f6e34f (patch) | |
| tree | b65c4278e38f0a6f1aac239f3654636d51d0889b /man | |
| parent | 3c8c76971a30d42417c0152f83bf8786185442e4 (diff) | |
Merge changes from CUPS 1.4svn-r7582.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@768 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile | 2 | ||||
| -rw-r--r-- | man/cupsd.conf.man.in | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/man/Makefile b/man/Makefile index ee93d94cc..c65314403 100644 --- a/man/Makefile +++ b/man/Makefile @@ -218,7 +218,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml done mantohtml: mantohtml.o - $(CC) $(LDFLAGS) -o $@ mantohtml.o + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o # diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 68ce70c47..19d747fb1 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.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.conf 5 "Common UNIX Printing System" "2 January 2008" "Apple Inc." +.TH cupsd.conf 5 "Common UNIX Printing System" "15 May 2008" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -453,6 +453,10 @@ PageLog syslog .br Specifies the page log filename. .TP 5 +PageLogFormat format string +.br +Specifies the format of page log lines. +.TP 5 PassEnv variable [... variable] .br Passes the specified environment variable(s) to child processes. |