From 3699c6372c6b9edcdbbebd5ebb2811ed76ddf5f8 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 25 Jun 2013 14:38:01 +0000
Subject: [PATCH] Added documentation about the /version=1.1 option to
 ServerName in client.conf (<rdar://problem/14216262>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11058 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 CHANGES-1.6.txt               | 2 ++
 doc/help/ref-client-conf.html | 4 ++++
 man/client.conf.man.in        | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 998b07a893..a541a07e2a 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.6.3
 
 	- The configure script now prefers Clang over GCC.
 	- Fixed a compile problem on AIX (STR #4307)
+	- Added documentation about the /version=1.1 option to ServerName in
+	  client.conf (<rdar://problem/14216262>)
 	- Fixed a URI encoding issue for hostnames containing the ` (backquote)
 	  character (<rdar://problem/14243133>)
 	- Added support for RFC 6874's IPv6 link local address format in URIs
diff --git a/doc/help/ref-client-conf.html b/doc/help/ref-client-conf.html
index f17d540747..03d1ea04cd 100644
--- a/doc/help/ref-client-conf.html
+++ b/doc/help/ref-client-conf.html
@@ -56,6 +56,8 @@ GSSServiceName ipp
 ServerName foo.bar.com
 ServerName 11.22.33.44
 ServerName foo.bar.com:8631
+<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com/version=1.1
+<SPAN CLASS="info">CUPS 1.6</SPAN>ServerName foo.bar.com:8631/version=1.1
 </PRE>
 
 <H3>Description</H3>
@@ -64,6 +66,8 @@ ServerName foo.bar.com:8631
 
 <P>The default port number is 631 but can be overridden by adding a colon followed by the desired port number to the value.</P>
 
+<P>By default, CUPS 1.6 and later use IPP/2.0 to communicate with the server. Add "/version=1.1" to force IPP/1.1 which is required for CUPS 1.3.12 and earlier.</P>
+
 <P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P>
 
 <BLOCKQUOTE><B>Note:</B>
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 02184e0563..06a307d443 100644
--- a/man/client.conf.man.in
+++ b/man/client.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 client.conf 5 "CUPS" "23 April 2012" "Apple Inc."
+.TH client.conf 5 "CUPS" "25 June 2013" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
@@ -47,6 +47,12 @@ ServerName /domain/socket
 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.
-- 
2.47.2