--- a/doc/users-guide.xml
+++ b/doc/users-guide.xml
@@ -8,17 +8,17 @@
 <author>
 <othername>Ollie Rutherfurd</othername>
 </author>
-<edition>Version 1.3</edition>
-<date>2004-05-15</date>
+<edition>Version $Version$</edition>
+<date>$Date$</date>
 </articleinfo>
 <section id="about">
 <title>About</title>
-<para><citetitle>Accents</citetitle> enables one to enter non-ascii characters using 
-abbreviations. <citetitle>Accents</citetitle> converts the abbreviations to the 
-characters they represent, as you type. For example, if you 
-enter <literal>&quot;a</literal>, <citetitle>Accents</citetitle> converts it to <literal>ä</literal> when you type the
-&quot;a&quot; character.</para><para>However, with this convenience comes a cost.  If you actually 
-wanted to enter <literal>'a</literal>, not <literal>á</literal>, you must enter <literal>' a</literal>,
+<para><citetitle>Accents</citetitle> makes inserting characters like <literal>ˇ</literal> easy.  As you 
+type, <citetitle>Accents</citetitle> watches for character abbreviations and 
+converts them as you type them.  For example, if you enter 
+<literal>'a</literal> <citetitle>Accents</citetitle> converts it to <literal>ˇ</literal> when you enter the 
+<literal>a</literal>.</para><para>However, with this convenience comes a cost.  If you actually 
+wanted to enter <literal>'a</literal>, not <literal>ˇ</literal>, you must enter <literal>' a</literal>,
 which <citetitle>Accents</citetitle> will convert to <literal>'a</literal> (it removes the space).</para><para>NOTE: At present, <citetitle>Accents</citetitle> assumes one is using the
 ISO-8859-1 character encoding (also known as Latin-1).</para></section>
 <section id="character-abbreviations">
@@ -132,6 +132,10 @@
 <entry><para>~O</para></entry>
 </row>
 <row>
+<entry><para>Œ</para></entry>
+<entry><para>/U</para></entry>
+</row>
+<row>
 <entry><para>Ţ</para></entry>
 <entry><para>~T</para></entry>
 </row>
@@ -156,6 +160,14 @@
 <entry><para>'Y</para></entry>
 </row>
 <row>
+<entry><para>Ÿ</para></entry>
+<entry><para>&quot;Y</para></entry>
+</row>
+<row>
+<entry><para>Ž</para></entry>
+<entry><para>^Z</para></entry>
+</row>
+<row>
 <entry><para>ŕ</para></entry>
 <entry><para>`a</para></entry>
 </row>
@@ -252,10 +264,18 @@
 <entry><para>~o</para></entry>
 </row>
 <row>
+<entry><para>œ</para></entry>
+<entry><para>/u</para></entry>
+</row>
+<row>
 <entry><para>ß</para></entry>
 <entry><para>&quot;s</para></entry>
 </row>
 <row>
+<entry><para>š</para></entry>
+<entry><para>^s</para></entry>
+</row>
+<row>
 <entry><para>ţ</para></entry>
 <entry><para>~t</para></entry>
 </row>
@@ -280,8 +300,8 @@
 <entry><para>'y</para></entry>
 </row>
 <row>
-<entry><para>˙</para></entry>
-<entry><para>&quot;y</para></entry>
+<entry><para>ž</para></entry>
+<entry><para>^z</para></entry>
 </row>
 <row>
 <entry><para>×</para></entry>
@@ -292,6 +312,14 @@
 <entry><para>~/</para></entry>
 </row>
 <row>
+<entry><para>•</para></entry>
+<entry><para>~.</para></entry>
+</row>
+<row>
+<entry><para>—</para></entry>
+<entry><para>~-</para></entry>
+</row>
+<row>
 <entry><para>ś</para></entry>
 <entry><para>/P</para></entry>
 </row>
@@ -300,6 +328,10 @@
 <entry><para>/S</para></entry>
 </row>
 <row>
+<entry><para>™</para></entry>
+<entry><para>/T</para></entry>
+</row>
+<row>
 <entry><para>Š</para></entry>
 <entry><para>/C</para></entry>
 </row>
@@ -313,7 +345,7 @@
 </row>
 <row>
 <entry><para>ş</para></entry>
-<entry><para>/T</para></entry>
+<entry><para>/D</para></entry>
 </row>
 <row>
 <entry><para>ą</para></entry>
@@ -366,6 +398,10 @@
 <row>
 <entry><para>˘</para></entry>
 <entry><para>/c</para></entry>
+</row>
+<row>
+<entry><para>€</para></entry>
+<entry><para>~E</para></entry>
 </row>
 <row>
 <entry><para>Ł</para></entry>
@@ -387,14 +423,6 @@
 <varname><citetitle>Enabled</citetitle>:</varname></term>
 <listitem>
 <para>Enable or disable <citetitle>Accents</citetitle>.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<varname><citetitle>Convert Abbreviation before Caret</citetitle>:</varname></term>
-<listitem>
-<para>Convert the abbreviation before the caret.  This works
-regardless of whether <citetitle>Accents</citetitle> is enabled to convert
-abbreviations as you type them.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term>