Changed typography convections.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7516 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 27 insertions, 26 deletions

diff --git a/chapter07/hostname.xml b/chapter07/hostname.xml
index 7515d6a03..26f1e20b3 100644
--- a/chapter07/hostname.xml
+++ b/chapter07/hostname.xml
@@ -22,9 +22,9 @@
   <para>Create the <filename>/etc/sysconfig/network</filename> file and enter a
   hostname by running:</para>
 
-<screen><userinput>echo "HOSTNAME=<replaceable>[lfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
+<screen><userinput>echo "HOSTNAME=<replaceable>&lt;lfs&gt;</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
 
-  <para><replaceable>[lfs]</replaceable> needs to be replaced with the name given
+  <para><replaceable>&lt;lfs&gt;</replaceable> needs to be replaced with the name given
   to the computer. Do not enter the Fully Qualified Domain Name (FQDN) here. That
   information will be put in the <filename>/etc/hosts</filename> file in the next
   section.</para>
diff --git a/chapter07/hosts.xml b/chapter07/hosts.xml
index 0b196cefd..e51aa37be 100644
--- a/chapter07/hosts.xml
+++ b/chapter07/hosts.xml
@@ -26,7 +26,7 @@
   fully-qualified domain name (FQDN), and possible aliases for use in the
   <filename>/etc/hosts</filename> file. The syntax is:</para>
 
-<screen><literal>&lt;IP address&gt; myhost.example.org aliases</literal></screen>
+<screen><literal>IP_address myhost.example.org aliases</literal></screen>
 
   <para>Unless the computer is to be visible to the Internet (i.e.,
   there is a registered domain and a valid block of assigned IP
@@ -54,16 +54,17 @@
 <literal># Begin /etc/hosts (network card version)
 
 127.0.0.1 localhost
-<replaceable>[192.168.1.1]</replaceable> <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable>
+<replaceable>&lt;192.168.1.1&gt;</replaceable> <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>[alias1] [alias2 ...]</replaceable>
 
 # End /etc/hosts (network card version)</literal>
 EOF</userinput></screen>
 
-  <para>The <replaceable>[192.168.1.1]</replaceable> and
-  <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable>
+  <para>The <replaceable>&lt;192.168.1.1&gt;</replaceable> and
+  <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable>
   values need to be changed for specific users or requirements (if
   assigned an IP address by a network/system administrator and the
-  machine will be connected to an existing network).</para>
+  machine will be connected to an existing network). The optional alias
+  name(s) can be omitted.</para>
 
   <para>If a network card is not going to be configured, create the
   <filename>/etc/hosts</filename> file by running:</para>
@@ -71,7 +72,7 @@ EOF</userinput></screen>
 <screen role="nodump"><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
 <literal># Begin /etc/hosts (no network card version)
 
-127.0.0.1 <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
+127.0.0.1 <replaceable>&lt;HOSTNAME.example.org&gt;</replaceable> <replaceable>&lt;HOSTNAME&gt;</replaceable> localhost
 
 # End /etc/hosts (no network card version)</literal>
 EOF</userinput></screen>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index ac6082271..8ae1399ca 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -139,14 +139,14 @@ EOF</userinput></screen>
 <screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
 <literal># Begin /etc/resolv.conf
 
-domain {<replaceable>[Your Domain Name]</replaceable>}
-nameserver <replaceable>[IP address of your primary nameserver]</replaceable>
-nameserver <replaceable>[IP address of your secondary nameserver]</replaceable>
+domain {<replaceable>&lt;Your Domain Name&gt;</replaceable>}
+nameserver <replaceable>&lt;IP address of your primary nameserver&gt;</replaceable>
+nameserver <replaceable>&lt;IP address of your secondary nameserver&gt;</replaceable>
 
 # End /etc/resolv.conf</literal>
 EOF</userinput></screen>
 
-    <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
+    <para>Replace <replaceable>&lt;IP address of the nameserver&gt;</replaceable>
     with the IP address of the DNS most appropriate for the setup. There will
     often be more than one entry (requirements demand secondary servers for
     fallback capability). If you only need or want one DNS server, remove the
