Common subdirectories: ../../default/html/.svn and ./source/html/.svn
diff -bNau ../../default/html/export.html ./source/html/export.html
--- ../../default/html/export.html	2011-03-07 11:34:42.000000000 +0300
+++ ./source/html/export.html	2011-03-07 13:03:49.000000000 +0300
@@ -72,9 +72,8 @@
 exporting them. If you are going to import a text file created with such a
 delimiter, <span style="font-weight: bold;"></span>then it must be specified,
 all the Notes lines will appear as one single line in the resulting
-database.<br>
-
-If required, tick that you want to put all separate lines
+database.</p>
+<p>If required, tick that you want to put all separate lines
 in the Notes field onto one line and enter the character to be used as
 the delimiter. Since the whole Notes field is enclosed between double
 quotation marks, this character is prohibited from being selected as
@@ -83,23 +82,22 @@
 </ul>
 
 <ul>
-<li>Even more control on the exported format may be specified by clicking on "Advanced".
-The following dialog box will appear:</li>
+<li><p>Even more control on the exported format may be specified by clicking on "Advanced".
+The following dialog box will appear:</p></li>
 </ul>
 
 <p><img alt="Advanced Text Export Options" src="images/export_text_adv.jpg"></p>
 
 <p>This dialog box allows you to export only some of the entries,
 based on the text in specified fields, and/or specify which fields are
-to be exported. Click OK when you have finished, or Cancel to return to
-the Export Text dialog box without any changes.</p>
+to be exported.</p>
 
 <p>You will then be asked to supply the name of the new file and
 to confirm overwriting a file of the same name if it already exists in
 the directory you specified.</p>
 
 <hr style="width: 100%; height: 2px;">
-<small>Note: Details on the format of the exported text file may be found in the
+<small><b>Note:</b> Details on the format of the exported text file may be found in the
 "<a href="imp_exp_text_details.html">Plain Text Export &amp; Import Format</a>" section.</small>
 <hr style="width: 100%; height: 2px;">
 
@@ -126,8 +124,7 @@
 The display of XML files is specified by <span style="font-style: italic;">pwsafe.xsl</span>
 - an eXtensible Stylesheet Language file. A sample file, which may be
 modified for your own needs, is supplied as part of the distribution.
-This file is only an example and you can easily modify it to display
-whatever fields you want to show.  As this only displays the data
+As this only displays the data
 and will not alter it, you will still be able to import it into
 Password Safe at some later time.<br>
 <br>
@@ -141,8 +138,7 @@
 
 <p>This dialog box allows you to export only some of the entries,
 based on the text in specified fields, and/or specify which fields are
-to be exported. Click OK when you have finished, or Cancel to return to
-the Export XML dialog box without any changes. Note that the XML schema
+to be exported. Note that the XML schema
 requires the Title and Password fields, hence these cannot be
 deselected.</p>
 
diff -bNau ../../default/html/file_menu.html ./source/html/file_menu.html
--- ../../default/html/file_menu.html	2010-11-06 22:24:17.000000000 +0300
+++ ./source/html/file_menu.html	2011-03-07 12:14:10.000000000 +0300
@@ -392,9 +392,9 @@
 
 
 
-Display information about the currently opened password safe database, such as: format
+<p>Display information about the currently opened password safe database, such as: format
 version, number of groups, number of entries, and information about
-when it was last saved and by whom.
+when it was last saved and by whom.</p>
 <h3>Exit</h3>
 
 
Common subdirectories: ../../default/html/images and ./source/html/images
diff -bNau ../../default/html/images.html ./source/html/images.html
--- ../../default/html/images.html	2011-02-13 13:33:07.000000000 +0300
+++ ./source/html/images.html	2011-03-07 12:14:10.000000000 +0300
@@ -23,8 +23,8 @@
 
 <h1>Entry Icons</h1>
 
-<p>The following images are used to show the type of entry in the Tree and List views.
-Note: these images are always displayed in the Tree view.  In the List view, the Icon
+<p>The following images are used to show the type of entry in the Tree and List views.<p>
+<p><b>Note:</b> These images are always displayed in the Tree view.  In the List view, the Icon
 column can be added or removed using the Column Picker and can only be in column 1.</p>
 
 <p class="indented"><img src="images/node.png"/>&nbsp;Node or Group [Tree View <i>only</i>]</p>
