diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index c235cf9e4f5a05b67d2be7794c4fec983f2a3401..4a35a3f8a6468409c1411ae12f27a879510c4165 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.35 2004/02/03 17:34:02 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.36 2004/02/17 09:07:16 neilc Exp $
 -->
 <chapter id="backup">
  <title>Backup and Restore</title>
@@ -86,9 +86,9 @@ pg_dump <replaceable class="parameter">dbname</replaceable> &gt; <replaceable cl
     When your database schema relies on OIDs (for instance as foreign
     keys) you must instruct <application>pg_dump</> to dump the OIDs
     as well. To do this, use the <option>-o</option> command line
-    option.  <quote>Large objects</> are not dumped by default, either.
-    See <application>pg_dump</>'s command reference page if you use
-    large objects.
+    option.  <quote>Large objects</> are not dumped by default,
+    either.  See <xref linkend="app-pgdump">'s reference page if you
+    use large objects.
    </para>
   </important>
 
@@ -260,7 +260,8 @@ cat <replaceable class="parameter">filename</replaceable>* | psql <replaceable c
 pg_dump -Fc <replaceable class="parameter">dbname</replaceable> > <replaceable class="parameter">filename</replaceable>
 </programlisting>
 
-     See the <application>pg_dump</> and <application>pg_restore</> reference pages for details.
+     See the <xref linkend="app-pgdump"> and <xref
+     linkend="app-pgrestore"> reference pages for details.
     </para>
    </formalpara>
 
@@ -298,8 +299,8 @@ pg_dump -Fc <replaceable class="parameter">dbname</replaceable> > <replaceable c
    </para>
 
    <para>
-    Please familiarize yourself with the
-    <citerefentry><refentrytitle>pg_dump</></> reference page.
+    Please familiarize yourself with the <xref linkend="app-pgdump">
+    reference page.
    </para>
   </sect2>
  </sect1>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 20486ccca19a7a5b2310fde7c9a2a4a3efaf0d6f..8f4c1cd9b9245aeb2d28afbf761a94c2fcde9b15 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.45 2003/12/06 03:00:10 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.46 2004/02/17 09:07:16 neilc Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <refmeta>
@@ -110,7 +110,7 @@
        <para>
         Create the database before restoring into it.  (When this
         option is used, the database named with <option>-d</option> is
-        used only to issue the initial <literal>CREATE DATABASE</>
+        used only to issue the initial <command>CREATE DATABASE</>
         command.  All data is restored into the database name that
         appears in the archive.)
        </para>
@@ -454,7 +454,7 @@
    internally executes <acronym>SQL</acronym> statements. If you have
    problems running <application>pg_restore</application>, make sure
    you are able to select information from the database using, for
-   example, <application>psql</application>.
+   example, <xref linkend="app-psql">.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 3a71bbe624ac1d47d9a11e8eb6fb680e45d7e0a5..0fda608285b7e767d7bd32cf8ab94349fd0f06b2 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.24 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.25 2004/02/17 09:07:16 neilc Exp $
 -->
 
 <chapter id="user-manag">
@@ -161,8 +161,9 @@ dropuser <replaceable>name</replaceable>
 
     A user's attributes can be modified after creation with
     <command>ALTER USER</command>.<indexterm><primary>ALTER USER</></>
-    See the reference pages for <command>CREATE USER</command> and
-    <command>ALTER USER</command> for details.
+    See the reference pages for the <xref linkend="sql-createuser"
+    endterm="sql-createuser-title"> and <xref linkend="sql-alteruser"
+    endterm="sql-alteruser-title"> commands for details.
    </para>
 
   <para>