Blob Blame History Raw
diff -up Linux-PAM-1.1.8/modules/pam_limits/limits.conf.docfix Linux-PAM-1.1.8/modules/pam_limits/limits.conf
--- Linux-PAM-1.1.8/modules/pam_limits/limits.conf.docfix	2014-07-14 14:58:05.000000000 +0200
+++ Linux-PAM-1.1.8/modules/pam_limits/limits.conf	2014-09-10 16:42:51.254747161 +0200
@@ -32,7 +32,7 @@
 #        - data - max data size (KB)
 #        - fsize - maximum filesize (KB)
 #        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open files
+#        - nofile - max number of open file descriptors
 #        - rss - max resident set size (KB)
 #        - stack - max stack size (KB)
 #        - cpu - max CPU time (MIN)
diff -up Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml.docfix Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml
--- Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml.docfix	2013-06-18 16:11:21.000000000 +0200
+++ Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml	2014-09-10 16:44:01.624367933 +0200
@@ -178,7 +178,7 @@
             <varlistentry>
               <term><option>nofile</option></term>
               <listitem>
-                <para>maximum number of open files</para>
+                <para>maximum number of open file descriptors</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -214,14 +214,17 @@
             <varlistentry>
               <term><option>maxlogins</option></term>
               <listitem>
-                <para>maximum number of logins for this user except
-                      for this with <emphasis>uid=0</emphasis></para>
+                <para>maximum number of logins for this user (this limit does
+                  not apply to user with <emphasis>uid=0</emphasis>)</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>maxsyslogins</option></term>
               <listitem>
-                <para>maximum number of all logins on system</para>
+                <para>maximum number of all logins on system; user is not
+                  allowed to log-in if total number of all users' logins is
+                  greater than specified number (this limit does not apply to
+                  user with <emphasis>uid=0</emphasis>)</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -292,7 +295,7 @@
       permanent; existing only for the duration of the session.
       One exception is the <emphasis>maxlogin</emphasis> option, this one
       is system wide. But there is a race, concurrent logins at the same
-      time will not always be detect as such but only counted as one.
+      time will not always be detected as such but only counted as one.
     </para>
     <para>
       In the <emphasis>limits</emphasis> configuration file, the