Ignore:
Timestamp:
May 30, 2011, 3:05:44 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
ec008670
Parents:
1718e20 (diff), 9f51c06 (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 'master' into systemd

Location:
BOOK/final-system/common
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1718e20 rcfb2026a  
    2525  <sect2 role="installation">
    2626    <title>Installation of Grep</title>
    27 
    28     <para os="p1">This patch contains various bug fixes for Grep:</para>
    29 
    30 <screen os="p2"><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
    3127
    3228    <para os="a">Prepare Grep for compilation:</para>

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

    r1718e20 rcfb2026a  
    3333      command below.</para>
    3434    </note>
     35
     36    <para os="f1">Fix an issue with the Russian man pages:</para>
     37
     38    <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
    3539
    3640    <para os="b">Prepare Shadow for compilation:</para>
Note: See TracChangeset for help on using the changeset viewer.