Index: Doc/user/Makefile.am
===================================================================
--- Doc/user/Makefile.am	(revision 3437)
+++ Doc/user/Makefile.am	(working copy)
@@ -3,7 +3,7 @@
 EXTRA_DIST = dasher.1.in 
 DISTCLEANFILES=dasher.1
 
-dasher.1:
-	sed s/PACKAGE_VERSION/$(PACKAGE_VERSION)/ <$(srcdir)/dasher.1.in >dasher.1
+dasher.1: $(srcdir)/dasher.1.in
+	sed s/PACKAGE_VERSION/$(PACKAGE_VERSION)/ <$< >$@
 
 
Index: Doc/user/dasher.1.in
===================================================================
--- Doc/user/dasher.1.in	(revision 3437)
+++ Doc/user/dasher.1.in	(working copy)
@@ -1,12 +1,17 @@
-.TH DASHER "1" "January 2004" "PACKAGE_VERSION" "User Commands"
+\" URL macro from http://people.debian.org/~branden/talks/wtfm/wtfm.pdf
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.TH dasher "1" "20078-02-28" "PACKAGE_VERSION" "User Commands"
 .SH NAME 
 dasher \- graphical predictive text entry system
 
 .SH SYNOPSIS
-.B "less [-wop] [\fIfilename\fP]"
+.BR dasher [ OPTIONS ]
 
 .SH DESCRIPTION
-.B dasher
+.B Dasher
 is an information-efficient text-entry interface, driven by
 natural continuous pointing gestures. Dasher is a competitive 
 text-entry system wherever a full-size keyboard cannot be used.
@@ -14,77 +19,77 @@
 .SH OPTIONS
 .B dasher 
 takes the following options:
+.TP
+\fB\-a\fR, \fB\-\-appstyle\fR=\fISTYLE\fR
+Application style (\fBtraditional\fR, \fBdirect\fR, \fBcompose\fR or \fBfullscreen\fR)
+.TP
+\fB\-?\fR, \fB\-\-help\fR
+Show help about options.
 .IP "-o"
-Dasher will appear without a text edit box and will default to entering
-text into other windows.
-.IP "-p"
-Dasher will open a preferences window and not the main window.
-.IP "-s"
-Dasher will output the entered text to stdout whenever stopped. Only text
-entered since the last stop will be output.
-.IP "-w"
-Whenever Dasher is stopped, the time taken, number of characters
-entered, and number of bits of information will be displayed, along
-with ratios of these quantities.
+Override stored options
 
 .SH USAGE
-After startup, Dasher will present the user with a window containing two major
-sections. The top portion is the edit box - text entered via Dasher will appear
-here, and the text may also be edited directly. The bottom portion is the main
-Dasher interface and will display a blank background with a column of letters
-on the right hand side. Clicking the mouse button will start the model, and the
-screen will zoom towards the point underneath the mouse pointer. To select a 
-letter, move the mouse pointer into it and watch how it zooms underneat the
-crosshair. Within the selected letter, a new column of letters will appear.
-Move the pointer over one of these letters to select it as the next letter. To
-correct mistakes, move the mouse pointer to the left of the crosshair and 
-Dasher will zoom out allowing you to select new letters.
+After startup, Dasher will present the user with a window containing
+two major!  sections.  The top portion is the \fIedit box\fR - text
+entered via Dasher will appear here, and the text may also be edited
+directly.  The bottom portion is the main Dasher interface and will
+display a blank background with a column of letters on the right hand
+side. Click the mouse button to start.  When the pointer is to the
+right of the crosshair the screen will zoom towards the point
+underneath the mouse pointer. To select a letter, move the mouse
+pointer into it and watch how it zooms underneath the crosshair.  A
+new column of letters will appear.  Staying within the box for the
+selected letter, move the pointer over one of these letters to select
+it as the next letter.  Moving the mouse pointer to the left of the
+crosshair, or outside of the box for previously selected letters,
+allows you to change previously selected letters.
 
 .SH MENUS
 
 .SS File
 
 .IP New
-Restore Dasher to the state it was in when started
+Clear the edit box and associated a random filename with it.
 
 .IP Open
-Read a text file into the Dasher edit box for further editting
+Read a text file into the edit box for further editing.
 
 .IP Save
