diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-12-12 20:54:21 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-12-12 20:54:21 +0000 |
| commit | c1420c8744235de1249c34b956b7c11ccafd659d (patch) | |
| tree | 27879336dd313e589eb2004964f2af416520daff /conf | |
| parent | c41769ffd04ad45bb2c95691ad3999674896a2ed (diff) | |
| download | cups-c1420c8744235de1249c34b956b7c11ccafd659d.tar.gz | |
Merge changes from CUPS 1.7svn-r10755.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4074 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Makefile | 2 | ||||
| -rw-r--r-- | conf/cups-files.conf.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/Makefile b/conf/Makefile index a68a58b16..04cc1e739 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -3,7 +3,7 @@ # # Configuration file makefile for CUPS. # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1993-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in index 8c3a1b58c..01ee93317 100644 --- a/conf/cups-files.conf.in +++ b/conf/cups-files.conf.in @@ -39,7 +39,7 @@ AccessLog @CUPS_LOGDIR@/access_log #DataDir @CUPS_DATADIR@ # Location of the static web content served by the scheduler... -#DocRoot @CUPS_DOCROOT@ +#DocumentRoot @CUPS_DOCROOT@ # Location of the file logging all messages produced by the scheduler and any # helper programs; may be the name "syslog". If not an absolute path, the value |