Changeset 0230c0a for BOOK/final-system

Timestamp:

May 30, 2011, 3:05:49 PM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

271d1f96

Parents:

32f55264 (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 simp

Location:

BOOK/final-system

Files:

• common/grep.xml (modified) (1 diff)
• common/shadow.xml (modified) (1 diff)
• multilib/grep.xml (modified) (1 diff)

BOOK/final-system/common/grep.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
-
-    <para os="p1">This patch contains various bug fixes for Grep:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
 
     <para os="a">Prepare Grep for compilation:</para>

BOOK/final-system/common/shadow.xml

@@ -33 +33 @@
       command below.</para>
     </note>
+
+    <para os="f1">Fix an issue with the Russian man pages:</para>
+
+    <screen os="f2"><userinput>sed -i 's/man_MANS = $(man_nopam) /man_MANS = /' man/ru/Makefile.in</userinput></screen>
 
     <para os="b">Prepare Shadow for compilation:</para>

BOOK/final-system/multilib/grep.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"