-Save the contents of the Dasher edit box to a file
+Save the contents of the edit box to it's associated file.
 
 .IP "Save as"
-Save the contents of the Dasher edit box to a file chosen by the user
+Save the contents of the edit box to a selected file.
 
 .IP "Append to file"
-Add the contents of the Dasher edit box to the end of a file chosen by the user
+Add the contents of the edit box to the end of a selected file.
 
 .IP "Import training text"
-Use a file to further train Dasher (for instance, a training file containing
-scientific terms to add to the initial English training). Training files must
-be UTF-8 encoded.
+Use a file to further improve Dasher's prediction of the next letters
+to present (for instance, a training file containing scientific terms
+to add to the initial English training).  Training files must be UTF-8
+encoded.
 
-.IP Exit
-Quit Dasher
+.IP Quit
+Exit Dasher.
 
 .SS Edit
 
 .IP Cut
-Remove the highlighted text from the edit box and copy it to the clipboard
+Remove the highlighted text from the edit box and copy it to the clipboard.
 
 .IP Copy
 Copy the highlighted text from the edit box to the clipboard but don't remove 
-it
+it.
 
 .IP Paste
 Paste the contents of the clipboard into the edit box at the position of the
-cursor
+cursor.
 
 .IP "Copy all"
-Copy the entire contents of the edit box to the clipboard
+Copy the entire contents of the edit box to the clipboard.
 
 .IP "Select all"
-Highlight all of the text in the edit box
+Highlight all of the text in the edit box.
 
 .SS Options
 
@@ -94,34 +99,6 @@
 .B "THE PREFERENCES DIALOG"
 below)
 
-.IP "Edit font"
-Choose the font used in the edit box
-
-.IP "Dasher font"
-Choose the font used in the Dasher canvas
-
-.IP "Dasher font size"
-Choose the size of the font used in the Dasher canvas
-
-.IP "Reset fonts"
-Reset the fonts back to the defaults
-
-.IP "Enter text into other windows"
-Make Dasher enter text into the currently focused window. Requires Dasher to 
-have been built with 
-.B--with-a11y. 
-Note that some languages will only work correctly if XFree 4.0.2 or higher is 
-being used.
-
-.IP "Control mode"
-Provides a control node at the bottom of the screen. This allows various tasks
-to be performed inside Dasher, such as editing the text written, speaking 
-entered text and stopping or pausing Dasher. If compiled with 
-.B--with-a11y 
-and using a desktop supporting the ATK accessibility framework, compliant 
-applications will have their menu trees exported to Dasher and these may be
-accessed via this node.
-
 .SS Help
 
 .IP "About Dasher"
@@ -236,33 +213,28 @@
 
 .SH FILES
 
-.I /usr/share/dasher/
-.RS
-System-wide configuration files
-.RE
-.I ~/.dasher
-.RS
-User configuration files
-.RE
-
-.B dasher
-will utilise data from both of these directories. Training texts from both will
-be used, allowing users to add their own training data to the system wide data
-
-.I alphabet*.xml
-.RS
-The files defining the alphabets available to Dasher
-.RE
-.I colour*.xml
-.RS
-The files defining the colour schemes available to Dasher
-.RE
-.I train*txt
-.RS
-Files containing the training data used by Dasher. These are UTF-8 encoded 
-text and should contain a representative sample of the relevant language.
-
+.TP
+.B /usr/share/dasher/
+Directory containing system-wide configuration files.
+.TP
+.B ~/.dasher
+Directory containing user specific configuration files.
+.PP
+.B Dasher
+will utilise files of the following form from both of these directories:
+.TP
+.RI alphabet. ALPHABET .xml
+The files defining the alphabets available to Dasher.
+.TP
+.RI colour. SCHEME .xml
+The files defining the colour schemes available to Dasher.
+.TP
+.RI training_ LANGUAGE* .txt
+Files containing the training data used by Dasher. These are UTF-8
+encoded text and should contain a representative sample of the
+relevant language.  User specific training files can be used to
+augment system wide data.
 .SH AUTHOR
 
 The Dasher Project <dasher@mrao.phy.cam.ac.uk> - 
-http://www.inference.phy.cam.ac.uk/dasher/
+.URL http://www.inference.phy.cam.ac.uk/dasher/