diff --git a/chapter07/profile.xml b/chapter07/profile.xml
index e2748d9df..9255ef81c 100644
--- a/chapter07/profile.xml
+++ b/chapter07/profile.xml
@@ -65,10 +65,10 @@
   makes Bash and Readline use the <filename>/etc/inputrc</filename> file created
   earlier.</para>
 
-  <para>Replace <replaceable>[ll]</replaceable> below with the two-letter code
+  <para>Replace <replaceable>&lt;ll&gt;</replaceable> below with the two-letter code
   for the desired language (e.g., <quote>en</quote>) and
-  <replaceable>[CC]</replaceable> with the two-letter code for the appropriate
-  country (e.g., <quote>GB</quote>). <replaceable>[charmap]</replaceable> should
+  <replaceable>&lt;CC&gt;</replaceable> with the two-letter code for the appropriate
+  country (e.g., <quote>GB</quote>). <replaceable>&lt;charmap&gt;</replaceable> should
   be replaced with the canonical charmap for your chosen locale. Optional
   modifiers such as <quote>@euro</quote> may also be present.</para>
 
@@ -83,11 +83,11 @@
   that <quote>UTF-8</quote> is written as <quote>UTF-8</quote>, not
   <quote>utf8</quote>), so it is safest in most
   cases to choose the canonical name for a particular locale. To determine
-  the canonical name, run the following command, where <replaceable>[locale
-  name]</replaceable> is the output given by <command>locale -a</command> for
+  the canonical name, run the following command, where <replaceable>&lt;locale
+  name&gt;</replaceable> is the output given by <command>locale -a</command> for
   your preferred locale (<quote>en_GB.iso88591</quote> in our example).</para>
 
-<screen role="nodump"><userinput>LC_ALL=<replaceable>[locale name]</replaceable> locale charmap</userinput></screen>
+<screen role="nodump"><userinput>LC_ALL=<replaceable>&lt;locale name&gt;</replaceable> locale charmap</userinput></screen>
 
   <para>For the <quote>en_GB.iso88591</quote> locale, the above command
   will print:</para>
@@ -98,11 +98,11 @@
   It is important that the locale found using the heuristic above is tested prior
   to it being added to the Bash startup files:</para>
 
-<screen role="nodump"><userinput>LC_ALL=[locale name] locale country
-LC_ALL=[locale name] locale language
-LC_ALL=[locale name] locale charmap
-LC_ALL=[locale name] locale int_curr_symbol
-LC_ALL=[locale name] locale int_prefix</userinput></screen>
+<screen role="nodump"><userinput>LC_ALL=&lt;locale name&gt; locale country
+LC_ALL=&lt;locale name&gt; locale language
+LC_ALL=&lt;locale name&gt; locale charmap
+LC_ALL=&lt;locale name&gt; locale int_curr_symbol
+LC_ALL=&lt;locale name&gt; locale int_prefix</userinput></screen>
 
   <para>The above commands should print the country and language names, the
   character encoding used by the locale, the local currency and the prefix to dial
@@ -143,7 +143,7 @@ LC_ALL=[locale name] locale int_prefix</userinput></screen>
 <screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
 <literal># Begin /etc/profile
 
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable><replaceable>[@modifiers]</replaceable>
+export LANG=<replaceable>&lt;ll&gt;</replaceable>_<replaceable>&lt;CC&gt;</replaceable>.<replaceable>&lt;charmap&gt;</replaceable><replaceable>&lt;@modifiers&gt;</replaceable>
 export INPUTRC=/etc/inputrc
 
 # End /etc/profile</literal>
diff --git a/chapter07/usage.xml b/chapter07/usage.xml
index 991cf55dc..6e2bab32f 100644
--- a/chapter07/usage.xml
+++ b/chapter07/usage.xml
@@ -38,8 +38,8 @@
 6: reboot the computer</literallayout>
 
   <para>The command used to change run-levels is <command>init
-  <replaceable>[runlevel]</replaceable></command>, where
-  <replaceable>[runlevel]</replaceable> is the target run-level. For example, to
+  <replaceable>&lt;runlevel&gt;</replaceable></command>, where
+  <replaceable>&lt;runlevel&gt;</replaceable> is the target run-level. For example, to
   reboot the computer, a user could issue the <command>init 6</command> command,
   which is an alias for the <command>reboot</command> command. Likewise,
   <command>init 0</command> is an alias for the <command>halt</command>