diff -bNau ../../default/html/imp_exp_text_details.html ./source/html/imp_exp_text_details.html
--- ../../default/html/imp_exp_text_details.html	2010-09-05 00:12:11.000000000 +0400
+++ ./source/html/imp_exp_text_details.html	2011-03-07 12:14:10.000000000 +0300
@@ -58,23 +58,23 @@
 Title Row for full data export currently contains&nbsp;the
 following fields by default, separated by a tab.</span></p>
 <ul>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Group/Title</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Username</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Password</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">URL</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">AutoType</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Created Time</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Password Modified Time</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Last Access Time</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Password Expiry Date</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Password Expiry Interval</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Record Modified Time</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Password Policy</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">History</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Run Command</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">DCA</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">e-mail</span></li>
-  <li><span style="font-size: 11pt;" lang="EN-GB">Notes</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Group/Title_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Username_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Password_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_URL_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_AutoType_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Created Time_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Password Modified Time_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Last Access Time_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Password Expiry Date_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Password Expiry Interval_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Record Modified Time_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Password Policy_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_History_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Run Command_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_DCA_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_e-mail_</span></li>
+  <li><span style="font-size: 11pt;" lang="EN-GB">_Notes_</span></li>
 </ul>
 <p class="CitiChangeSummarybullet" style="margin-left: 0in; text-align: justify;"><span style="font-size: 11pt;" lang="EN-GB"><span style=""></span>When
 exporting data, you
@@ -114,72 +114,72 @@
       </td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Column Heading/Field</td>
+      <td style="padding: 0in 5.4pt;">_Group/Title_</td>
       <td style="padding: 0in 5.4pt;">If present, groups are separated by periods (&lsquo;.&rsquo;). The Title field cannot be
 blank, empty or contain the delimiter character.</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Username</td>
+      <td style="padding: 0in 5.4pt;">_Username_</td>
       <td style="padding: 0in 5.4pt;"> </td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Password</td>
+      <td style="padding: 0in 5.4pt;">_Password_</td>
       <td style="padding: 0in 5.4pt;">Cannot be blank or empty.</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">URL</td>
+      <td style="padding: 0in 5.4pt;">_URL_</td>
       <td style="padding: 0in 5.4pt;"> </td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Autotype</td>
+      <td style="padding: 0in 5.4pt;">_Autotype_</td>
       <td style="padding: 0in 5.4pt;"> </td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Created Time</td>
+      <td style="padding: 0in 5.4pt;">_Created Time_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Password Modified Time</td>
+      <td style="padding: 0in 5.4pt;">_Password Modified Time_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Last Access Time</td>
+      <td style="padding: 0in 5.4pt;">_Last Access Time_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Password Expiry Date</td>
+      <td style="padding: 0in 5.4pt;">_Password Expiry Date_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Password Expiry Interval</td>
+      <td style="padding: 0in 5.4pt;">_Password Expiry Interval_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Record Modified Time</td>
+      <td style="padding: 0in 5.4pt;">_Record Modified Time_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#1"><sup>1</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Password Policy</td>
+      <td style="padding: 0in 5.4pt;">_Password Policy_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#3"><sup>3</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">History</td>
+      <td style="padding: 0in 5.4pt;">_History_</td>
       <td style="padding: 0in 5.4pt;">See note <a href="#2"><sup>2</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Run command</td>
+      <td style="padding: 0in 5.4pt;">_Run Command_</td>
       <td style="padding: 0in 5.4pt;"></td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">DCA</td>
+      <td style="padding: 0in 5.4pt;">_DCA_</td>
       <td style="padding: 0in 5.4pt;"> = &lsquo;Double Click Action&rsquo;. See note <a href="#4"><sup>4</sup></a> below</td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">e-mail</td>
+      <td style="padding: 0in 5.4pt;">_e-mail_</td>
       <td style="padding: 0in 5.4pt;"></td>
     </tr>
     <tr>
-      <td style="padding: 0in 5.4pt;">Notes</td>
+      <td style="padding: 0in 5.4pt;">_Notes_</td>
       <td style="padding: 0in 5.4pt;">
       <ul>
         <li>The Notes field should be enclosed by double quotes ("like this").</li>
@@ -190,18 +190,8 @@
   </tbody>
 </table>
 
