Index: general.ent
===================================================================
--- general.ent	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ general.ent	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -1,3 +1,3 @@
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/important/bootscripts.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -44,5 +44,5 @@
   requested from BLFS Bootscripts, simply change to the directory and as the
   <systemitem class="username">root</systemitem> user, execute the given
-  <command>make install-<replaceable>[init-script]</replaceable></command>
+  <command>make install-<replaceable>&lt;init-script&gt;</replaceable></command>
   command. This command installs the init script to its proper location (along
   with any auxiliary configuration scripts) and also creates the appropriate
Index: introduction/important/building-notes.xml
===================================================================
--- introduction/important/building-notes.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/important/building-notes.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -111,5 +111,5 @@
     to the md5sum data shown in the BLFS book.</para>
 
-<screen><userinput>md5sum <replaceable>[name_of_downloaded_file]</replaceable></userinput></screen>
+<screen><userinput>md5sum <replaceable>&lt;name_of_downloaded_file&gt;</replaceable></userinput></screen>
 
   </sect2>
@@ -122,7 +122,7 @@
     files are also useful for debugging and keeping records. The following
     command allows you to create an installation log. Replace
-    <replaceable>[command]</replaceable> with the command you intend to execute.</para>
-
-<screen><userinput>( <replaceable>[command]</replaceable> 2&gt;&amp;1 | tee compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
+    <replaceable>&lt;command&gt;</replaceable> with the command you intend to execute.</para>
+
+<screen><userinput>( <replaceable>&lt;command&gt;</replaceable> 2&gt;&amp;1 | tee compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
 
     <para><option>2&gt;&amp;1</option> redirects error messages to the same
@@ -131,5 +131,5 @@
     around the command run the entire command in a subshell and finally the
     <command>exit $PIPESTATUS</command> command ensures the result of the
-    <replaceable>[command]</replaceable> is returned as the result and not the
+    <replaceable>&lt;command&gt;</replaceable> is returned as the result and not the
     result of the <command>tee</command> command.</para>
 
Index: introduction/important/locale-issues.xml
===================================================================
--- introduction/important/locale-issues.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/important/locale-issues.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -113,10 +113,10 @@
 
 <screen><userinput>convmv -f iso-8859-1 -t cp850 -r --nosmart --notest \
-    <replaceable>[/path/to/unzipped/files]</replaceable></userinput></screen>
+    <replaceable>&lt;/path/to/unzipped/files&gt;</replaceable></userinput></screen>
 
         <para>Step 2. Do the correct conversion instead:</para>
 
 <screen><userinput>convmv -f cp866 -t koi8-r -r --nosmart --notest \
-    <replaceable>[/path/to/unzipped/files]</replaceable></userinput></screen>
+    <replaceable>&lt;/path/to/unzipped/files&gt;</replaceable></userinput></screen>
       </blockquote>
 
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/welcome/askhelp.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -37,5 +37,5 @@
         <systemitem class='username'>root</systemitem> user to see if it's
         loaded. Check the <filename>sys.log</filename> file or run
-        <command>modprobe <replaceable>[driver]</replaceable></command> to
+        <command>modprobe <replaceable>&lt;driver&gt;</replaceable></command> to
         review any error message. If it loads properly, you may need to add
         the <command>modprobe</command> command to your boot scripts.</para>
@@ -45,5 +45,5 @@
         uses groups to make these settings easier, but it also adds the step of
         adding users to groups to allow access. A simple <command>moduser
-        -G audio <replaceable>[user]</replaceable></command> may be all that's
+        -G audio <replaceable>&lt;user&gt;</replaceable></command> may be all that's
         necessary for that user to have access to the sound system. Any question
         that starts out with <quote>It works as root, but not as ...</quote>
@@ -52,5 +52,5 @@
       <listitem>
         <para>BLFS liberally uses <filename
-        class='directory'>/opt/<replaceable>[package]</replaceable></filename>.
+        class='directory'>/opt/<replaceable>&lt;package&gt;</replaceable></filename>.
         The main objection to this centers around the need to expand your
         environment variables for each package placed there (e.g.,
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/welcome/changelog.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -43,4 +43,23 @@
 
     <listitem>
+      <para>April 10th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added the 'User Notes' wiki link to each package
+          page.</para>
+        </listitem>
+        <listitem>
+          <para>[randy] - Changed all instances of .[so,a] to .{so,a}
+          (brackets changed to braces).</para>
+        </listitem>
+        <listitem>
+          <para>[randy] - Changed all <replaceable>[some_text]</replaceable>
+          instances to <replaceable>&lt;some_text&gt;</replaceable> (square
+          brackets changed to angle brackets).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 9th, 2006</para>
       <itemizedlist>
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ introduction/welcome/conventions.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -72,5 +72,5 @@
   </blockquote>
 
-  <para><replaceable>[REPLACED TEXT]</replaceable></para>
+  <para><replaceable>&lt;REPLACED TEXT&gt;</replaceable></para>
 
   <blockquote>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 38e4f06005771cd4d2f117a1f86307830dfdb43c)
+++ template/template.xml	(revision 57b1136395c8969bfffa76ba6cfc0b06f6c17a36)
@@ -101,4 +101,7 @@
     <para role="optional"><ulink url="http://www.some.url/">EXTERNAL DEPENDENCY</ulink></para>
 
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/template"/></para>
+
   </sect2>
 
@@ -271,9 +274,9 @@
 
       <varlistentry id="libLIBRARY1">
-        <term><filename class='libraryfile'>libLIBRARY1.[so,a]</filename></term>
+        <term><filename class='libraryfile'>libLIBRARY1.{so,a}</filename></term>
         <listitem>
           <para>contains functions that .....</para>
           <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.[so,a]</primary>
+            <primary sortas="c-libLIBRARY1">libLIBRARY1.{so,a}</primary>
           </indexterm>
         </listitem>
