Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/shadow.xml

    r88ef769 r03e6a40  
    3333      command below.</para>
    3434    </note>
    35 
    3635
    3736    <para os="b">Disable the installation of the <command>groups</command> and
    … …  
    6059  </variablelist>
    6160
    62 
    6361    <para os="h">Compile the package:</para>
    6462
    … …  
    154152
    155153      <seglistitem>
    156         <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
     154        <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
    157155        groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
    158156        lastlog, login, logoutd, newgrp, newusers, passwd, pwck,
Note: See TracChangeset for help on using the changeset viewer.