merge upstream version 0.99.9.0

1 files changed, 4 insertions, 3 deletions

diff --git a/Linux-PAM/doc/man/pam.conf-syntax.xml b/Linux-PAM/doc/man/pam.conf-syntax.xml
index 60c64b75..f098a26a 100644
--- a/Linux-PAM/doc/man/pam.conf-syntax.xml
+++ b/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>
@@ -221,7 +222,7 @@
       <filename>/usr/include/security/_pam_types.h</filename>. The
       <emphasis>actionN</emphasis> can be: an unsigned integer,
       <emphasis>n</emphasis>, signifying an action of 'jump over the
-      next <emphasis>n</emphasis> modules in the stack', or take one
+      next <emphasis>n</emphasis> modules in the stack'; or take one
       of the following forms:
     </para>
     <variablelist>
@@ -355,7 +356,7 @@
       When using this convention, you can include `[' characters
       inside the string, and if you wish to include a `]' character
       inside the string that will survive the argument parsing, you
-      should use `\['. In other words:
+      should use `\]'. In other words:
     </para>
     <programlisting>
     [..[..\]..]    -->   ..[..]..