--- a/doc/user_guide.txt	Sun Nov 12 00:14:10 2006 +0000
+++ b/doc/user_guide.txt	Sun Nov 12 00:27:40 2006 +0000
@@ -2,7 +2,7 @@
 User Guide
 ==========
 
-:Version: $Revision: 1.35 $
+:Version: $Revision: 1.36 $
 
 .. contents::
 
@@ -261,26 +261,24 @@
 open (ie. not resolved) issues. This list has been generated by a bunch
 of controls `under the covers`_ but for now, you can see something like:
 
-.. img: images/index_logged_out.png
-
-The screen is divided up into three sections:
+.. image:: images/index_logged_out.png
 
-.. img: images/page_layout.png
+The screen is divided up into three sections. There's a title which tells
+you where you are, a sidebar which contains useful navigation tools and a
+body which usually displays either a list of items or a single item from
+the tracker.
 
-you may either register or log in. Registration takes you to:
-
-.. img: images/registration.png
+You may either register or log in. Registration takes you to:
 
-Once you're logged in, the screen changes slightly to:
+.. image:: images/registration.png
 
-.. img: images/index_logged_in.png
+Once you're logged in, the sidebar changes to:
 
-Note that the sidebar menu has changed slightly, so you can now get to
-your "My Details" page:
+.. image:: images/index_logged_in.png
 
-.. img: images/my_details.png
+You can now get to your "My Details" page:
 
-Note the new information on this page - the history.
+.. image:: images/my_details.png
 
 
 Display, edit or entry of an item
@@ -289,17 +287,12 @@
 Create a new issue with "create new" under the issue subheading. This
 will take you to:
 
-.. img: images/new_issue.png
-
-The `nosy list`_ is explained below. Enter some information and click
-"submit new entry" and you'll be rewarded with:
+.. image:: images/new_issue.png
 
-.. img: images/new_issue_created.png
+Editing an issue uses the same form, though now you'll see attached files
+and messages, and the issue history at the bottom of the page:
 
-or, if you don't enter all the required information (or some other error
-occurs) you'll get something like:
-
-.. img: images/new_issue_error.png
+.. image:: images/edit_issue.png
 
 
 Searching Page