Changeset 03e6a40 for BOOK/temp-system/common/bash.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 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:

• BOOK/temp-system/common/bash.xml (modified) (2 diffs)

BOOK/temp-system/common/bash.xml

@@ -58 +58 @@
 <!--
     <variablelist os="c">
-      <title>The meaning of the configure option:</title>
+      <title>The meaning of the new configure option:</title>
 
       <varlistentry>
@@ -81 +81 @@
 <c:command>make install</c:command>
 
-    <c:para>Make a link for programs that use <c:command>sh</c:command> for
-    a shell:</c:para>
-
-<c:command>ln -sv bash /tools/bin/sh</c:command>
-
   </c:install>