From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 31 Oct 2019 15:33:55 +0000 (-0400)
Subject: Update documentation of auth-info-required values (Issue #5674)
X-Git-Tag: v2.3.1~34
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=025b8ce8f637009f0df7a5bb5fa0a460dbb32b10

Update documentation of auth-info-required values (Issue #5674)
---

diff --git a/CHANGES.md b/CHANGES.md
index c741f4f25..b2b325ab9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,11 @@
-CHANGES - 2.3.1 - 2019-10-21
+CHANGES - 2.3.1 - 2019-10-31
 ============================
 
 
 Changes in CUPS v2.3.1
 ----------------------
 
-- Documentation updates (Issue #5661)
+- Documentation updates (Issue #5661, 5674)
 - Fixed a crash bug in the web interface (Issue #5621)
 - PPD files containing "custom" option keywords did not work (Issue #5639)
 - Added a workaround for the scheduler's systemd support (Issue #5640)
diff --git a/doc/help/spec-ipp.html b/doc/help/spec-ipp.html
index 3574cd658..8f0ad313d 100644
--- a/doc/help/spec-ipp.html
+++ b/doc/help/spec-ipp.html
@@ -35,7 +35,11 @@
 
 	<li><a href="http://ftp.pwg.org/pub/pwg/candidates/cs-ipptrans10-20131108-5100.16.pdf">PWG 5100.16: IPP Transaction-Based Printing Extensions</a></li>
 
-	<li><a href="http://tools.ietf.org/html/rfc3998">RFC 3998: IPP Job and Printer Administrative Operations</a> (Disable-Printer, Enable-Printer, Hold-New-Jobs, and Release-Held-New-Jobs operations)</li>
+	<li><a href="http://tools.ietf.org/html/rfc3995">RFC 3995: IPP: Event Notifications and Subscriptions</a></li>
+
+	<li><a href="http://tools.ietf.org/html/rfc3996">RFC 3996: IPP: The 'ippget' Delivery Method for Event Notifications</li>
+
+	<li><a href="http://tools.ietf.org/html/rfc3998">RFC 3998: IPP: Job and Printer Administrative Operations</a> (Disable-Printer, Enable-Printer, Hold-New-Jobs, and Release-Held-New-Jobs operations)</li>
 
 	<li><a href="http://tools.ietf.org/html/rfc7472">RFC 7472: IPP over HTTPS Transport Binding and 'ipps' URI Scheme</a></li>
 
@@ -1614,11 +1618,13 @@ CUPS-Get-PPDs Response:
 
 	<li>'domain': A domain name is required.</li>
 
+	<li>'negotiate': Kerberos is required - this keyword can only appear by itself and causes cupsd to collect the UID of the printing user.</li>
+
 	<li>'none': No authentication is required - this keyword can only appear by itself.</li>
 
 	<li>'password': A password is required.</li>
 
-	<li>'username': A username is required.</li>
+	<li>'username': A username is required. Some protocols (like SMB) prefix the username with the domain, for example "DOMAIN\user".</li>
 
 </ul>