ipptool doco updates (STR #3259, STR #4346)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11629 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index de0c4ba8757e279ef0534571c65a784571bdb00a..c3afe3a634114c27b084fd7c57c12321ee4090aa 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -5,8 +5,8 @@ CHANGES IN CUPS V1.7.2
 
        - Security: The scheduler now blocks URLs containing embedded HTML
          (STR #4356)
-       - Several libcups files did not have the Apple license exception
-         notice (STR #4361)
+       - Documentation fixes (STR #3259, STR #4346)
+       - CUPS didn't compile on older platforms (STR #4338)
        - Several libcups files did not have the Apple license exception
          notice (STR #4361)
        - Fixed a D-BUS threading issue that caused the scheduler to crash

diff --git a/man/ipptool.man b/man/ipptool.man
index 75567c11b8ade0d0736a5a192687191f6f08a87a..33e30f010f9dbc6c37ca3e8c9f0253bc4f9402a5 100644 (file)
--- a/man/ipptool.man
+++ b/man/ipptool.man
@@ -1,17 +1,17 @@
 .\"
 .\" "$Id$"
 .\"
-.\"   ipptool man page for CUPS.
+.\" ipptool man page for CUPS.
 .\"
-.\"   Copyright 2010-2013 by Apple Inc.
+.\" Copyright 2010-2014 by Apple Inc.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Apple Inc. and are protected by Federal copyright
-.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\"   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/".
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. and are protected by Federal copyright
+.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\" 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 ipptool 1 "CUPS" "13 May 2013" "Apple Inc."
+.TH ipptool 1 "CUPS" "20 February 2014" "Apple Inc."
 .SH NAME
 ipptool - perform internet printing protocol requests
 .SH SYNOPSIS
@@ -42,8 +42,10 @@ The following options are recognized by \fIipptool\fR:
 .TP 5
 --help
 Shows program help.
+.TP 5
 --stop-after-include-error
 Tells \fIipptool\fR to stop if an error occurs in an included file. Normally \fIipptool\fR will continue with subsequent tests after the INCLUDE directive.
+.TP 5
 --version
 Shows the version of \fIipptool\fR being used.
 .TP 5
@@ -150,11 +152,15 @@ The following standard files are available:
     validate-job.test
 .fi
 .SH SEE ALSO
-\fIipptoolfile(5)\fR,
+\fIipptoolfile(5)\fR, RFC 2911,
 .br
 http://localhost:631/help
+.br
+http://www.iana.org/assignments/ipp-registrations
+.br
+http://www.pwg.org/ipp
 .SH COPYRIGHT
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index d3fbfb6724d5ecf798ac8c885cea107504fea77f..4b0246fbfa059e6f42a0263d086da389373a204a 100644 (file)
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -1,17 +1,17 @@
 .\"
 .\" "$Id$"
 .\"
-.\"   ipptoolfile man page for CUPS.
+.\" ipptoolfile man page for CUPS.
 .\"
-.\"   Copyright 2010-2013 by Apple Inc.
+.\" Copyright 2010-2014 by Apple Inc.
 .\"
-.\"   These coded instructions, statements, and computer programs are the
-.\"   property of Apple Inc. and are protected by Federal copyright
-.\"   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-.\"   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/".
+.\" These coded instructions, statements, and computer programs are the
+.\" property of Apple Inc. and are protected by Federal copyright
+.\" law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+.\" 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 ipptoolfile 5 "CUPS" "13 May 2013" "Apple Inc."
+.TH ipptoolfile 5 "CUPS" "20 February 2014" "Apple Inc."
 .SH NAME
 ipptoolfile \- ipptool file format
 
@@ -152,7 +152,7 @@ The following directives are understood in a test:
 .TP 5
 ATTR tag attribute-name value(s)
 Adds an attribute to the test request. Values are separated by the comma (",")
-character - escape commas using the "\" character.
+character - escape commas using the "\" character. Common attributes and values are listed in the IANA IPP registry - see references below.
 .TP 5
 ATTR collection attribute-name { MEMBER tag member-name value(s) ... } [ ... { ... } ]
 Adds a collection attribute to the test request. Member attributes follow the
@@ -614,12 +614,15 @@ $username
 Inserts the username from the URI provided to \fIipptool\fR, if any.
 
 .SH SEE ALSO
-\fIipptool(1)\fR,
+\fIipptool(1)\fR, RFC 2911,
 .br
 http://localhost:631/help
-
+.br
+http://www.iana.org/assignments/ipp-registrations
+.br
+http://www.pwg.org/ipp
 .SH COPYRIGHT
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"