--- a/html/entering_pwd.html
+++ b/html/entering_pwd.html
@@ -1,211 +1,186 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
+  <title>User Names and Passwords</title>
 
-		
-		
-		
-		
-		
-		
-  <title>User Names and Passwords</title>
+
 <!-- pwsafe version: 2.11--><!-- Modified: 15/06/2005 --><!--Popup control -->
   <script language="javascript" src="html/popups.js">
-		</script>
+  </script>
   <link rel="stylesheet" type="text/css" href="style.css">
+
 </head>
 
-	<body>
-<object id="popup" type="application/x-oleobject" classid="clsid:adb880a6-d8ff-11cf-9377-00aa003b7a11">
-		</object>
-		
-		<!-- Popup Source File -->
-		
-		
-		
-	
-		
+
+<body>
+
+<object id="popup" type="application/x-oleobject" classid="clsid:adb880a6-d8ff-11cf-9377-00aa003b7a11"> </object>
+<!-- Popup Source File -->
 <h2>User Names, Passwords, and Groups</h2>
 
-		<img src="images%5Cedit_view_entry.gif">
-		
-		
-<p>The following bits of information are associated with each password entry:</p>
+<img src="images%5Cedit_view_entry.gif">
+<p>The following bits of information are associated with each
+password entry:</p>
 
-		
 <ul>
 
-			<li><b>Group</b>: A name for grouping (organizing) multiple entries</li>
+  <li><b>Group</b>: A name for grouping (organizing)
+multiple entries</li>
 
-			<li><b>Title</b>: A friendly name for a password entry</li>
+  <li><b>Title</b>: A friendly name for a password
+entry</li>
 
-			<li><b>User name</b>: The user name</li>
+  <li><b>User name</b>: The user name</li>
 
-			<li><b>Password</b>: The password</li>
+  <li><b>Password</b>: The password</li>
 
-			<li><b>Notes</b>: Free-form general notes field</li>
+  <li><b>Notes</b>: Free-form general notes field</li>
 
-		
 </ul>
-In addition, the following fields may be used (viewable by pressing the "More&gt;&gt;" button on the Add or Edit dialog box):<br>
+
+In addition, the following fields may be used (viewable by pressing the
+"More&gt;&gt;" button on the Add or Edit dialog box):<br>
+
+<img style="width: 431px; height: 297px;" alt="Extra fields" src="images/edit_view_entry_more.gif"><br>
+
 <ul>
-  <li><span style="font-weight: bold;">URL</span>: The URL associated
+
+  <li><span style="font-weight: bold;">URL</span>:
+The URL associated
 with the entry. If this fieldis not empty, then the "Browse To" option
 is enabled. If the protocol is not specified, then "http://" is assumed
 (e.g., "www.foo.net" is the same as "http://www.foo.net").</li>
-  <li><span style="font-weight: bold;">Autotype</span>: If this field
+
+  <li><span style="font-weight: bold;">Autotype</span>:
+If this field
 is not empty, the its content replaces the default value for the
 autotype function. For more information, see the "<a href="autotype.html">Auto Type</a>" help topic.</li>
-  <li><span style="font-weight: bold;">Date/Time Information</span>:
+
+  <li><span style="font-weight: bold;">Date/Time
+Information</span>:
 These read-only field help keep track of when the selected entry was
-created, last accessed, etc. &nbsp;This information isn't displayed on
+created, last accessed, etc. &nbsp;This information isn't displayed
+on
 the Add Entry dialog box.</li>
-  <li><span style="font-weight: bold;">Password Expires On:</span> If set, <span style="font-weight: bold;">Password Safe</span>
+
+  <li><span style="font-weight: bold;">Password
+Expires On:</span> If set, <span style="font-weight: bold;">Password
+Safe</span>
 will warn when an entry is expired when the application is started. In
 addition, expired entries are indicated in the tree view by a different
 color.</li>
+
 </ul>
-<p>Only the title and password fields are required; all others are optional.</p>
 
+<p>Only the title and password fields are required; all others
+are optional.</p>
 
-		
 <div class="instr">
-			
 <h3>Creating a New User Name and Password Entry</h3>
 
-			
 <ol>
 
-				<li>Open the database where you wish to place the new entry</li>
+  <li>Open the database where you wish to place the new entry</li>
 
-				<li>From the <b>Edit</b> menu, select <b>Add Entry</b></li>
+  <li>From the <b>Edit</b> menu, select <b>Add
+Entry</b></li>
 
-				<li>Enter information into the <b>Edit/View Entry</b> dialog fields as necessary</li>
+  <li>Enter information into the <b>Edit/View Entry</b>
+dialog fields as necessary</li>
 
-			
 </ol>
 
-			
+<hr> <small><b>Note:</b>&nbsp;If a Group
+name is selected and then a new entry added, that entry will have that
+Group name prefilled in the <b>Edit/View Entry</b> dialog.
+If a name of a new group is added to the Group field, that Group will
+be created.<br>
+
+</small>
 <hr>
