Index: shell/file_and_directory.rst
===================================================================
--- shell/file_and_directory.rst	(revision ed3794ea3926f3e8ee801eae908bb7557cb30637)
+++ shell/file_and_directory.rst	(revision df773360c902958c0b1b62512dcccd483020f645)
@@ -7,57 +7,57 @@
 The RTEMS shell has the following file and directory commands:
 
-- ``blksync`` - sync the block driver
-
-- ``cat`` - display file contents
-
-- ``cd`` - alias for chdir
-
-- ``chdir`` - change the current directory
-
-- ``chmod`` - change permissions of a file
-
-- ``chroot`` - change the root directory
-
-- ``cp`` - copy files
-
-- ``dd`` - format disks
-
-- ``debugrfs`` - debug RFS file system
-
-- ``df`` - display file system disk space usage
-
-- ``dir`` - alias for ls
-
-- ``fdisk`` - format disks
-
-- ``hexdump`` - format disks
-
-- ``ln`` - make links
-
-- ``ls`` - list files in the directory
-
-- ``md5`` - display file system disk space usage
-
-- ``mkdir`` - create a directory
-
-- ``mkdos`` - DOSFS disk format
-
-- ``mknod`` - make device special file
-
-- ``mkrfs`` - format RFS file system
-
-- ``mount`` - mount disk
-
-- ``mv`` - move files
-
-- ``pwd`` - print work directory
-
-- ``rmdir`` - remove empty directories
-
-- ``rm`` - remove files
-
-- ``umask`` - Set file mode creation mask
-
-- ``unmount`` - unmount disk
+- blksync_ - sync the block driver
+
+- cat_ - display file contents
+
+- cd_ - alias for chdir
+
+- chdir_ - change the current directory
+
+- chmod_ - change permissions of a file
+
+- chroot_ - change the root directory
+
+- cp_ - copy files
+
+- dd_ - convert and copy a file
+
+- debugrfs_ - debug RFS file system
+
+- df_ - display file system disk space usage
+
+- dir_ - alias for ls_
+
+- fdisk_ - format disks
+
+- hexdump_ - format disks
+
+- ln_ - make links
+
+- ls_ - list files in the directory
+
+- md5_ - display file system disk space usage
+
+- mkdir_ - create a directory
+
+- mkdos_ - DOSFS disk format
+
+- mknod_ - make device special file
+
+- mkrfs_ - format RFS file system
+
+- mount_ - mount disk
+
+- mv_ - move files
+
+- pwd_ - print work directory
+
+- rmdir_ - remove empty directories
+
+- rm_ - remove files
+
+- umask_ - Set file mode creation mask
+
+- unmount_ - unmount disk
 
 Commands
@@ -67,4 +67,6 @@
 is dedicated to each of the commands and describes the behavior and
 configuration of that command as well as providing an example usage.
+
+.. _blksync:
 
 blksync - sync the block driver
@@ -133,4 +135,6 @@
     extern rtems_shell_cmd_t rtems_shell_BLKSYNC_Command;
 
+.. _cat:
+
 cat - display file contents
 ---------------------------
@@ -198,4 +202,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_CAT_Command;
+
+.. _cd:
 
 cd - alias for chdir
@@ -273,4 +279,5 @@
     extern rtems_shell_cmd_t rtems_shell_CD_Command;
 
+.. _chdir:
 
 chdir - change the current directory
@@ -342,4 +349,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_CHDIR_Command;
+
+.. _chmod:
 
 chmod - change permissions of a file
@@ -436,4 +445,6 @@
     extern rtems_shell_cmd_t rtems_shell_CHMOD_Command;
 
+.. _chroot:
+
 chroot - change the root directory
 ----------------------------------
@@ -510,4 +521,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_CHROOT_Command;
+
+.. _cp:
 
 cp - copy files
@@ -688,4 +701,6 @@
 NetBSD 4.0.
 
+.. _dd:
+
 dd - convert and copy a file
 ----------------------------
@@ -939,4 +954,6 @@
     extern rtems_shell_cmd_t rtems_shell_DD_Command;
 
+.. _debugrfs:
+
 debugrfs - debug RFS file system
 --------------------------------
@@ -1040,4 +1057,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_DEBUGRFS_Command;
+
+.. _df:
 
 df - display file system disk space usage
@@ -1109,4 +1128,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_DF_Command;
+
+.. _dir:
 
 dir - alias for ls