-<table border="0" cellpadding="0" cellspacing="0">
-  <tbody>
-    <tr>
-      <td style="padding: 0in 5.4pt; width: 80pt;" valign="top">
-      <p><a name="1"></a><b><u>Notes:</u> <sup>1</sup></b></p>
-      </td>
-      <td style="padding: 0in 5.4pt;" valign="top">
-      <p>Time fields can be one of the following 5 formats:</p>
-      </td>
-    </tr>
-  </tbody>
-</table>
+      <a name="1"></a><b><u>Note 1.</u></b>
+      Time fields can be one of the following 5 formats:
 
 <table border="0" cellpadding="0" cellspacing="0">
   <tbody>
@@ -241,7 +231,7 @@
     <td style="padding: 0in 15.4pt;">yyyy</td><td>The year in full. Value is between 1970 and 2038.</td>
     </tr>
     <tr>
-    <td style="padding: 0in 15.4pt;">mm</td><td>The month; e.g. 01 = January, 02 = February etc.</td>
+    <td style="padding: 0in 15.4pt;">MM</td><td>The month; e.g. 01 = January, 02 = February etc.</td>
     </tr>
     <tr>
     <td style="padding: 0in 15.4pt;">dd</td><td>The day of the month</td>
@@ -269,19 +259,9 @@
 &lsquo;3&rsquo; conforms to the ISO 8601 standard.</small>
 </p>
 <hr style="width: 100%; height: 2px;">
-<table class="MsoTableGrid" style="border-collapse: collapse;" border="0" cellpadding="0" cellspacing="0">
-  <tbody>
-    <tr style="">
-      <td style="padding: 0in 5.4pt; width: 80pt;" valign="top" width="47">
-      <p class="CitiChangeSummarybullet" style="margin-left: 0in; text-align: justify;"><a name="2"></a><b><u>Notes:</u> <sup>2</sup></b></p>
-      </td>
-      <td style="padding: 0in 5.4pt; " valign="top">
-      <p class="CitiChangeSummarybullet" style="margin-left: 0in; text-align: justify;"><span style="font-size: 11pt;" lang="EN-GB">Password history is represented in the exported entry record as a text field
-comprising a header followed by the required number of entries of old passwords:</span></p>
-      </td>
-    </tr>
-  </tbody>
-</table>
+<a name="2"></a><b><u>Note 2.</u></b>
+<span style="font-size: 11pt;" lang="EN-GB">Password history is represented in the exported entry record as a text field
+comprising a header followed by the required number of entries of old passwords:</span>
 <p class="CitiChangeSummarybullet" style="margin-left: 0.5in; text-align: justify;"><span style="font-size: 11pt;" lang="EN-GB">Password History Header:</span></p>
 <ul>
   <li><span style="font-size: 11pt;" lang="EN-GB">1 hexadecimal digit<span style="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;     </span>status for saving PWH for this entry (0 = no; 1 = yes)</span></li>
@@ -296,15 +276,9 @@
 </ul>
 <!-- Added some white space at the bottom for natural scrolling --><br>
 <hr>
-<table border="0" cellpadding="0" cellspacing="0">
-  <tbody>
-    <tr>
-      <td style="padding: 0in 5.4pt; width: 80pt;" valign="top">
-      <p><a name="3"></a><b><u>Notes:</u> <sup>3</sup></b></p>
-      </td>
-      <td style="padding: 0in 5.4pt;" valign="top">
-      <p>The Password Policy is represented in the exported entry record as a text field 'ffffnnnllluuudddsss' in hexadecimal format, e.g. 'F000010004002005003'. 
-      6 hexadecimal values are contained in this format. The first value has 4 digits, all other 3.</p>
+      <a name="3"></a><b><u>Note 3.</u></b>
+      The Password Policy is represented in the exported entry record as a text field 'ffffnnnllluuudddsss' in hexadecimal format, e.g. 'F000010004002005003'. 
+      6 hexadecimal values are contained in this format. The first value has 4 digits, all other 3.
 <p>'ffffnnnllluuudddsss' means in detail:</p>
 <ul>
 <li>ffff : 4 hexadecimal digits representing the following flags
@@ -338,14 +312,8 @@
   </tbody>
 </table>
 <hr>
-<table border="0" cellpadding="0" cellspacing="0">
-  <tbody>
-    <tr>
-      <td style="padding: 0in 5.4pt; width: 80pt;" valign="top">
-      <p><a name="4"></a><b><u>Notes:</u> <sup>4</sup></b></p>
-      </td>
-      <td style="padding: 0in 5.4pt;" valign="top">
-      <p>The following values for <i><b>Double Click Action</b></i> are availble:</p>
+      <a name="4"></a><b><u>Note 4.</u></b>
+      The following values for <i><b>Double Click Action</b></i> are availble:
 <ul><li>-1:&nbsp;Default</li>
 <li>0:&nbsp;&nbsp;Copy password to clipboard</li>
 <li>1:&nbsp;&nbsp;View/Edit selected entry</li>
