Import CUPS v1.7.1

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

diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 608b41b2d3f4212b384d45a4d736105570c15b5c..fd523698796f77c62f1d89f278648cc72da9d751 100644 (file)
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $"
+.\" "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $"
 .\"
-.\"   client.conf man page for the Common UNIX Printing System (CUPS).
+.\"   client.conf man page for CUPS.
 .\"
-.\"   Copyright 2007-2008 by Apple Inc.
+.\"   Copyright 2007-2013 by Apple Inc.
 .\"   Copyright 2006 by Easy Software Products.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
@@ -12,12 +12,12 @@
 .\"   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 client.conf 5 "Common UNIX Printing System" "25 February 2006" "Apple Inc."
+.TH client.conf 5 "CUPS" "8 July 2013" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
-The \fIclient.conf\fR file configures the CUPS client and is 
-normally located in the \fI@CUPS_SERVERROOT@\fR or \fI~/.cups\fR
+The \fIclient.conf\fR file configures the CUPS client and is
+normally located in the \fI/etc/cups\fR or \fI~/.cups\fR
 directory. Each line in the file can be a configuration
 directive, a blank line, or a comment. Comment lines start with
 the # character.
@@ -34,16 +34,32 @@ Encryption Required
 Specifies the level of encryption that is required for a particular
 location.
 .TP 5
+GSSServiceName name
+Specifies the Kerberos service name that is used for authentication, typically
+"host", "http", or "ipp". CUPS adds the remote hostname
+("name@server.example.com") for you. The default name is
+"http".
+.TP 5
 ServerName hostname-or-ip-address[:port]
 .TP 5
 ServerName /domain/socket
 .br
-Specifies the address and optionally the port to use when
-connecting to the server
+Specifies the address and optionally the port to use when connecting to the
+server. \fBNote: Not supported on OS X 10.7 or later.\fR
+.TP 5
+ServerName hostname-or-ip-address[:port]/version=1.1
+.br
+Specifies the address and optionally the port to use when connecting to a
+server running CUPS 1.3.12 and earlier. \fBNote: Not supported on OS X 10.7 or
+later.\fR
+.TP 5
+User name
+.br
+Specifies the default user name to use for requests.
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2008 by Apple Inc.
+Copyright 2007-2013 by Apple Inc.
 .\"
-.\" End of "$Id: client.conf.man.in 6649 2007-07-11 21:46:42Z mike $".
+.\" End of "$Id: client.conf.man.in 11109 2013-07-08 21:15:13Z msweet $".
 .\"