9:42 a.m.
commit 5264bc8c9a386fa215bc9c89e8e0b25b10ed325e
Author: Thorsten Kukuk <kukuk(a)thkukuk.de>
Date: Mon Apr 27 16:39:24 2015 +0200
Fix some grammatical errors in documentation.
Patch by Louis Sautier
* doc/adg/Linux-PAM_ADG.xml: Fix gramatical errors.
* doc/man/pam.3.xml: Likewise.
* doc/man/pam_acct_mgmt.3.xml: Likewise.
* doc/man/pam_chauthtok.3.xml: Likewise.
* doc/man/pam_sm_chauthtok.3.xml: Likewise.
* modules/pam_limits/limits.conf.5.xml: Likewise.
* modules/pam_mail/pam_mail.8.xml: Likewise.
* modules/pam_rhosts/pam_rhosts.c: Likewise.
* modules/pam_shells/pam_shells.8.xml: Likewise.
* modules/pam_tally/pam_tally.8.xml: Likewise.
* modules/pam_tally2/pam_tally2.8.xml: Likewise.
* modules/pam_unix/pam_unix.8.xml: Likewise.
doc/adg/Linux-PAM_ADG.xml | 2 +-
doc/man/pam.3.xml | 4 ++--
doc/man/pam_acct_mgmt.3.xml | 2 +-
doc/man/pam_chauthtok.3.xml | 2 +-
doc/man/pam_sm_chauthtok.3.xml | 2 +-
modules/pam_limits/limits.conf.5.xml | 2 +-
modules/pam_mail/pam_mail.8.xml | 2 +-
modules/pam_rhosts/pam_rhosts.c | 2 +-
modules/pam_shells/pam_shells.8.xml | 4 ++--
modules/pam_tally/pam_tally.8.xml | 2 +-
modules/pam_tally2/pam_tally2.8.xml | 2 +-
modules/pam_unix/pam_unix.8.xml | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/doc/adg/Linux-PAM_ADG.xml b/doc/adg/Linux-PAM_ADG.xml
index 316b008..79452e1 100644
--- a/doc/adg/Linux-PAM_ADG.xml
+++ b/doc/adg/Linux-PAM_ADG.xml
@@ -196,7 +196,7 @@ cc -o application .... -lpam -lpam_misc
and in this case the application should deny access to the user.
</para>
<para>
- PAM is also capable of setting and deleting the users credentials with
+ PAM is also capable of setting and deleting the user's credentials with
the call <function>pam_setcred()</function>. This function should
always be called after the user is authenticated and before service
is offered to the user. By convention, this should be the last call
diff --git a/doc/man/pam.3.xml b/doc/man/pam.3.xml
index 78e1cf3..3efffd9 100644
--- a/doc/man/pam.3.xml
+++ b/doc/man/pam.3.xml
@@ -81,7 +81,7 @@
<citerefentry>
<refentrytitle>pam_setcred</refentrytitle><manvolnum>3</manvolnum>
</citerefentry>
- function manages the userscredentials.
+ function manages the user's credentials.
</para>
</refsect2>
@@ -91,7 +91,7 @@
The
<citerefentry>
<refentrytitle>pam_acct_mgmt</refentrytitle><manvolnum>3</manvolnum>
- </citerefentry> function is used to determine if the users account is
+ </citerefentry> function is used to determine if the user's account is
valid. It checks for authentication token and account expiration and
verifies access restrictions. It is typically called after the user
has been authenticated.
diff --git a/doc/man/pam_acct_mgmt.3.xml b/doc/man/pam_acct_mgmt.3.xml
index 72274d1..59760d7 100644
--- a/doc/man/pam_acct_mgmt.3.xml
+++ b/doc/man/pam_acct_mgmt.3.xml
@@ -31,7 +31,7 @@
<title>DESCRIPTION</title>
<para>
The <function>pam_acct_mgmt</function> function is used to determine
- if the users account is valid. It checks for authentication token
+ if the user's account is valid. It checks for authentication token
and account expiration and verifies access restrictions. It is
typically called after the user has been authenticated.
</para>
diff --git a/doc/man/pam_chauthtok.3.xml b/doc/man/pam_chauthtok.3.xml
index b9922a6..f42bc68 100644
--- a/doc/man/pam_chauthtok.3.xml
+++ b/doc/man/pam_chauthtok.3.xml
@@ -53,7 +53,7 @@
<term>PAM_CHANGE_EXPIRED_AUTHTOK</term>
<listitem>
<para>
- This argument indicates to the modules that the users
+ This argument indicates to the modules that the user's
authentication token (password) should only be changed
if it has expired.
If this argument is not passed, the application requires
diff --git a/doc/man/pam_sm_chauthtok.3.xml b/doc/man/pam_sm_chauthtok.3.xml
index 40ab191..d6d3093 100644
--- a/doc/man/pam_sm_chauthtok.3.xml
+++ b/doc/man/pam_sm_chauthtok.3.xml
@@ -59,7 +59,7 @@
<term>PAM_CHANGE_EXPIRED_AUTHTOK</term>
<listitem>
<para>
- This argument indicates to the module that the users
+ This argument indicates to the module that the user's
authentication token (password) should only be changed if
it has expired. This flag is optional and
<emphasis>must</emphasis> be combined with one of the
diff --git a/modules/pam_limits/limits.conf.5.xml b/modules/pam_limits/limits.conf.5.xml
index 96d7eea..7285798 100644
--- a/modules/pam_limits/limits.conf.5.xml
+++ b/modules/pam_limits/limits.conf.5.xml
@@ -222,7 +222,7 @@
<term><option>maxsyslogins</option></term>
<listitem>
<para>maximum number of all logins on system; user is not
- allowed to log-in if total number of all users' logins is
+ allowed to log-in if total number of all user logins is
greater than specified number (this limit does not apply to
user with <emphasis>uid=0</emphasis>)</para>
</listitem>
diff --git a/modules/pam_mail/pam_mail.8.xml b/modules/pam_mail/pam_mail.8.xml
index 3015145..95216b6 100644
--- a/modules/pam_mail/pam_mail.8.xml
+++ b/modules/pam_mail/pam_mail.8.xml
@@ -103,7 +103,7 @@
</term>
<listitem>
<para>
- Look for the users' mail in an alternative location defined by
+ Look for the user's mail in an alternative location defined by
<filename>maildir/<login></filename>. The
default
location for mail is
<filename>/var/mail/<login></filename>.
Note, if the supplied
diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c
index 8e12061..bc9e76f 100644
--- a/modules/pam_rhosts/pam_rhosts.c
+++ b/modules/pam_rhosts/pam_rhosts.c
@@ -102,7 +102,7 @@ int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc,
lpwd = pam_modutil_getpwnam(pamh, luser);
if (lpwd == NULL) {
if (opt_debug)
- /* don't print by default, could be the users password */
+ /* don't print by default, could be the user's password */
pam_syslog(pamh, LOG_DEBUG,
"user '%s' unknown to this system", luser);
return PAM_USER_UNKNOWN;
diff --git a/modules/pam_shells/pam_shells.8.xml b/modules/pam_shells/pam_shells.8.xml
index c197a98..15f4767 100644
--- a/modules/pam_shells/pam_shells.8.xml
+++ b/modules/pam_shells/pam_shells.8.xml
@@ -27,7 +27,7 @@
<para>
pam_shells is a PAM module that only allows access to the
- system if the users shell is listed in
<filename>/etc/shells</filename>.
+ system if the user's shell is listed in
<filename>/etc/shells</filename>.
</para>
<para>
It also checks if <filename>/etc/shells</filename> is a plain
@@ -64,7 +64,7 @@
<term>PAM_SUCCESS</term>
<listitem>
<para>
- The users login shell was listed as valid shell in
+ The user's login shell was listed as valid shell in
<filename>/etc/shells</filename>.
</para>
</listitem>
diff --git a/modules/pam_tally/pam_tally.8.xml b/modules/pam_tally/pam_tally.8.xml
index 354d06f..48230a2 100644
--- a/modules/pam_tally/pam_tally.8.xml
+++ b/modules/pam_tally/pam_tally.8.xml
@@ -95,7 +95,7 @@
<command>pam_tally</command>. The former is the PAM module and
the latter, a stand-alone program. <command>pam_tally</command>
is an (optional) application which can be used to interrogate and
- manipulate the counter file. It can display users' counts, set
+ manipulate the counter file. It can display user counts, set
individual counts, or clear all counts. Setting artificially high
counts may be useful for blocking users without changing their
passwords. For example, one might find it useful to clear all counts
diff --git a/modules/pam_tally2/pam_tally2.8.xml b/modules/pam_tally2/pam_tally2.8.xml
index 5fecea2..2f3b2eb 100644
--- a/modules/pam_tally2/pam_tally2.8.xml
+++ b/modules/pam_tally2/pam_tally2.8.xml
@@ -86,7 +86,7 @@
<command>pam_tally2</command>. The former is the PAM module and
the latter, a stand-alone program. <command>pam_tally2</command>
is an (optional) application which can be used to interrogate and
- manipulate the counter file. It can display users' counts, set
+ manipulate the counter file. It can display user counts, set
individual counts, or clear all counts. Setting artificially high
counts may be useful for blocking users without changing their
passwords. For example, one might find it useful to clear all counts
diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml
index e170242..4008402 100644
--- a/modules/pam_unix/pam_unix.8.xml
+++ b/modules/pam_unix/pam_unix.8.xml
@@ -397,7 +397,7 @@
auth required pam_unix.so
# Ensure users account and password are still active
account required pam_unix.so
-# Change the users password, but at first check the strength
+# Change the user's password, but at first check the strength
# with pam_cracklib(8)
password required pam_cracklib.so retry=3 minlen=6 difok=3
password required pam_unix.so use_authtok nullok md5