From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 18 Sep 2011 17:00:28 +0000 (+0000)
Subject: 	* man/login.defs.d/QUOTAS_ENAB.xml: Document the dependency
X-Git-Tag: 4.1.5~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ee4927bce5f431bc10ddff88b785822e2dafb6;p=thirdparty%2Fshadow.git

	* man/login.defs.d/QUOTAS_ENAB.xml: Document the dependency
	between /etc/limits and QUOTAS_ENAB.
---

diff --git a/ChangeLog b/ChangeLog
index cbb24d681..251b4c7e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2011-09-18  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/chage.1.xml: The LOGIN argument is not optional.
+	* man/login.defs.d/QUOTAS_ENAB.xml: Document the dependency
+	between /etc/limits and QUOTAS_ENAB.
 
 2011-08-20  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/man/login.defs.d/QUOTAS_ENAB.xml b/man/login.defs.d/QUOTAS_ENAB.xml
index 5cccd8a89..2a68b21d6 100644
--- a/man/login.defs.d/QUOTAS_ENAB.xml
+++ b/man/login.defs.d/QUOTAS_ENAB.xml
@@ -1,7 +1,7 @@
 <!--
    Copyright (c) 1991 - 1993, Julianne Frances Haugh
    Copyright (c) 1991 - 1993, Chip Rosenthal
-   Copyright (c) 2007 - 2008, Nicolas François
+   Copyright (c) 2007 - 2011, Nicolas François
    All rights reserved.
   
    Redistribution and use in source and binary forms, with or without
@@ -32,8 +32,9 @@
   <term><option>QUOTAS_ENAB</option> (boolean)</term>
   <listitem>
     <para>
-      Enable setting of ulimit, umask, and niceness from passwd gecos
-      field.
+      Enable setting of resource limits from
+      <filename>/etc/limits</filename> and ulimit, umask, and niceness
+      from the user's passwd gecos field.
     </para>
   </listitem>
 </varlistentry>