-			<small><b>Note:</b>&nbsp;If a Group name is selected and then a new entry added, that entry will have that Group name prefilled in the <b>Edit/View Entry</b> dialog. If a name of a new group is added to the Group field, that Group will be created.<br>
-</small>
-			
-<hr>
-
-			
 <h3>Generating and Editing Passwords</h3>
 
-			
-<p>If you wish, you can enter your own password into the password field manually, or you can have <b>Password Safe</b> generate a new one based on the current <a href="html%5Cpassword_policies.html">Password Policy</a>.</p>
+<p>If you wish, you can enter your own password into the password
+field manually, or you can have <b>Password Safe</b>
+generate a new one based on the current <a href="html%5Cpassword_policies.html">Password Policy</a>.</p>
 
-			
 <ol>
 
-				<li>In the <b>Edit/View Entry</b> dialog click <b>Generate</b></li>
+  <li>In the <b>Edit/View Entry</b> dialog click <b>Generate</b></li>
 
-				<li>Click <b>Yes</b> to accept the password or <b>No</b> to reject it<br>
+  <li>Click <b>Yes</b> to accept the password or <b>No</b>
+to reject it<br>
+
   </li>
 
-			
 </ol>
 
-			
-			
-<hr>
-			<small><b>Notes:</b>
-			
+<hr> <small><b>Notes:</b>
 <ul>
 
-			<li>To temporarily override the current password
-			policy check <b>Override Policy</b>.
-			</li>
-  <li>If your password or user name contains a
-			diacritical character ("&acute;", "`", "^", "&uml;" or "~"
-			for instance) followed by a character that can be
-			modified by it on your keyboard ("a" for instance),
-			the password must be entered as "[~][space]
-			[space][a]" (This applies to non-US keyboards only).
-			</li>
+  <li>To temporarily override the current password policy check <b>Override
+Policy</b>. </li>
+
+  <li>If your password or user name contains a diacritical
+character ("&acute;", "`", "^", "&uml;" or "~" for instance)
+followed by a character that can be modified by it on your keyboard
+("a" for instance), the password must be entered as "[~][space]
+[space][a]" (This applies to non-US keyboards only). </li>
+
 </ul>
 
-			</small>
-			
+</small>
 <hr>
-
-			
 <h3>Editing Existing Entries</h3>
 
-			
 <ol>
 
-				<li>Select the password entry to edit from the list</li>
+  <li>Select the password entry to edit from the list</li>
 
-				<li>Select <b>Edit/View Entry</b> from the <b>Edit</b> menu</li>
+  <li>Select <b>Edit/View Entry</b> from the <b>Edit</b>
+menu</li>
 
-			
 </ol>
 
-			
-			
+<hr> <small><b>Note:</b>&nbsp;By default,
+passwords are obscured. To see the password associated with the Entry
+click <b>Show Password</b>.<br>
+
+</small>
 <hr>
-			<small><b>Note:</b>&nbsp;By default, passwords are obscured. To see the password associated with the Entry click <b>Show Password</b>.<br>
-</small>
-			
-<hr>
-
-			
 <h3>Add a New Group</h3>
 
-			
 <ol>
 
-				<li>Select <b>Add Group</b> from the <b>Edit</b> menu</li>
+  <li>Select <b>Add Group</b> from the <b>Edit</b>
+menu</li>
 
-				<li>Enter the Group name</li>
+  <li>Enter the Group name</li>
 
-			
 </ol>
 
-
-			
 <h3>Edit a Group Name</h3>
 
-			
 <ul>
 
-				<li>Right-click on the group and select <b>Rename Group</b> from the drop down list</li>
+  <li>Right-click on the group and select <b>Rename Group</b>
+from the drop down list</li>
 
-			
 </ul>
 
+<hr> <small><b>Note:</b>&nbsp;Group names
+can be "nested," placing a group name within/under another group name.<br>
 
-			
-<hr>
-			<small><b>Note:</b>&nbsp;Group names can be "nested," placing a group name within/under another group name.<br>
 </small>
-			
-<hr>
-		</div>
+<hr> </div>
 
-	
-
-		<!-- Added some white space at the bottom for natural scrolling -->
-		<br>
-<br>
+<!-- Added some white space at the bottom for natural scrolling -->
 <br>
 
+<br>
 
-		<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
-			<param name="Keyword" value="User Names">
-			<param name="Keyword" value="Add Password Entries">
-			<param name="Keyword" value="Storing Passwords">
-			<param name="Keyword" value="Groups">
-			<param name="Keyword" value="Generating Passwords">
-			<param name="Keyword" value="Passwords">
-			<param name="Keyword" value="Edit Password Entries">
-			<param name="Keyword" value="View Password Entries">
-			<param name="Keyword" value="Renaming Password Entries">
-		</object>
-	
+<br>
+
+<object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e"> <param name="Keyword" value="User Names"> <param name="Keyword" value="Add Password Entries"> <param name="Keyword" value="Storing Passwords"> <param name="Keyword" value="Groups"> <param name="Keyword" value="Generating Passwords"> <param name="Keyword" value="Passwords"> <param name="Keyword" value="Edit Password Entries"> <param name="Keyword" value="View Password Entries"> <param name="Keyword" value="Renaming Password Entries"> </object>
 </body>
 </html>