@@ -358,10 +326,6 @@
 <li>8:&nbsp;&nbsp;Run Command</li>
 <li>9:&nbsp;&nbsp;Send email</li>
 </ul>
-      </td>
-    </tr>
-  </tbody>
-</table>
 <br>
 <br>
 <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e"> <param name="Keyword" value="Export Password Entries"> <param name="Keyword" value="Import Password Entries"> <param name="Keyword" valuetext="" password="" data="">
diff -bNau ../../default/html/manage_menu.html ./source/html/manage_menu.html
--- ../../default/html/manage_menu.html	2010-11-06 22:22:54.000000000 +0300
+++ ./source/html/manage_menu.html	2011-03-07 12:14:10.000000000 +0300
@@ -19,7 +19,7 @@
 options and settings are controlled. </p>
 
 <div class="instr">
-<h3>Change Safe Combination</h3>
+<h3>Change Safe Combination...</h3>
 
 <p> Selecting this option brings up the Change Safe Password
 dialog.<br>
@@ -35,7 +35,7 @@
 Up and Restoring Databases</a> for more information.</i></small>
 </p>
 
-<h3>Restore from Backup</h3>
+<h3>Restore from Backup...</h3>
 
 <p>Restore a backed up password database file.<br>
 
@@ -73,7 +73,7 @@
 <small>Many of the setting are stored as <span style="font-style: italic;">preferences</span>, as
 described <a href="preferences.html">here</a>.</small>
 </div>
-<h3>Validate</h3>
+<h3>Validate...</h3>
 <p>After selecting a database, this database will be checked  for being completely compatible to  <b>PassowrdSafe</b>.<br>
 
 <small>Note: This menu item will only be enabled if there is no&nbsp;database currently opened.</small>
diff -bNau ../../default/html/menu_toolbar.html ./source/html/menu_toolbar.html
--- ../../default/html/menu_toolbar.html	2011-01-24 21:58:21.000000000 +0300
+++ ./source/html/menu_toolbar.html	2011-03-07 12:14:10.000000000 +0300
@@ -31,8 +31,8 @@
 <table align="center" cellspacing="5">
   <tbody>
     <tr bgcolor="#003333">
-      <td align="center" width="10%"><b><font color="white">Classic</font></b></td>
-      <td align="center" width="10%"><b><font color="white">New</font></b></td>
+      <td align="center" width="10%"><b><font color="white">Classic style</font></b></td>
+      <td align="center" width="10%"><b><font color="white">New style</font></b></td>
       <td align="center" width="10%"><b><font color="white">Default</font></b></td>
       <td><b><font color="white">Description</font></b></td>
     </tr>
diff -bNau ../../default/html/password_history.html ./source/html/password_history.html
--- ../../default/html/password_history.html	2010-09-05 00:12:11.000000000 +0400
+++ ./source/html/password_history.html	2011-03-07 12:14:10.000000000 +0300
@@ -62,8 +62,7 @@
 
 <img alt="Password History" src="images/edit_view_entry_add.jpg">
 <p>This dialog box displays the last few previous passwords associated
-with a given entry. To display this, click on the "Password History"
-button in the Edit/View Entry dialog box. You can do the following
+with a given entry. You can do the following
 operations here:</p>
 
 
@@ -87,7 +86,7 @@
 
 
 Clicking on a row in the list of recent passwords will copy the password displayed in that row&nbsp;to the clipboard.
-<h3>Clear History</h3>
+<h3>Clear</h3>
 
 
 
diff -bNau ../../default/html/password_history_tab.html ./source/html/password_history_tab.html
--- ../../default/html/password_history_tab.html	2010-09-05 00:12:11.000000000 +0400
+++ ./source/html/password_history_tab.html	2011-03-07 12:14:10.000000000 +0300
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>Setting a Password Policy</title>
+  <title>Password History</title>
 
 
 <!-- pwsafe version: 2.11--><!-- Modified: 15/06/2005 --><!--Popup control -->
