← Back to branch summary

~ubuntu-branches/ubuntu/quantal/shadow/quantal

« back to all changes in this revision

Viewing changes to man/shadow.5.xml

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-11-07 04:55:18 UTC
  • mfrom: (1.1.8 upstream) (18.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20091107045518-qqclg1lhinz6zv1i
Tags: 1:4.1.4.2-1ubuntu1
https://launchpad.net/bugs/477299
* Merged with debian unstable. Remaning changes (LP: #477299):
  - Ubuntu specific:
    + debian/login.defs: use SHA512 by default for password crypt routine.
  - debian/patches/495_stdout-encrypted-password: chpasswd can report
    password hashes on stdout (Debian bug 505640).
  - Rework 495_stdout-encrypted-password to cope with chpasswd using PAM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
man/shadow.5.xml
29
29
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30
30
-->
31
31
<refentry id='shadow.5'>
32
 
  <!-- $Id: shadow.5.xml 2940 2009-05-18 22:40:57Z nekral-guest $ -->
 
32
  <!-- $Id: shadow.5.xml 3017 2009-06-06 11:21:15Z nekral-guest $ -->
33
33
  <refmeta>
34
34
    <refentrytitle>shadow</refentrytitle>
35
35
    <manvolnum>5</manvolnum>
241
241
          <para>Secure user account information.</para>
242
242
        </listitem>
243
243
      </varlistentry>
 
244
      <varlistentry>
 
245
        <term><filename>/etc/shadow-</filename></term>
 
246
        <listitem>
 
247
          <para>Backup file for /etc/shadow.</para>
 
248
          <para>
 
249
            Note that this file is used by the tools of the shadow
 
250
            toolsuite, but not by all user and password management tools.
 
251
          </para>
 
252
        </listitem>
 
253
      </varlistentry>
244
254
    </variablelist>
245
255
  </refsect1>
246
256