aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2013-03-04 15:40:49 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2013-03-04 15:40:49 +0000
commite80d794159d9e39888fa75df5d1d550d923b88a3 (patch)
tree5b4aa80d4bb5e17f4181dc8c8dcca5a71293aefb
parent9f403c63e8088c40a42321cbd8627c870132a940 (diff)
merge typos from svn to 7.37.3
git-svn-id: http://svn.linuxfromscratch.org/LFS/tags/7.3@10190 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/tcl.xml30
-rw-r--r--chapter06/gcc.xml2
-rw-r--r--chapter06/inetutils.xml2
-rw-r--r--chapter06/kbd.xml4
-rw-r--r--chapter07/site.xml4
-rw-r--r--stylesheets/lfs-xsl/nochunks.xsl2
6 files changed, 22 insertions, 22 deletions
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 54f09f82d..9a264ad68 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -100,8 +100,8 @@
<segtitle>Installed library</segtitle>
<seglistitem>
- <seg>tclsh (link to tclsh8.5) and tclsh8.5</seg>
- <seg>libtcl8.5.so, libtclstub8.5.a</seg>
+ <seg>tclsh (link to tclsh&tcl-major-version;) and tclsh&tcl-major-version;</seg>
+ <seg>libtcl&tcl-major-version;.so, libtclstub&tcl-major-version;.a</seg>
</seglistitem>
</segmentedlist>
@@ -110,12 +110,12 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="tclsh8.5">
- <term><command>tclsh8.5</command></term>
+ <varlistentry id="tclsh&tcl-major-version;">
+ <term><command>tclsh&tcl-major-version;</command></term>
<listitem>
<para>The Tcl command shell</para>
- <indexterm zone="ch-tools-tcl tclsh8.5">
- <primary sortas="b-tclsh8.5">tclsh8.5</primary>
+ <indexterm zone="ch-tools-tcl tclsh&tcl-major-version;">
+ <primary sortas="b-tclsh&tcl-major-version;">tclsh&tcl-major-version;</primary>
</indexterm>
</listitem>
</varlistentry>
@@ -123,29 +123,29 @@
<varlistentry id="tclsh">
<term><command>tclsh</command></term>
<listitem>
- <para>A link to tclsh8.5</para>
+ <para>A link to tclsh&tcl-major-version;</para>
<indexterm zone="ch-tools-tcl tclsh">
<primary sortas="b-tclsh">tclsh</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="libtcl8.5.so">
- <term><filename class="libraryfile">libtcl8.5.so</filename></term>
+ <varlistentry id="libtcl&tcl-major-version;.so">
+ <term><filename class="libraryfile">libtcl&tcl-major-version;.so</filename></term>
<listitem>
<para>The Tcl library</para>
- <indexterm zone="ch-tools-tcl libtcl8.5.so">
- <primary sortas="c-libtcl8.5.so">libtcl8.5.so</primary>
+ <indexterm zone="ch-tools-tcl libtcl&tcl-major-version;.so">
+ <primary sortas="c-libtcl&tcl-major-version;.so">libtcl&tcl-major-version;.so</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="libtclstub8.5.a">
- <term><filename class="libraryfile">libtclstub8.5.a</filename></term>
+ <varlistentry id="libtclstub&tcl-major-version;.a">
+ <term><filename class="libraryfile">libtclstub&tcl-major-version;.a</filename></term>
<listitem>
<para>The Tcl Stub library</para>
- <indexterm zone="ch-tools-tcl libtclstub8.5.a">
- <primary sortas="c-libtclstub8.5.a">libtclstub8.5.a</primary>
+ <indexterm zone="ch-tools-tcl libtclstub&tcl-major-version;.a">
+ <primary sortas="c-libtclstub&tcl-major-version;.a">libtclstub&tcl-major-version;.a</primary>
</indexterm>
</listitem>
</varlistentry>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 1ecbf524c..2489c111a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -216,8 +216,8 @@ cd ../gcc-build</userinput></screen>
xpointer="xpointer(//*[@os='h'])"/>
<screen><computeroutput>#include &lt;...&gt; search starts here:
- /usr/local/include
/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include
+ /usr/local/include
/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/include-fixed
/usr/include</computeroutput></screen>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 59e5862dd..920abe64b 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -125,7 +125,7 @@ make -C doc html
make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;</userinput></screen>
-->
<para>Move some programs so they are available if <filename
- class='directory'>/usr</filename> is not accessable:</para>
+ class='directory'>/usr</filename> is not accessible:</para>
<screen><userinput remap="install">mv -v /usr/bin/{hostname,ping,ping6,traceroute} /bin</userinput></screen>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index b184f65a9..537b7c751 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -59,8 +59,8 @@
<command>setfont</command> sizes the console appropriately) together with its
manpage.</para>
-<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure &amp;&amp;
-sed -i 's/resizecons.8 //' man/man8/Makefile.in &amp;&amp;</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure
+sed -i 's/resizecons.8 //' man/man8/Makefile.in</userinput></screen>
<para>Prepare Kbd for compilation:</para>
diff --git a/chapter07/site.xml b/chapter07/site.xml
index 8e0e4bd76..374b94f32 100644
--- a/chapter07/site.xml
+++ b/chapter07/site.xml
@@ -37,7 +37,7 @@
<para>The LFS boot scripts boot and shut down a system in a fairly
efficient manner, but there are a few tweaks that you can make in the
- rc.site file to improve speed even more and to adjust messages accoring
+ rc.site file to improve speed even more and to adjust messages according
to your preferences. To do this, adjust the settings in
the <filename>/etc/sysconfig/rc.site</filename> file above.</para>
@@ -80,7 +80,7 @@
<listitem><para>Normally, all files in the <filename
class='directory'>/tmp</filename> directory are deleted at boot time.
Depending on the number of files or directories present, this can cause a
- noticible delay in the boot process. To skip removing these files set the
+ noticeable delay in the boot process. To skip removing these files set the
variable SKIPTMPCLEAN=y.</para></listitem>
<listitem><para>During shutdown, the <command>init</command> program sends
diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl
index 7f5cbcb8a..e2cd799fb 100644
--- a/stylesheets/lfs-xsl/nochunks.xsl
+++ b/stylesheets/lfs-xsl/nochunks.xsl
@@ -70,7 +70,7 @@ $Date$
<!-- sect2.titlepage:
Removed a lot of unneeded code.
Skip empty titles.
- No label in preface (actualy, skip the hardcoded dot). -->
+ No label in preface (actually, skip the hardcoded dot). -->
<!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
<xsl:template name="sect2.titlepage">
<xsl:choose>