--- a/docs/users-guide.xml
+++ b/docs/users-guide.xml
@@ -63,10 +63,10 @@
 			If a project is intented for website development, setting
 			the URL Root will enable project files to be launched in a
 			web browser. Suppose the project root also correlates to
-			the URL "http://localhost/myproject/" currently running on a
+			the URL <literal>http://localhost/myproject/</literal> currently running on a
 			web server, launching the file "hello.jsp" will launch the
 			web browser with the URL
-			"http://localhost/myproject/hello.jsp".
+			<literal>http://localhost/myproject/hello.jsp</literal>.
 		</para>
 
 	</chapter>
@@ -84,10 +84,10 @@
 
 		<para>
 			To open a Project Viewer window, you'll need to choose the
-			"Open Project Viewer" action from the plugin's menu.
-			Optionally, you can go to the Global Options dialog in
+			<guimenuitem>Open Project Viewer</guimenuitem> action from the plugin's menu.
+			Optionally, you can go to the <guimenuitem>Global Options</guimenuitem> dialog in
 			jEdit, and dock the window in your favorite position (in the
-			"Docking" tab). Note that activating a project or group
+			<guimenuitem>Docking</guimenuitem> tab). Note that activating a project or group
 			using the plugin menu will not open a Project Viewer window
 			if one is not already opened.
 		</para>
@@ -480,7 +480,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					Use external applications by default: if selected,
+					<guimenuitem>Use external applications by default</guimenuitem>: if selected, 
 					files that are open from the tree (by either
 					double-clicking or middle-clicking) will be opened
 					using the external application configured for the
@@ -496,29 +496,31 @@
 			</listitem>
 			<listitem>
 				<para>
-					Close files on project change: if selected, files
+					<guimenuitem>Close files on project change</guimenuitem>: if selected, files
 					from the current project that are opened in jEdit
 					will be closed when you switch to another project.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Remember open files: if selected, files opened in
+					<guimenuitem>Remember open files</guimenuitem>: if selected, files opened in
 					the current project will be re-opened when you
 					select the same project in a later moment, even
 					between different jEdit sessions.
 				</para>
 			</listitem>
 			<listitem><para>
-			    Use variable-prefixed paths when storing project data: 
+			    <guimenuitem>Use variable-prefixed paths when storing project data:</guimenuitem> 
 			    If selected, will use paths prefixed with environment variables,
 			    if appropriate variables are found in memory. This makes it possible to move
 			    project data from one machine to another when the absolute paths
 			    differ, but the paths relative to a variable remain the same.
-              </para></listitem>
-			<listitem>
-				<para>
-					Auto-remove non-existant files from project: if selected,
+			    Using jEdit 5.2 or later, it is also possible to use this feature
+			    to share the same settings files between Windows and non-Windows systems.
+      </para></listitem>
+			<listitem>
+				<para>
+					<guimenuitem>Auto-remove non-existant files from project</guimenuitem>: if selected,
 					each file in the project is verified to exist when
 					the project loads. If the file does not exist, it is
 					removed from the project.
@@ -526,7 +528,7 @@
 			</listitem>
 			<listitem>
 				<para>
-					Ask to import new files: if "Always" is selected,
+					<guimenuitem>Ask to import new files</guimenuitem>: if "Always" is selected,
 					every time you save a file located below the active
 					project's root, and the file is not yet part of the
 					project, you'll be asked whether you want to import
@@ -546,7 +548,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					Show toolbar: whether to show the plugin's toolbar
+					<guimenuitem>Show toolbar</guimenuitem>: whether to show the plugin's toolbar
 					or not. The toolbar is automatically hidden when no
 					tree is selected for showing, regardless of this
 					option.
@@ -554,26 +556,26 @@
 			</listitem>
 			<listitem>
 				<para>
-					Show folders tree: if the "Folders" tree view should
+					<guimenuitem>Show folders tree</guimenuitem>: if the "Folders" tree view should
 					be shown.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Show files tree: if the "Files" tree view should be
