Merge changes from CUPS 1.4svn-r7255.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@608 a1ca3aef-8c08-0410-bb20-df032aa958be

2 files changed, 9 insertions, 4 deletions

diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html
index 29271625a..704e967ba 100644
--- a/doc/help/spec-ipp.html
+++ b/doc/help/spec-ipp.html
@@ -2468,6 +2468,12 @@ to this printer. The default port monitor is "none".
 
 <p>The port-monitor-supported attribute specifies the available port monitors.
 
+<h4><a name="printer-dns-sd-name">printer-dns-sd-name (name(MAX) | noValue)</a><span class='info'>CUPS 1.4</span></h4>
+
+<p>The printer-dns-sd-name attribute specifies the registered DNS-SD service
+name for the printer. If the printer is not being shared using this protocol,
+printer-dns-sd-name will have the noValue value.</p>
+
 <h4><a name="printer-type">printer-type (type2 enum)</a></h4>
 
 <p>The printer-type attribute specifies printer type and
diff --git a/doc/index.html.in b/doc/index.html.in
index 560f7668b..401df41c0 100644
--- a/doc/index.html.in
+++ b/doc/index.html.in
@@ -75,10 +75,9 @@ assistance:</P>
 
 </TD></TR>
 <TR><TD>&nbsp;</TD></TR>
-<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and
-the CUPS logo are the trademark property of
-<A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2008 by
-Apple Inc., all rights reserved.</TD></TR>
+<TR><TD CLASS="trailer">The Common UNIX Printing System, CUPS, and the CUPS
+logo are trademarks of <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is
+copyright 2007-2008 Apple Inc. All rights reserved.</TD></TR>
 </TABLE>
 </BODY>
 </HTML>