summaryrefslogtreecommitdiff
path: root/debian/patches-applied/006_docs_cleanup
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2019-01-02 12:24:44 -0800
committerSteve Langasek <vorlon@debian.org>2019-01-02 12:27:24 -0800
commita6f4ab0bebc76acf85cc0244bd21c1036009c28c (patch)
treedf0d6a57d2b91ab9038e8d7b0d62f28c2daa66db /debian/patches-applied/006_docs_cleanup
parent10b6243f4664747e815372070142d6c5853176da (diff)
fix-up commit for grafting svn history onto git history
Diffstat (limited to 'debian/patches-applied/006_docs_cleanup')
-rw-r--r--debian/patches-applied/006_docs_cleanup31
1 files changed, 31 insertions, 0 deletions
diff --git a/debian/patches-applied/006_docs_cleanup b/debian/patches-applied/006_docs_cleanup
new file mode 100644
index 00000000..b5dce7c6
--- /dev/null
+++ b/debian/patches-applied/006_docs_cleanup
@@ -0,0 +1,31 @@
+Upstream status: committed to CVS
+
+Index: Linux-PAM/doc/man/pam.conf-syntax.xml
+===================================================================
+--- Linux-PAM/doc/man/pam.conf-syntax.xml.orig
++++ Linux-PAM/doc/man/pam.conf-syntax.xml
+@@ -211,7 +211,8 @@
+ <emphasis>authtok_disable_aging</emphasis>,
+ <emphasis>try_again</emphasis>, <emphasis>ignore</emphasis>,
+ <emphasis>abort</emphasis>, <emphasis>authtok_expired</emphasis>,
+- <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>
++ <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>,
++ <emphasis>conv_again</emphasis>, <emphasis>incomplete</emphasis>,
+ and <emphasis>default</emphasis>.
+ </para>
+ <para>
+Index: Linux-PAM/doc/man/pam.conf.5
+===================================================================
+--- Linux-PAM/doc/man/pam.conf.5.orig
++++ Linux-PAM/doc/man/pam.conf.5
+@@ -175,7 +175,9 @@
+ \fIabort\fR,
+ \fIauthtok_expired\fR,
+ \fImodule_unknown\fR,
+-\fIbad_item\fR
++\fIbad_item\fR,
++\fIconv_again\fR,
++\fIincomplete\fR,
+ and
+ \fIdefault\fR.
+ .PP