@@ -1183,4 +1204,6 @@
     extern rtems_shell_cmd_t rtems_shell_DIR_Command;
 
+.. _fdisk:
+
 fdisk - format disk
 -------------------
@@ -1205,4 +1228,6 @@
 ``CONFIGURE_SHELL_NO_COMMAND_FDISK`` when all shell commands have been
 configured.
+
+.. _hexdump:
 
 hexdump - ascii/dec/hex/octal dump
@@ -1461,4 +1486,6 @@
     extern rtems_shell_cmd_t rtems_shell_HEXDUMP_Command;
 
+.. _ln:
+
 ln - make links
 ---------------
@@ -1578,4 +1605,6 @@
 The implementation and portions of the documentation for this command are from
 NetBSD 4.0.
+
+.. _ls:
 
 ls - list files in the directory
@@ -1655,4 +1684,6 @@
     extern rtems_shell_cmd_t rtems_shell_LS_Command;
 
+.. _md5:
+
 md5 - compute the Md5 hash of a file or list of files
 -----------------------------------------------------
@@ -1719,4 +1750,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_MD5_Command;
+
+.. _mkdir:
 
 mkdir - create a directory
@@ -1800,7 +1833,9 @@
     extern rtems_shell_cmd_t rtems_shell_MKDIR_Command;
 
-mldos - DOSFS file system format
+.. _mkdos:
+
+mkdos - DOSFS file system format
 --------------------------------
-.. index:: pwd
+.. index:: mkdos
 
 **SYNOPSYS:**
@@ -1868,4 +1903,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_MKDOS_Command;
+
+.. _mknod:
 
 mknod - make device special file
@@ -1997,4 +2034,6 @@
 NetBSD 4.0.
 
+.. _mkrfs:
+
 mkrfs - format RFS file system
 ------------------------------
@@ -2092,4 +2131,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_MKRFS_Command;
+
+.. _mount:
 
 mount - mount disk
@@ -2220,4 +2261,6 @@
     extern rtems_shell_cmd_t rtems_shell_MOUNT_Command;
 
+.. _mv:
+
 mv - move files
 ---------------
@@ -2328,4 +2371,6 @@
 NetBSD 4.0.
 
+.. _pwd:
+
 pwd - print work directory
 --------------------------
@@ -2396,4 +2441,6 @@
     extern rtems_shell_cmd_t rtems_shell_PWD_Command;
 
+.. _rmdir:
+
 rmdir - remove empty directories
 --------------------------------
@@ -2463,4 +2510,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_RMDIR_Command;
+
+.. _rm:
 
 rm - remove files
@@ -2540,4 +2589,6 @@
     extern rtems_shell_cmd_t rtems_shell_RM_Command;
 
+.. _umask:
+
 umask - set file mode creation mask
 -----------------------------------
@@ -2609,4 +2660,6 @@
     extern rtems_shell_cmd_t rtems_shell_UMASK_Command;
 
+.. _unmount:
+
 unmount - unmount disk
 ----------------------
Index: shell/general_commands.rst
===================================================================
--- shell/general_commands.rst	(revision ed3794ea3926f3e8ee801eae908bb7557cb30637)
+++ shell/general_commands.rst	(revision df773360c902958c0b1b62512dcccd483020f645)
@@ -1,2 +1,6 @@
+.. COMMENT: COPYRIGHT (c) 1988-2008.
+.. COMMENT: On-Line Applications Research Corporation (OAR).
+.. COMMENT: All rights reserved.
+
 General Commands
 ################
@@ -7,39 +11,39 @@
 The RTEMS shell has the following general commands:
 
