summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-18 16:44:53 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-18 16:44:53 +0000
commitdd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (patch)
tree48d46ed8d33890c2b5d047996f5a61aab8990520 /doc
parentc934a06cde0e8f2657b7e614df31fd300658d53e (diff)
Merge changes from CUPS 1.4svn-r7670.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@810 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'doc')
-rw-r--r--doc/help/ref-cupsd-conf.html.in2
-rw-r--r--doc/help/spec-ppd.html5
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index 46ad1027b..b61ef0b66 100644
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -988,7 +988,7 @@ printers are shared (published) by default. The default is
<H3>Description</H3>
<P>The <CODE>Deny</CODE> directive specifies a hostname, IP
-address, or network that is allowed access to the server.
+address, or network that is denied access to the server.
<CODE>Deny</CODE> directives are cummulative, so multiple
<CODE>Deny</CODE> directives can be used to allow access for
multiple hosts or networks. The <CODE>/mm</CODE> notation
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index 435393a9f..402b3bcdd 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -44,8 +44,9 @@ file:</p>
<pre class='command'>
PPD-FILE = HEADER +(DATA / COMMENT / LINE-END)
-HEADER = "*" 0x50.50.44.2D.41.64.6F.62.65 ":" ; *PPD-Adobe:
- *WSP DQUOTE "4.3" DQUOTE LINE-END
+HEADER = "*PPD-Adobe:" *WSP DQUOTE VERSION DQUOTE LINE-END
+
+VERSION = "4.0" / "4.1" / "4.2" / "4.3"
COMMENT = "*%" *TCHAR LINE-END