From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 18 Mar 2010 23:20:41 +0000 (+0000)
Subject: 	* man/limits.5.xml: Document the selection of the limits when
X-Git-Tag: 4.1.5~299
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5204a15f95aa9f0ce3a784dcc03bd0a6060f1686;p=thirdparty%2Fshadow.git

	* man/limits.5.xml: Document the selection of the limits when
	multiple lines match the user.
---

diff --git a/man/limits.5.xml b/man/limits.5.xml
index 080512ecd..5926746e6 100644
--- a/man/limits.5.xml
+++ b/man/limits.5.xml
@@ -136,6 +136,18 @@
       <replaceable>group</replaceable>.
     </para>
 
+    <para>
+      If a line with limits for an user exist, only the first line for
+      this user will be considered.
+    </para>
+
+    <para>
+      If no lines are specified for an user, the last
+      <replaceable>@group</replaceable> line matching a group whose the
+      user is a member of will be conisdered, or the last line with
+      default limits if no groups contain the user).
+    </para>
+
     <para>
       To completely disable limits for a user, a single dash
       "<emphasis>-</emphasis>" will do.