Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / man / cupsd.conf.man.in

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index fc36f5db83a94b6ca0076cedfbf6ba0878974189..ad4d082b3d173de37524f93a5a9cbd8ac45f872a 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -3,7 +3,7 @@
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007-2009 by Apple Inc.
+.\"   Copyright 2007-2010 by Apple Inc.
 .\"   Copyright 1997-2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -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 "CUPS" "14 July 2009" "Apple Inc."
+.TH cupsd.conf 5 "CUPS" "28 January 2010" "Apple Inc."
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -252,10 +252,6 @@ DefaultAuthType Negotiate
 .br
 Specifies the default type of authentication to use.
 .TP 5
-DefaultCharset charset
-.br
-Specifies the default character set to use for text.
-.TP 5
 DefaultEncryption Never
 .TP 5
 DefaultEncryption IfRequested