-- ``help`` - Print command help
-
-- ``alias`` - Add alias for an existing command
-
-- ``cmdls`` - List commands
-
-- ``cmdchown`` - Change user or owner of commands
-
-- ``cmdchmod`` - Change mode of commands
-
-- ``date`` - Print or set current date and time
-
-- ``echo`` - Produce message in a shell script
-
-- ``sleep`` - Delay for a specified amount of time
-
-- ``id`` - show uid gid euid and egid
-
-- ``tty`` - show ttyname
-
-- ``whoami`` - print effective user id
-
-- ``getenv`` - print environment variable
-
-- ``setenv`` - set environment variable
-
-- ``unsetenv`` - unset environment variable
-
-- ``time`` - time command execution
-
-- ``logoff`` - logoff from the system
-
-- ``rtc`` - RTC driver configuration
-
-- ``exit`` - alias for logoff command
+- help_ - Print command help
+
+- alias_ - Add alias for an existing command
+
+- cmdls_ - List commands
+
+- cmdchown_ - Change user or owner of commands
+
+- cmdchmod_ - Change mode of commands
+
+- date_ - Print or set current date and time
+
+- echo_ - Produce message in a shell script
+
+- sleep_ - Delay for a specified amount of time
+
+- id_ - show uid gid euid and egid
+
+- tty_ - show ttyname
+
+- whoami_ - print effective user id
+
+- getenv_ - print environment variable
+
+- setenv_ - set environment variable
+
+- unsetenv_ - unset environment variable
+
+- time_ - time command execution
+
+- logoff_ - logoff from the system
+
+- rtc_ - RTC driver configuration
+
+- exit_ - alias for logoff command
 
 Commands
@@ -49,4 +53,6 @@
 to each of the commands and describes the behavior and configuration of that
 command as well as providing an example usage.
+
+.. _help:
 
 help - Print command help
@@ -127,4 +133,6 @@
 This command has no configuration.
 
+.. _alias:
+
 alias - add alias for an existing command
 -----------------------------------------
@@ -196,4 +204,6 @@
     extern rtems_shell_cmd_t rtems_shell_ALIAS_Command;
 
+.. _cmdls:
+
 cmdls - List commands
 ---------------------
@@ -248,4 +258,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_CMDLS_Command;
+
+.. _cmdchown:
 
 cmdchown - Change user or owner of commands
@@ -305,4 +317,6 @@
     extern rtems_shell_cmd_t rtems_shell_CMDCHOWN_Command;
 
+.. _cmdchmod:
+
 cmdchmod - Change mode of commands
 ----------------------------------
@@ -361,4 +375,6 @@
     extern rtems_shell_cmd_t rtems_shell_CMDCHMOD_Command;
 
+.. _date:
+
 date - print or set current date and time
 -----------------------------------------
@@ -433,4 +449,6 @@
 
     extern rtems_shell_cmd_t rtems_shell_DATE_Command;
+
+.. _echo:
 
 echo - produce message in a shell script
@@ -546,4 +564,6 @@
 NetBSD 4.0.
 
+.. _sleep:
+
 sleep - delay for a specified amount of time
 --------------------------------------------
@@ -621,4 +641,6 @@
     extern rtems_shell_cmd_t rtems_shell_SLEEP_Command;
 
+.. _id:
+
 id - show uid gid euid and egid
 -------------------------------
@@ -696,4 +718,6 @@
     extern rtems_shell_cmd_t rtems_shell_ID_Command;
 
+.. _tty:
+
 tty - show ttyname
 ------------------
@@ -760,4 +784,6 @@
     extern rtems_shell_cmd_t rtems_shell_TTY_Command;
 
+.. _whoami:
+
 whoami - print effective user id
 --------------------------------
@@ -825,4 +851,6 @@
     extern rtems_shell_cmd_t rtems_shell_WHOAMI_Command;
 
+.. _getenv:
+
 getenv - print environment variable
 -----------------------------------
@@ -890,4 +918,6 @@
     extern rtems_shell_cmd_t rtems_shell_GETENV_Command;
 
+.. _setenv:
+
 setenv - set environment variable
 ---------------------------------
@@ -956,4 +986,6 @@
     extern rtems_shell_cmd_t rtems_shell_SETENV_Command;
 
+.. _unsetenv:
+
 unsetenv - unset environment variable
 -------------------------------------
@@ -1019,4 +1051,6 @@
     extern rtems_shell_cmd_t rtems_shell_UNSETENV_Command;
 
+.. _time:
+
 time - time command execution
 -----------------------------
@@ -1083,4 +1117,6 @@
     extern rtems_shell_cmd_t rtems_shell_TIME_Command;
 
+.. _logoff:
+
 logoff - logoff from the system
 -------------------------------
@@ -1150,4 +1186,6 @@
     extern rtems_shell_cmd_t rtems_shell_LOGOFF_Command;
 
+.. _rtc:
+
 rtc - RTC driver configuration
 ------------------------------
@@ -1173,4 +1211,6 @@
 configured.
 
+.. _exit:
+
 exit - exit the shell
 ---------------------