+					<guimenuitem>Show files tree</guimenuitem>: if the "Files" tree view should be
 					shown. Disabling this view can greatly improve
 					performance when your projects have many files.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Show working files tree: if the "Working Files" tree
+					<guimenuitem>Show working files tree</guimenuitem>: if the "Working Files" tree
 					view should be shown.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Show all open files: if the "Working Files" tree
+					<guimenuitem>Show all open files</guimenuitem>: if the "Working Files" tree
 					is shown, checking this will also show all open files in
 					the current View, whether the files are in the project or
 					not.
@@ -581,19 +583,19 @@
 			</listitem>
 			<listitem>
 				<para>
-					Show compact tree: whether the "Compact" tree view
+					<guimenuitem>Show compact tree</guimenuitem>: whether the "Compact" tree view
 					should be shown.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Show filtered tree: whether the "Filtered" tree view
+					<guimenuitem>Show filtered tree</guimenuitem>: whether the "Filtered" tree view
 					should be shown.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
-					Use system icons for files: instead of using jEdit's
+					<guimenuitem>Use system icons for files</guimenuitem>: instead of using jEdit's
 					icons, uses the system provided icon for each
 					individual files. The jEdit icon will still be used
 					when the file is opened. On some systems, the system
@@ -604,7 +606,7 @@
 
 			<listitem>
 				<para>
-					Show project (or group) name in the view's title bar:
+					<guimenuitem>Show project (or group) name in the view's title bar:</guimenuitem>
 					if selected, the jEdit window title will be updated
 					with information about the currently active project
 					or group in that window.
@@ -613,7 +615,7 @@
 
 			<listitem>
 			    <para>
-			    Follow active node in tree: this option will make PV
+			    <guimenuitem>Follow active node in tree:</guimenuitem> this option will make PV
 			    automatically select the node corresponding to the
 			    active buffer as you switch between buffers.
 			    </para>
@@ -632,7 +634,7 @@
 		<itemizedlist>
 			<listitem>
 				<para>
-					Files to include: a list of globs that match files
+					<guimenuitem>Files to include:</guimenuitem> a list of globs that match files
 					you want to include in a project (e.g., "*.html",
 					"*.java", "README*"). If you want to exclude files
 					from the automatic import, prepend the glob with the
@@ -641,7 +643,7 @@
 			</listitem>
 			<listitem>
 				<para>
-					Directories to ignore: space-separated list of globs
+					<guimenuitem>Directories to ignore:</guimenuitem> space-separated list of globs
 					to match directory names to ignore when doing
 					automatic import of files. No files within
 					directories whose names are listed here will be
@@ -669,12 +671,12 @@
 
 		<section><title>File Associations</title>
 
-		<para> If the option "Use Desktop File Associations" is checked,
+		<para> If the option <guimenuitem>Use Desktop File Associations</guimenuitem> is checked,
 		    then the desktop's chosen application will be used to launch a
 		    program on the selected file in ProjectViewer. Otherwise,
-			The "External Applications" option pane can be used to
+			The <guimenuitem>External Applications</guimenuitem> option pane can be used to
 			register applications you want to use for specific file
-			type, accessible through the "Open with..." context menu
+			type, accessible through the <guimenuitem>Open with...</guimenuitem> context menu
 			command for files. Just add a file name glob and choose the
 			application you wish to use for that entry.
 		</para>
@@ -693,9 +695,9 @@
 		<para>
 			To create a filter, provide a file name glob (see jEdit's
 			documentation for the supported glob syntax) and a name for
-			the filter. If the "Show filtered tree" option is enabled,
+			the filter. If the <guimenuitem>Show filtered tree</guimenuitem> option is enabled,
 			a new "virtual directory" with the filter name will be
-			available in the "Filtered" tab of the ProjectViewer window,
+			available in the <guimenuitem>Filtered</guimenuitem> tab of the ProjectViewer window,
 			containig all file names that match the glob. Files that
 			match more than one filter will be listed several times
 			in this view.