diff -bNau ../../default/html/password_policies.html ./source/html/password_policies.html
--- ../../default/html/password_policies.html	2010-09-05 00:12:11.000000000 +0400
+++ ./source/html/password_policies.html	2011-03-07 12:14:10.000000000 +0300
@@ -27,7 +27,7 @@
 
 <object id="popup" type="application/x-oleobject" classid="clsid:adb880a6-d8ff-11cf-9377-00aa003b7a11"> </object>
 <!-- Popup Source File -->
-<h2>Setting a Password Policy</h2>
+<h2>Password Policy Tab</h2>
 
 
 
diff -bNau ../../default/html/run_command.html ./source/html/run_command.html
--- ../../default/html/run_command.html	2010-09-05 15:49:24.000000000 +0400
+++ ./source/html/run_command.html	2011-03-07 12:14:10.000000000 +0300
@@ -10,7 +10,7 @@
   
   
 
-  <title>Run Command</title><!-- pwsafe version: 3.17--><!-- Modified: 11/03/2009 --><!--Popup control --><script language="javascript" src="html/popups.js">
+  <title>Using Run Command</title><!-- pwsafe version: 3.17--><!-- Modified: 11/03/2009 --><!--Popup control --><script language="javascript" src="html/popups.js">
   </script>
   
   
@@ -23,7 +23,7 @@
 
 <object id="popup" type="application/x-oleobject" classid="clsid:adb880a6-d8ff-11cf-9377-00aa003b7a11"> </object>
 <!-- Popup Source File -->
-<h1>Run Command</h1>
+<h1>Using Run Command</h1>
 
 
 
diff -bNau ../../default/html/style.css ./source/html/style.css
--- ../../default/html/style.css	2010-09-05 00:12:11.000000000 +0400
+++ ./source/html/style.css	2011-03-07 12:14:10.000000000 +0300
@@ -6,6 +6,7 @@
 	color:black;
 	font-size="small";
 	background-color: white;
+	text-align:justify;
 	}
 
 A:link {color: #0069CE; text-decoration: none;} 
@@ -26,19 +27,23 @@
 	{
 	margin-top: .75em;
 	margin-bottom: 1.25em;	
+	text-align:justify;
 	}	
 
 li	{
 	margin-left: .15in;
+	text-align:justify;
 	}	 
 
 ol li
 	{
 	margin-left: .10in;
+	text-align:justify;
 	}
 
 ul	{
 	list-style: disc;
+	text-align:justify;
 	}
 
 ul.onestep
@@ -73,3 +78,16 @@
 	vertical-align: top;
 	padding: 0;
 	}
+
+td p	{
+	margin: .25em;
+	vertical-align: top;
+	padding: 0;
+	text-indent: 0;
+	}
+
+p	{
+        text-align:justify;
+	text-indent: 3ex;
+	margin:0.25em;
+	}
diff -bNau ../../default/html/wzselectdb.html ./source/html/wzselectdb.html
--- ../../default/html/wzselectdb.html	2011-02-07 18:45:12.000000000 +0300
+++ ./source/html/wzselectdb.html	2011-03-07 12:14:10.000000000 +0300
@@ -39,13 +39,19 @@
 based on the contents of the Group, Title, User Name, URL or Notes fields and/or which
 fields to Compare, Merge, Synchronize or Export.</p>
 
-<p>Note 1: When exporting a single entry via the Edit Menu or Context Menu (by right
+<hr>
+<small><b>Notes:</b><br></small>
+<ul>
+<li><small>Note 1: When exporting a single entry via the Edit Menu or Context Menu (by right
 clicking on the entry), the option to restrict the export based on the contents of
-the Group, Title, User Name, URL or Notes fields is obviously not available.</p>
-
-<p>Note 2: When Merging a database into the currently open database, you will not be able
+the Group, Title, User Name, URL or Notes fields is obviously not available.</small>
+</li>
+<li><small>Note 2: When Merging a database into the currently open database, you will not be able
 to restrict which fields of the entries being merged are copied.  If an entry passes your
-selection criteria, then the complete entry will be merged into the current database.</p>
+selection criteria, then the complete entry will be merged into the current database.</small>
+</li>
+</ul>
+<hr>
 <br>
 <br>
 <br>
--- ../../default/pwsafe.hhc	2011-03-07 11:34:42.000000000 +0300
+++ ./source/pwsafe.hhc	2011-03-07 12:14:10.000000000 +0300
@@ -153,7 +153,7 @@
 			<param name="Local" value="html\display_tab.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Misc. Options">
+			<param name="Name" value="Misc Options">
 			<param name="Local" value="html\misc_tab.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
