pull up r19428 from trunk

r19428@cathode-dark-space: jaltman | 2007-04-12 01:32:20 -0400 ticket: new subject: NIM 1.2 HtmlHelp User Documentation component: windows tags: pullup Update all text for NIM 1.2. Update most screen images. Convert all images to PNG format from BMP in order to reduce the size of the files. Ensure that all pages are accessible via a path beginning at the welcome.htm page. ticket: 5525 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19438 dc483132-0cff-0310-8789-dd5450dbe970
author: Tom Yu <tlyu@mit.edu> 2007-04-12 20:12:32 +0000
committer: Tom Yu <tlyu@mit.edu> 2007-04-12 20:12:32 +0000
commit: 4389aeb47a02bebb79315ddb288ebf4a9312000b (patch)
tree: dafd2edcc2ac18a400563f96843b63b79e3523ad /src
parent: fd7c05e9b3837d460c6ed35eb289bb63b479dbf4 (diff)
download: krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.zip
krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.tar.gz
krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.tar.bz2
91 files changed, 781 insertions, 397 deletions
diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile
index 2cfe823..8cb7f71 100644
--- a/src/windows/identity/help/Makefile
+++ b/src/windows/identity/help/Makefile
@@ -36,4 +36,4 @@ $(CHMFILE): netidmgr.hhp
 	$(CP) netidmgr.chm $(CHMFILE)
 
 clean::
-	if exist '..\obj' $(RM) $(INCFILES)
-\ No newline at end of file
+	if exist '..\obj' $(RM) $(INCFILES)
diff --git a/src/windows/identity/help/html/act_chpw.htm b/src/windows/identity/help/html/act_chpw.htm
index 40f9705..ce977d2 100644
--- a/src/windows/identity/help/html/act_chpw.htm
+++ b/src/windows/identity/help/html/act_chpw.htm
@@ -1,21 +1,22 @@
 <html>
 <head>
-  <title>Change Password</title>
+  <title>Network Identity Manager - Change Password</title>
   <meta name="description" content="change password">
   <meta name="keywords" content="change password dialog">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Change Password</h1>
+<h1>Network Identity Manager - Change Password</h1>
 
 <p>The change password dialog can be invoked from the <a
 href="menu_credential.htm">Credentials</a> menu.  This is used to
 change the password for the primary credentials provider (currently
-Kerberos 5).
+Kerberos v5).
 </p>
+<p><img border="0" src="images/screen_chng_pwd.png" width="456" height="244"></p>
 
-<p>For the default identity provider (Kerberos 5), there are two input
+<p>For the default identity provider (Kerberos v5), there are two input
 boxes to specify the identity for which the password is to be changed.
 The identity uniquely maps to the Kerberos principal of the same name.
 Then the current password must be entered along with the new password
@@ -23,7 +24,7 @@ twice.
 </p>
 
 <p>Note that currently, when the password for an identity is being
-changed, only the associated Kerberos 5 password is changed.
+changed, only the associated Kerberos v5 password is changed.
 </p>
 
 </body>
diff --git a/src/windows/identity/help/html/act_destroy_creds.htm b/src/windows/identity/help/html/act_destroy_creds.htm
index ff24561..9d9ce3e 100644
--- a/src/windows/identity/help/html/act_destroy_creds.htm
+++ b/src/windows/identity/help/html/act_destroy_creds.htm
@@ -1,17 +1,16 @@
 <html>
 <head>
-  <title>Destroy Credentials</title>
+  <title>Network Identity Manager - Destroy Credentials</title>
   <meta name="description" content="Destroy Credentials">
   <meta name="keywords" content="destroy credentials">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Destroy Credentials</h1>
+<h1>Network Identity Manager - Destroy Credentials</h1>
 
 <p>This action will attempt to destroy the credentials that are
-currently selected in the credentials window.  How the credentials are
-destroyed is up to each credentials provider.
+currently selected in the credentials window.
 </p>
 
 <p>In some cases, you may need to select all the credentials of a
diff --git a/src/windows/identity/help/html/act_import_creds.htm b/src/windows/identity/help/html/act_import_creds.htm
index 550bb39..2ccd01a 100644
--- a/src/windows/identity/help/html/act_import_creds.htm
+++ b/src/windows/identity/help/html/act_import_creds.htm
@@ -1,26 +1,25 @@
 <html>
 <head>
-  <title>Import Credentials</title>
+  <title>Network Identity Manager - Import Credentials</title>
   <meta name="description" content="Import Credentials">
   <meta name="keywords" content="Import Credentials">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Import Credentials</h1>
+<h1>Network Identity Manager - Import Credentials</h1>
 
-<p>Allows you to import credentials from the Windows LSA credentials
-cache into any of the caches under the control of any credentials
-provider.  Currently, the only credentials provider that supports
-importing is Kerberos 5.
+<p>Allows you to import credentials from the Microsoft Windows LSA credentials
+cache.  Currently, the only credentials provider that supports
+importing is Kerberos v5.
 </p>
 
 <p>This action can be invoked via the <a
 href="menu_credential.htm">Credentials</a> menu or by pressing <span
-class="pre">Ctrl + I</span>.  In addition, the Kerberos 5
+class="pre">Ctrl + I</span>.  In addition, the Kerberos v5
 configuration pane accessible via the <a
-href="menu_options.htm">Options</a> menu provides an options that
-control how the importing of credentials happen.
+href="menu_options.htm">Options</a> menu contain settings that
+control when the importing of credentials are performed at startup.
 </p>
 
 </body>
diff --git a/src/windows/identity/help/html/act_new_creds.htm b/src/windows/identity/help/html/act_new_creds.htm
index f2769e0..6324088 100644
--- a/src/windows/identity/help/html/act_new_creds.htm
+++ b/src/windows/identity/help/html/act_new_creds.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>New Credentials</title>
+  <title>Network Identity Manager - New Credentials</title>
   <meta name="description" content="obtain new credentials">
   <meta name="keywords" content="new creds">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>New Credentials</h1>
+<h1>Network Identity Manager - New Credentials</h1>
 
 <p>The new credentials dialog can be invoked from the <a
 href="menu_credential.htm">Credentials</a> menu, by typing <span
@@ -21,14 +21,11 @@ following:
 </p>
 
 <p>
-<img src="images/screen_new_creds.bmp" alt="New credentials dialog"/>
+<img src="images/screen_new_creds.png" alt="New credentials dialog"/>
 <p class="caption">New credentials dialog with a valid identity
-selected.</p> <p class="caption"><i>Note that the above screenshot is
-from an instance of NetIDMgr with Kerberos 5, Kerberos 4 and OpenAFS
-plugins with a Kerberos 5 identity manager.  Actual display may be
-different depending on the plugins that are active.</i></p>
+selected.</p> 
 
-<p>If the Kerberos 5 identity provider is used, the dialog will ask
+<p>If the Kerberos v5 identity provider is used, the dialog will ask
 for a username and a realm to determine the identity for which new
 credentials will be obtained for.  Depending on the selected identity,
 you may be required to provide a password or other form of
@@ -36,31 +33,35 @@ authentication for new credentials to be obtained.
 </p>
 
 <p>Below the prompts is the credentials summary window.  This window
-provides an overview of the credentals that will be obtained when the
+provides an overview of the credentials that will be obtained when the
 dialog is completed.
 </p>
 
 <h3>Expanded view</h3>
 
 <p>If you click any of the credentials type hyperlinks in the
-credentials summary window or select the <span class="pre">Options
-&gt;&gt;</span> button, the dialog will switch to the exanded view.
+credentials summary window or select the <span class="pre">&gt;&gt;</span> button, the dialog will switch to the expanded view.
 An example of this is shown below:
 </p>
 
 <p>
-<img src="images/screen_new_creds_exp.bmp"
+<img src="images/screen_new_creds_exp.png"
 alt="Expanded new credentials window" />
 
-<p class="caption">Expanded view of the new credetials dialog</p>
+<p class="caption">Expanded view of the new credentials dialogg</p>
 
 <p>
 The expanded view provides access to additional options available for
-each credential provider.  For example, the Kerberos 5 credentials
+each credential provider.  For example, the Kerberos v5 credentials
 provider allows you to set the lifetime of the obtained Kerberos
 ticket as well as ticket flags such as <i>renewable</i> or
 <i>forwardable</i>.
 </p>
+<p>
+<i>Note that the above screenshot is
+from an instance of NetIDMgr with Kerberos v5, Kerberos v4, OpenAFS and 
+Kerberized Certificate Authority providers with a Kerberos v5 identity provider.  Actual display may be
+different depending on the providers that are active.</i></p>
 
 <h3>Credentials summary window</h3>
 
@@ -76,22 +77,21 @@ window will display a message describing the problem.  For example:
 </p>
 
 <p>
-<img src="images/screen_new_creds_err01.bmp" alt="Credentials summary window showing an invalid identity" />
+<img src="images/screen_new_creds_err01.png" alt="Credentials summary window showing an invalid identity" />
 </p>
 
 <p>
 The above is an example of what you would see if the provided identity
-is invalid.  Once the identity provider (in this case, Kerberos 5)
+is invalid.  Once the identity provider (in this case, Kerberos v5)
 indicates that the identity is invalid, it will be displayed as above
 along with a brief description of why the identity was found to be
-invalid.  Here, the Kerberos 5 identity provider is reporting that the
+invalid.  Here, the Kerberos v5 identity provider is reporting that the
 specified principal does not exist in the Kerberos database.
 </p>
 
 <h3>Additional notes</h3>
 
-<p>
-The new credentials dialog can be invoked from the command line using
+<p>The new credentials dialog can be invoked from the command line using
 the <span class="pre"> -i </span> or <span class="pre"> --kinit
 </span> command line option.  Additionally, if you specify the <span
 class="pre"> -a </span> or <span class="pre"> --autoinit </span>
@@ -100,10 +100,9 @@ there are no credentials available.
 </p>
 
 <p>
-Setting the <span class="pre">Prompt for new credentials if there
-aren't any at startup</span> option is set in the <span
-class="pre">General</span> configuration panel, then the behavior is
-similar to the <span class="pre">--autoinit</span> option.
+Setting the <span class="pre">Obtain new credentials at startup (if none are present)</span> option in the <span
+class="pre">General</span> configuration panel causes NetIDMgr to behave as if 
+the <span class="pre">--autoinit</span> option is specified at each execution.
 </p>
 
 </body>
diff --git a/src/windows/identity/help/html/act_renew_creds.htm b/src/windows/identity/help/html/act_renew_creds.htm
index 0bd196a..7e8a663 100644
--- a/src/windows/identity/help/html/act_renew_creds.htm
+++ b/src/windows/identity/help/html/act_renew_creds.htm
@@ -1,32 +1,31 @@
 <html>
 <head>
-  <title>Renew Credentials</title>
+  <title>Network Identity Manager - Renew Credentials</title>
   <meta name="description" content="Renew Credentials">
   <meta name="keywords" content="renew, credentials">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Renew Credentials</h1>
+<h1>Network Identity Manager - Renew Credentials</h1>
 
 <p>The renew credentials action can be invoked via the <a
 href="">Credential</a> menu or by pressing <span class="pre">Ctrl +
-R</span>.  Additionally, if <span class="pre">Monitor credentials
+R</span>.  Additionally, if the <span class="pre">Monitor credential
 expiration</span> option is enabled for all identities or for a
 specific identity, then those credentials will be automatically
-renewed before they expire.</p>
+renewed whenever possible before they expire.</p>
 
 <p>An identity must be selected before invoking the renew credentials
 action.</p>
 
 <p>Not all credentials can be renewed.  The actual logic of renewing
-the credentials is up to each credentials provider.  In general
-NetIDMgr will invoke each credentials provider to renew their
-respective credentials. For Kerberos 5, if the initial ticket is
+the credentials is up to each credentials provider.  In general, NetIDMgr will invoke each credentials provider to renew their
+respective credentials. For Kerberos v5, if the initial ticket is
 renewable and not expired, then it will obtain a renewed initial
-ticket.  For Kerberos 4, once a renewed Kerberos 5 initial ticket is
+ticket.  For Kerberos v4, once a renewed Kerberos v5 initial ticket is
 obtained, it will try to use a Krb524 translator to obtain a new
-Kerberos 4 initial ticket.</p>
+Kerberos v4 initial ticket.</p>
 
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/act_set_default.htm b/src/windows/identity/help/html/act_set_default.htm
index 382b3c1..6dccd23 100644
--- a/src/windows/identity/help/html/act_set_default.htm
+++ b/src/windows/identity/help/html/act_set_default.htm
@@ -1,15 +1,19 @@
 <html>
 <head>
-  <title>Set As Default Identity</title>
+  <title>Network Identity Manager - Set As Default Identity</title>
   <meta name="description" content="Set the default identity">
   <meta name="keywords" content="default, identity">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Set As Default Identity</h1>
+<h1>Network Identity Manager - Set As Default Identity</h1>
 
 <p>
+One identity can be designated as the default identity.  The default identity is the 
+identity used by Kerberos v5 and GSS-API based applications which use the default 
+Kerberos v5 credential cache and
+never request the use of a network identity by name.
 </p>
 
 </body>
diff --git a/src/windows/identity/help/html/bugs.htm b/src/windows/identity/help/html/bugs.htm
index fcc563c..f934dff 100644
--- a/src/windows/identity/help/html/bugs.htm
+++ b/src/windows/identity/help/html/bugs.htm
@@ -1,22 +1,21 @@
 <html>
 <head>
-  <title>Reporting Bugs</title>
+  <title>Network Identity Manager - Reporting Bugs</title>
   <meta name="description" content="Reporting bugs and feature requests">
   <meta name="keywords" content="bugs,features">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Reporting Bugs</h1>
+<h1>Network Identity Manager - Reporting Bugs</h1>
 
-<p>If you encounter a bug in the software, please email 
-<a href="mailto:kfw-bugs@MIT.EDU" class="mail">kfw-bugs@MIT.EDU</a>
-and report it.  Please include as much information as possible to
-enable us to reproduce the problem.
+<p>If you encounter a bug in the software, please send a bug report via e-mail to 
+<a href="mailto:kfw-bugs@MIT.EDU" class="mail">kfw-bugs@MIT.EDU</a>.  
+Please include as much information as possible to assist us in reproducing the problem.
 </p>
 
 <p><a href="mailto:kerberos@MIT.EDU" class="mail">kerberos@MIT.EDU</a>
-is a mailing list set up for discussing Kerberos issues. It is
+is a mailing list set up for discussing end user Kerberos issues. It is
 gatewayed to the Usenet newsgroup 'comp.protocols.kerberos'. If you
 prefer to read it via mail, send a subscription request to 
 <a href="mailto:kerberos-request@MIT.EDU" class="mail">kerberos-request@MIT.EDU</a>
diff --git a/src/windows/identity/help/html/cmdline_netidmgr.htm b/src/windows/identity/help/html/cmdline_netidmgr.htm
new file mode 100644
index 0000000..f77c475
--- /dev/null
+++ b/src/windows/identity/help/html/cmdline_netidmgr.htm
@@ -0,0 +1,38 @@
+<html>
+<head>
+  <title>Network Identity Manager Command Line Options</title>
+  <meta name="description" content="">
+  <meta name="keywords" content="">
+  <link rel="stylesheet" type="text/css" href="nidmgr.css">
+</head>
+<body>
+
+<h1>Network Identity Manager Command Line Options</h1>
+<p>Command line options for Network Identity Manager are:</p>
+<table border="1" width="57%" id="table1">
+	<tr>
+		<td width="140"><font size="1">-a or --autoinit</font></td>
+		<td><font size="1">Automatic Initialization of Credentials</font></td>
+	</tr>
+	<tr>
+		<td width="140"><font size="1">-i or --kinit</font></td>
+		<td><font size="1">Obtain New Credentials and then exit</font></td>
+	</tr>
+	<tr>
+		<td width="140"><font size="1">-d or --destroy</font></td>
+		<td><font size="1">Destroy Credentials belonging to the default identity 
+		and then exit</font></td>
+	</tr>
+	<tr>
+		<td width="140"><font size="1">-r or --renew</font></td>
+		<td><font size="1">Renew all Credentials and then exit</font></td>
+	</tr>
+	<tr>
+		<td width="140"><font size="1">-x or --exit</font></td>
+		<td><font size="1">Signal the running instance of Network Identity 
+		Manager to exit</font></td>
+	</tr>
+</table>
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/src/windows/identity/help/html/concept_cred_pro.htm b/src/windows/identity/help/html/concept_cred_pro.htm
index 37fec76..db936aa 100644
--- a/src/windows/identity/help/html/concept_cred_pro.htm
+++ b/src/windows/identity/help/html/concept_cred_pro.htm
@@ -1,16 +1,38 @@
 <html>
 <head>
-  <title>NetIDMgr Concepts: Credentials Provider</title>
+  <title>Network Identity Manager Concepts: Credentials Provider</title>
   <meta name="description" content="NetIDMgr Concepts: Credentials Provider">
   <meta name="keywords" content="credentials provider, concepts">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>NetIDMgr Concepts: Credentials Provider</h1>
+<h1>Network Identity Manager Concepts: Credentials Provider</h1>
 
 <p>
+Network Identity Manager relies on plug-ins to provide the majority 
+of its functionality.  A <b>credentials provider</b> is a plug-in 
+that manages one or more types of credentials.  The responsibilities
+of a credential provider are:
 </p>
+<ul>
+	<li>to maintain the list of credentials and their properties for the supported type</li>
+	<li>to monitor credential expiration</li>
+	<li>to provide the logic necessary to obtain additional credentials once the
+	<a href="concept_ident_pro.htm">identity provider</a> has obtained the 
+	initial credential</li>
+	<li>to provide the user interface panels necessary to permit the user to 
+	configure the credential provider</li>
+</ul>
+
+
+<p>MIT Kerberos for Windows ships with two Network Identity Manager credential 
+providers supporting Kerberos v5 and Kerberos v4.&nbsp; Credential providers for 
+the Andrew File System and the Kerberized Certificate Authority are available 
+separately.</p>
+<p>
+<img border="0" src="images/screen_config_cred_provider.png" width="542" height="393"></p>
+
 
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/concept_credential.htm b/src/windows/identity/help/html/concept_credential.htm
new file mode 100644
index 0000000..eca302e
--- /dev/null
+++ b/src/windows/identity/help/html/concept_credential.htm
@@ -0,0 +1,31 @@
+<html>
+<head>
+  <title>Network Identity Manager Concepts: Credential</title>
+  <meta name="description" content="NetIDMgr Concepts: Credential">
+  <meta name="keywords" content="credential, concepts">
+  <link rel="stylesheet" type="text/css" href="nidmgr.css">
+</head>
+<body>
+
+<h1>Network Identity Manager Concepts: Credential</h1>
+
+<p>
+In Network Identity Manager, a <b>credential</b> is any digital object that can 
+be used by a network authentication protocol to assert a specific
+<a href="concept_identity.htm">identity</a>.</p>
+<p>
+As of this writing, Network Identity Manager supports four different types of 
+credentials:</p>
+<ul>
+	<li>Kerberos v5 tickets</li>
+	<li>Kerberos v4 tickets</li>
+	<li>AFS tokens</li>
+	<li>X.509 certificates issued by a Kerberized Certificate Authority</li>
+</ul>
+<p>Of these, only Kerberos v5 initial ticket granting tickets can be used as an 
+identity provider credential.</p>
+<p>&nbsp;</p>
+
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/src/windows/identity/help/html/concept_ident_pro.htm b/src/windows/identity/help/html/concept_ident_pro.htm
index 5c4601c..d17c23b 100644
--- a/src/windows/identity/help/html/concept_ident_pro.htm
+++ b/src/windows/identity/help/html/concept_ident_pro.htm
@@ -1,16 +1,32 @@
 <html>
 <head>
-  <title>NetIDMgr Concepts: Identity Provider</title>
+  <title>Network Identity Manager Concepts: Identity Provider</title>
   <meta name="description" content="NetIDMgr Concepts: Identity Provider">
   <meta name="keywords" content="identity provider, concepts">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>NetIDMgr Concepts: Identity Provider</h1>
+<h1>Network Identity Manager Concepts: Identity Provider</h1>
 
 <p>
-</p>
+Network Identity Manager relies on plug-ins to provide the majority 
+of its functionality.  One of the requirements is that there be at 
+least one plug-in that is registered as an <strong>identity provider</strong>.  The identity 
+provider:</p>
+
+<ul>
+	<li>defines the identity</li>
+	<li>provides the engine that drives the <i>Obtain New Credentials</i> dialog</li>
+	<li>performs the initial authentication which results in a network credential that 
+	    can be used in conjunction with subsequent credential providers</li>
+</ul>
+
+<p>Naturally, the identity provider plug-in that is distributed with MIT Kerberos for Windows
+is Kerberos v5 based and obtains Kerberos v5 ticket granting tickets as the network credential 
+that represents the identity.</p>
+<img src="images/screen_config_ident_provider.png">
+<p></p>
 
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/concept_identity.htm b/src/windows/identity/help/html/concept_identity.htm
index ae2dda0..4340679 100644
--- a/src/windows/identity/help/html/concept_identity.htm
+++ b/src/windows/identity/help/html/concept_identity.htm
@@ -1,18 +1,18 @@
 <html>
 <head>
-  <title>NetIDMgr Concepts: Identity</title>
+  <title>Network Identity Manager Concepts: Identity</title>
   <meta name="description" content="NetIDMgr Concepts: Identity">
   <meta name="keywords" content="identity,concepts">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>NetIDMgr Concepts: Identity</h1>
+<h1>Network Identity Manager Concepts: Identity</h1>
 
 <p>While there are many approaches to defining what an identity is, as
-far as the NetIDMgr framework is considered, an identity is the unique
-security principal that is identified by a service.  Each credential
-that is managed by NetIDMgr is assumed to map to a unique identity.
+far as the Network Identity Manager (NetIDMgr) is considered, an identity is the unique
+user identifier that is accepted by a network service.  Each credential
+that is managed by NetIDMgr is assumed to map to a single identity.
 The collection of credentials that map to a single identity is
 considered to belong to that identity.
 </p>
@@ -23,16 +23,11 @@ considered to belong to that identity.
 <a name="default_identity" />
 <h3>Default Identity</h3>
 
-<p>The default identity is the identity that will be picked up by
-other applications as being the default.  For example, an application
-that uses Kerberos 5 can use the credentials found in the default
-Kerberos 5 credentials cache.  Therefore, the Kerberos 5 plug-in
-considers the principal that corresponds to the default credentials
-cache as being the default identity.
+<p>The default identity is the identity that will be used by
+applications when a specific identity has not been requested.  
+The Kerberos v5 plug-in will mark the credential cache that 
+contains the default identity as the default credentials
+cache for the current logon session.
 </p>
-
-<p>
-</p>
-
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/concepts.htm b/src/windows/identity/help/html/concepts.htm
index 0031872..2ce38e9 100644
--- a/src/windows/identity/help/html/concepts.htm
+++ b/src/windows/identity/help/html/concepts.htm
@@ -1,32 +1,31 @@
 <html>
 <head>
-  <title>NetIDMgr Concepts</title>
+  <title>Network Identity Manager Concepts</title>
   <meta name="description" content="NetIDMgr Concepts">
   <meta name="keywords" content="concepts">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>NetIDMgr Concepts</h1>
+<h1>Network Identity Manager Concepts</h1>
 
-<p>The Network Identity manager organizes and manages your credentials
-based on how they identify you to external services which use those
-credentials for authentication.  To this end, it is assumed that each
-credential will uniquely identify the user to a service as a single
-principal or <a href="concept_identity.htm">identity</a>.  For
-Kerberos, the identity is conceptually the same as the principal.
+<p>The Network Identity Manager (NetIDMgr) organizes and manages credentials 
+based on how they identify the user to network services. To this end, it is assumed that each 
+<a href="concept_credential.htm">credential </a>will uniquely identify the user to a service as a single
+<a href="concept_identity.htm">identity</a>.  When using Kerberos v5 the 
+identity is the Kerberos principal name.
 </p>
 
-<p>At it's core, NetIDMgr does not possess any knowlege about specific
-credentials that might be available for the user or how to manage
-them.  It relies on several types of plugins to provide the
+<p>At it's core, NetIDMgr does not possess any knowledge about specific 
+credentials that might be available to the user or how to manage
+them.  It relies on several types of plug-ins to provide the
 information it needs, and to carry out credentials management tasks.
 One primary task is to identify and manage identities.  These services
-are provided by a plugin called the <a
+are provided by a plug-in called the <a
 href="concept_ident_pro.htm">identity provider</a>.  Information about
 individual credentials are provided by <a
-href="concept_cred_pro.htm">credentials providers</a>.  Other plugins
-may extend the functionaility of these plugins or provide additional
+href="concept_cred_pro.htm">credential providers</a>.  Other plug-ins
+may extend the functionality of these plug-ins or provide additional
 functionality for NetIDMgr.
 </p>
 
@@ -41,7 +40,9 @@ functionality for NetIDMgr.
   <li><a href="concept_ident_pro.htm">Identity Provider</a></li>
 
   <li><a href="concept_cred_pro.htm">Credentials Provider</a></li>
+  
+  <li><a href="concept_credential.htm">Credential</a></li>
 </ul>
 
 </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/src/windows/identity/help/html/copyright.htm b/src/windows/identity/help/html/copyright.htm
index b98a156..b62753d 100644
--- a/src/windows/identity/help/html/copyright.htm
+++ b/src/windows/identity/help/html/copyright.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>License</title>
+  <title>Network Identity Manager - License</title>
   <meta name="description" content="License agreement">
   <meta name="keywords" content="license">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Network Identity Manager License</h1>
+<h1>Network Identity Manager - License</h1>
 
 <p>This software is being provided to you, the LICENSEE, by the
 Massachusetts Institute of Technology (M.I.T) under the following
@@ -23,7 +23,7 @@ the same appear on ALL copies of the software and documentation,
 including modifications that you make for internal use or for
 distribution:</p>
 
-<p>Copyright 1992-2006 by the Massachusetts Institute of Technology. All
+<p>Copyright 1992-2007 by the Massachusetts Institute of Technology. All
 rights reserved.</p>
 
 <p>THIS SOFTWARE IS PROVIDED "AS IS", AND M.I.T. MAKES NO REPRESENTATIONS
diff --git a/src/windows/identity/help/html/howdoi.htm b/src/windows/identity/help/html/howdoi.htm
index 7a380c8..9826ac2 100644
--- a/src/windows/identity/help/html/howdoi.htm
+++ b/src/windows/identity/help/html/howdoi.htm
@@ -1,18 +1,18 @@
 <html>
 <head>
-  <title>How do I ...</title>
+  <title>Network Identity Manager - How do I ...</title>
   <meta name="description" content="How do I ...">
   <meta name="keywords" content="howto, how do I">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>How do I ...</h1>
+<h1>Network Identity Manager - How do I ...</h1>
 
 <h3>Startup</h3>
 <ul>
 
-  <li><a href="use_start.htm">Start NetIDMgr or open the NetIDMgr
+  <li><a href="use_start.htm">Start or Open the Network Identity Manager
   window</a></li>
 
 </ul>
diff --git a/src/windows/identity/help/html/images/appicon_empty.bmp b/src/windows/identity/help/html/images/appicon_empty.bmp
deleted file mode 100644
index 6938c8e..0000000
--- a/src/windows/identity/help/html/images/appicon_empty.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/appicon_empty.png b/src/windows/identity/help/html/images/appicon_empty.png
new file mode 100644
index 0000000..1f50907
--- /dev/null
+++ b/src/windows/identity/help/html/images/appicon_empty.png
diff --git a/src/windows/identity/help/html/images/appicon_expired.bmp b/src/windows/identity/help/html/images/appicon_expired.bmp
deleted file mode 100644
index d617465..0000000
--- a/src/windows/identity/help/html/images/appicon_expired.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/appicon_expired.png b/src/windows/identity/help/html/images/appicon_expired.png
new file mode 100644
index 0000000..3aa90d6
--- /dev/null
+++ b/src/windows/identity/help/html/images/appicon_expired.png
diff --git a/src/windows/identity/help/html/images/appicon_good.bmp b/src/windows/identity/help/html/images/appicon_good.bmp
deleted file mode 100644
index b8bc9d3..0000000
--- a/src/windows/identity/help/html/images/appicon_good.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/appicon_good.png b/src/windows/identity/help/html/images/appicon_good.png
new file mode 100644
index 0000000..d8789da
--- /dev/null
+++ b/src/windows/identity/help/html/images/appicon_good.png
diff --git a/src/windows/identity/help/html/images/appicon_warnexp.bmp b/src/windows/identity/help/html/images/appicon_warnexp.bmp
deleted file mode 100644
index 339c25d..0000000
--- a/src/windows/identity/help/html/images/appicon_warnexp.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/appicon_warnexp.png b/src/windows/identity/help/html/images/appicon_warnexp.png
new file mode 100644
index 0000000..becdf9e
--- /dev/null
+++ b/src/windows/identity/help/html/images/appicon_warnexp.png
diff --git a/src/windows/identity/help/html/images/appicon_warning.bmp b/src/windows/identity/help/html/images/appicon_warning.bmp
deleted file mode 100644
index 53df9ec..0000000
--- a/src/windows/identity/help/html/images/appicon_warning.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/appicon_warning.png b/src/windows/identity/help/html/images/appicon_warning.png
new file mode 100644
index 0000000..e72901a
--- /dev/null
+++ b/src/windows/identity/help/html/images/appicon_warning.png
diff --git a/src/windows/identity/help/html/images/notification_icon_menu.png b/src/windows/identity/help/html/images/notification_icon_menu.png
new file mode 100644
index 0000000..ab75b74
--- /dev/null
+++ b/src/windows/identity/help/html/images/notification_icon_menu.png
diff --git a/src/windows/identity/help/html/images/screen_app_icon.bmp b/src/windows/identity/help/html/images/screen_app_icon.bmp
deleted file mode 100644
index 49e2fb0..0000000
--- a/src/windows/identity/help/html/images/screen_app_icon.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_app_icon.png b/src/windows/identity/help/html/images/screen_app_icon.png
new file mode 100644
index 0000000..86bd210
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_app_icon.png
diff --git a/src/windows/identity/help/html/images/screen_chng_pwd.png b/src/windows/identity/help/html/images/screen_chng_pwd.png
new file mode 100644
index 0000000..0f3704e
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_chng_pwd.png
diff --git a/src/windows/identity/help/html/images/screen_config_appearance.png b/src/windows/identity/help/html/images/screen_config_appearance.png
new file mode 100644
index 0000000..e2ed861
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_appearance.png
diff --git a/src/windows/identity/help/html/images/screen_config_cred_provider.png b/src/windows/identity/help/html/images/screen_config_cred_provider.png
new file mode 100644
index 0000000..5c72a06
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_cred_provider.png
diff --git a/src/windows/identity/help/html/images/screen_config_general.bmp b/src/windows/identity/help/html/images/screen_config_general.bmp
deleted file mode 100644
index 6c6e57e..0000000
--- a/src/windows/identity/help/html/images/screen_config_general.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_config_general.png b/src/windows/identity/help/html/images/screen_config_general.png
new file mode 100644
index 0000000..ce7e528
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_general.png
diff --git a/src/windows/identity/help/html/images/screen_config_global_krb4.png b/src/windows/identity/help/html/images/screen_config_global_krb4.png
new file mode 100644
index 0000000..90a5664
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_global_krb4.png
diff --git a/src/windows/identity/help/html/images/screen_config_global_krb5.png b/src/windows/identity/help/html/images/screen_config_global_krb5.png
new file mode 100644
index 0000000..d0e28d9
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_global_krb5.png
diff --git a/src/windows/identity/help/html/images/screen_config_ident.bmp b/src/windows/identity/help/html/images/screen_config_ident.bmp
deleted file mode 100644
index 2ac15fe..0000000
--- a/src/windows/identity/help/html/images/screen_config_ident.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_config_ident.png b/src/windows/identity/help/html/images/screen_config_ident.png
new file mode 100644
index 0000000..ac6278a
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_ident.png
diff --git a/src/windows/identity/help/html/images/screen_config_ident_krb4.png b/src/windows/identity/help/html/images/screen_config_ident_krb4.png
new file mode 100644
index 0000000..5c4c6f4
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_ident_krb4.png
diff --git a/src/windows/identity/help/html/images/screen_config_ident_krb5.png b/src/windows/identity/help/html/images/screen_config_ident_krb5.png
new file mode 100644
index 0000000..484b94d
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_ident_krb5.png
diff --git a/src/windows/identity/help/html/images/screen_config_ident_provider.png b/src/windows/identity/help/html/images/screen_config_ident_provider.png
new file mode 100644
index 0000000..2ab9c4d
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_ident_provider.png
diff --git a/src/windows/identity/help/html/images/screen_config_idents.bmp b/src/windows/identity/help/html/images/screen_config_idents.bmp
deleted file mode 100644
index 8f55a05..0000000
--- a/src/windows/identity/help/html/images/screen_config_idents.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_config_idents.png b/src/windows/identity/help/html/images/screen_config_idents.png
new file mode 100644
index 0000000..a67fd17
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_idents.png
diff --git a/src/windows/identity/help/html/images/screen_config_notifications.png b/src/windows/identity/help/html/images/screen_config_notifications.png
new file mode 100644
index 0000000..e8069ba
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_notifications.png
diff --git a/src/windows/identity/help/html/images/screen_config_plug_in_krb4.png b/src/windows/identity/help/html/images/screen_config_plug_in_krb4.png
new file mode 100644
index 0000000..f763a9a
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_plug_in_krb4.png
diff --git a/src/windows/identity/help/html/images/screen_config_plug_in_krb5.png b/src/windows/identity/help/html/images/screen_config_plug_in_krb5.png
new file mode 100644
index 0000000..e3e651a
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_plug_in_krb5.png
diff --git a/src/windows/identity/help/html/images/screen_config_plug_in_krb5_ccache.png b/src/windows/identity/help/html/images/screen_config_plug_in_krb5_ccache.png
new file mode 100644
index 0000000..206386b
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_plug_in_krb5_ccache.png
diff --git a/src/windows/identity/help/html/images/screen_config_plug_in_krb5_realm.png b/src/windows/identity/help/html/images/screen_config_plug_in_krb5_realm.png
new file mode 100644
index 0000000..e016aa1
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_plug_in_krb5_realm.png
diff --git a/src/windows/identity/help/html/images/screen_config_plug_ins.png b/src/windows/identity/help/html/images/screen_config_plug_ins.png
new file mode 100644
index 0000000..ec9c749
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_config_plug_ins.png
diff --git a/src/windows/identity/help/html/images/screen_main_wnd.bmp b/src/windows/identity/help/html/images/screen_main_wnd.bmp
deleted file mode 100644
index 0763318..0000000
--- a/src/windows/identity/help/html/images/screen_main_wnd.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_main_wnd.png b/src/windows/identity/help/html/images/screen_main_wnd.png
new file mode 100644
index 0000000..b520c85
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_main_wnd.png
diff --git a/src/windows/identity/help/html/images/screen_main_wnd_basic.png b/src/windows/identity/help/html/images/screen_main_wnd_basic.png
new file mode 100644
index 0000000..488fff3
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_main_wnd_basic.png
diff --git a/src/windows/identity/help/html/images/screen_menu_bar.bmp b/src/windows/identity/help/html/images/screen_menu_bar.bmp
deleted file mode 100644
index 5f80c19..0000000
--- a/src/windows/identity/help/html/images/screen_menu_bar.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_bar.png b/src/windows/identity/help/html/images/screen_menu_bar.png
new file mode 100644
index 0000000..00b775b
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_bar.png
diff --git a/src/windows/identity/help/html/images/screen_menu_credential.bmp b/src/windows/identity/help/html/images/screen_menu_credential.bmp
deleted file mode 100644
index 92a1ec3..0000000
--- a/src/windows/identity/help/html/images/screen_menu_credential.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_credential.png b/src/windows/identity/help/html/images/screen_menu_credential.png
new file mode 100644
index 0000000..588117c
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_credential.png
diff --git a/src/windows/identity/help/html/images/screen_menu_file.bmp b/src/windows/identity/help/html/images/screen_menu_file.bmp
deleted file mode 100644
index 4a90546..0000000
--- a/src/windows/identity/help/html/images/screen_menu_file.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_file.png b/src/windows/identity/help/html/images/screen_menu_file.png
new file mode 100644
index 0000000..5836662
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_file.png
diff --git a/src/windows/identity/help/html/images/screen_menu_help.bmp b/src/windows/identity/help/html/images/screen_menu_help.bmp
deleted file mode 100644
index dc1a8f6..0000000
--- a/src/windows/identity/help/html/images/screen_menu_help.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_help.png b/src/windows/identity/help/html/images/screen_menu_help.png
new file mode 100644
index 0000000..d39b257
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_help.png
diff --git a/src/windows/identity/help/html/images/screen_menu_options.bmp b/src/windows/identity/help/html/images/screen_menu_options.bmp
deleted file mode 100644
index 5762e65..0000000
--- a/src/windows/identity/help/html/images/screen_menu_options.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_options.png b/src/windows/identity/help/html/images/screen_menu_options.png
new file mode 100644
index 0000000..528e01e
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_options.png
diff --git a/src/windows/identity/help/html/images/screen_menu_view.bmp b/src/windows/identity/help/html/images/screen_menu_view.bmp
deleted file mode 100644
index e47e54a..0000000
--- a/src/windows/identity/help/html/images/screen_menu_view.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_view.png b/src/windows/identity/help/html/images/screen_menu_view.png
new file mode 100644
index 0000000..f977bda
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_view.png
diff --git a/src/windows/identity/help/html/images/screen_menu_view_cols.bmp b/src/windows/identity/help/html/images/screen_menu_view_cols.bmp
deleted file mode 100644
index 25779bf..0000000
--- a/src/windows/identity/help/html/images/screen_menu_view_cols.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_menu_view_cols.png b/src/windows/identity/help/html/images/screen_menu_view_cols.png
new file mode 100644
index 0000000..79954d2
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_menu_view_cols.png
diff --git a/src/windows/identity/help/html/images/screen_new_creds.bmp b/src/windows/identity/help/html/images/screen_new_creds.bmp
deleted file mode 100755
index bf5be31..0000000
--- a/src/windows/identity/help/html/images/screen_new_creds.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_new_creds.png b/src/windows/identity/help/html/images/screen_new_creds.png
new file mode 100644
index 0000000..eb461bf
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_new_creds.png
diff --git a/src/windows/identity/help/html/images/screen_new_creds_err01.bmp b/src/windows/identity/help/html/images/screen_new_creds_err01.bmp
deleted file mode 100755
index 44bf0f9..0000000
--- a/src/windows/identity/help/html/images/screen_new_creds_err01.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_new_creds_err01.png b/src/windows/identity/help/html/images/screen_new_creds_err01.png
new file mode 100644
index 0000000..4999db8
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_new_creds_err01.png
diff --git a/src/windows/identity/help/html/images/screen_new_creds_exp.bmp b/src/windows/identity/help/html/images/screen_new_creds_exp.bmp
deleted file mode 100755
index 5caa632..0000000
--- a/src/windows/identity/help/html/images/screen_new_creds_exp.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_new_creds_exp.png b/src/windows/identity/help/html/images/screen_new_creds_exp.png
new file mode 100644
index 0000000..f533c97
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_new_creds_exp.png
diff --git a/src/windows/identity/help/html/images/screen_tb_standard.bmp b/src/windows/identity/help/html/images/screen_tb_standard.bmp
deleted file mode 100644
index bd07cf2..0000000
--- a/src/windows/identity/help/html/images/screen_tb_standard.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_tb_standard.png b/src/windows/identity/help/html/images/screen_tb_standard.png
new file mode 100644
index 0000000..5d2f070
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_tb_standard.png
diff --git a/src/windows/identity/help/html/images/screen_tray_icon.bmp b/src/windows/identity/help/html/images/screen_tray_icon.bmp
deleted file mode 100644
index b2fb1ee..0000000
--- a/src/windows/identity/help/html/images/screen_tray_icon.bmp
+++ /dev/null
diff --git a/src/windows/identity/help/html/images/screen_tray_icon.png b/src/windows/identity/help/html/images/screen_tray_icon.png
new file mode 100644
index 0000000..6d935d6
--- /dev/null
+++ b/src/windows/identity/help/html/images/screen_tray_icon.png
diff --git a/src/windows/identity/help/html/menu_all.htm b/src/windows/identity/help/html/menu_all.htm
index 2710d59..6cd8113 100644
--- a/src/windows/identity/help/html/menu_all.htm
+++ b/src/windows/identity/help/html/menu_all.htm
@@ -1,12 +1,12 @@
 <html>
 <head>
-  <title>The Menu Bar</title>
+  <title>Network Identity Manager - The Menu Bar</title>
   <meta name="description" content="The Menu Bar">
   <meta name="keywords" content="menu bar">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
-<h1>The Menu Bar</h1>
+<h1>Network Identity Manager - The Menu Bar</h1>
 
 <p>
 Click an item on the menu to go to the description of the submenu, or
@@ -26,7 +26,7 @@ highlighted character on the submenu.
 </map>
 
 <p>
-<img src="images/screen_menu_bar.bmp" usemap="#menu_bar_map"/>
+<img src="images/screen_menu_bar.png" usemap="#menu_bar_map"/>
 </p>
 
 <ul>
diff --git a/src/windows/identity/help/html/menu_credential.htm b/src/windows/identity/help/html/menu_credential.htm
index 8c537ea..f343128 100644
--- a/src/windows/identity/help/html/menu_credential.htm
+++ b/src/windows/identity/help/html/menu_credential.htm
@@ -1,19 +1,19 @@
 <html>
 <head>
-  <title>Credential Menu</title>
+  <title>Network Identity Manager - Credential Menu</title>
   <meta name="description" content="credential menu">
   <meta name="keywords" content="credential menu">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Credential Menu</h1>
+<h1>Network Identity Manager - Credential Menu</h1>
 
 <p>
 Click an item on the menu to go to the description of the action, or
 choose from the list below.  You can activate the by pressing <span
 class="pre">Alt + C</span> and you can activate each action by
-pressing the highlited character.
+pressing the highlighted character.
 </p>
 
 <p>
@@ -22,21 +22,21 @@ right of the action.  You can use the hot key to trigger the action
 without invoking the <span class="pre">Credential</span> menu.
 </p>
 
-<map id="menumap">
-<area shape = "rect" coords = "18,21,248,46" href = "#new">
-<area shape = "rect" coords = "18,52,244,77" href = "#renew">
-<area shape = "rect" coords = "19,76,241,98" href = "#import">
-<area shape = "rect" coords = "19,98,231,121" href = "#destroy">
-<area shape = "rect" coords = "20,129,160,155" href = "#def">
-<area shape = "rect" coords = "21,164,225,185" href = "#chpw">
-</map>
-
 <p>
-<img src="images/screen_menu_credential.bmp" usemap="#menumap"/>
+<map name="FPMap0">
+<area href="#new" shape="rect" coords="29, 18, 220, 44">
+<area href="#renew" shape="rect" coords="29, 42, 219, 67">
+<area href="#renew" shape="rect" coords="213, 44, 464, 113">
+<area href="#destroy" shape="rect" coords="29, 65, 220, 83">
+<area href="#import" shape="rect" coords="29, 81, 217, 104">
+<area href="#chpw" shape="rect" coords="28, 131, 218, 156">
+<area href="#def" shape="rect" coords="28, 102, 216, 133">
+</map>
+<img src="images/screen_menu_credential.png" usemap="#FPMap0"/>
 </p>
 
 <ul>
-  <li><a name="new" /> <span class="title">New Credentials ...</span>:
+  <li><a name="new"></a> <span class="title">New Credentials ...</span>:
   Opens the new credentials acquisition dialog box.  If an identity
   was selected, then that identity would be made the default for the
   new credentials acquisition.  However, it can easily be changed in
@@ -46,17 +46,17 @@ without invoking the <span class="pre">Credential</span> menu.
   Action</a></span> for more information.
   </p></li>
 
-  <li><a name="renew"/> <span class="title">Renew credentials</span>:
+  <li><a name="renew"></a> <span class="title">Renew credentials</span>:
   Renews the selected credentials or identity.  This action requires
   that the selected credentials be renewable.
   <p>
   See <span class="pre"><a href="act_renew_creds.htm">Renew
   Credentials Action</a></span> for more information.</p></li>
   
-  <li><a name="destroy"/> <span class="title">Destroy
+  <li><a name="destroy"></a> <span class="title">Destroy
   credentials...</span>: Destroys the selected credentials.</li>
 
-  <li><a name="def"/> <span class="title">Set as default</span>: Sets
+  <li><a name="def"></a> <span class="title">Set as default</span>: Sets
   the selected identity as the default, if it is not already the
   default.  The implications of this operation is dependent on the
   current <a href="concept_ident_pro.htm">identity provider</a>.
@@ -64,17 +64,16 @@ without invoking the <span class="pre">Credential</span> menu.
   See <span class="pre"><a href="act_set_default.htm">Set As Default
   Action</a></span> for more information.</p></li>
 
-  <li><a name="chpw" /> <span class="title">Change password...</span>:
+  <li><a name="chpw"></a> <span class="title">Change password...</span>:
   Changes the password for the selected identity.  However, once the
   new password dialog opens, you can change the identity for which the
   password is getting changed.</li>
 
-  <li><a name="import" /> <span class="title">Import
+  <li><a name="import"></a> <span class="title">Import
   Credentials</span>: Import any existing credentials from external
-  sources.  With the Kerberos 5 <a
-  href="concept_cred_pro.htm">credentials provider</a>, the Kerberos
-  tickets from the Microsoft Windows LSA cache will be imported to MIT
-  Kerberos ticket caches.</li>
+  sources.  With the Kerberos v5 <a
+  href="concept_cred_pro.htm">credentials provider</a>, the Windows logon 
+	identity stored in the Microsoft Windows LSA cache will be imported.</li>
 
 </ul>
 
diff --git a/src/windows/identity/help/html/menu_file.htm b/src/windows/identity/help/html/menu_file.htm
index a7f79fe..2f734af 100644
--- a/src/windows/identity/help/html/menu_file.htm
+++ b/src/windows/identity/help/html/menu_file.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>File Menu</title>
+  <title>Network Identity Manager - File Menu</title>
   <meta name="description" content="File menu">
   <meta name="keywords" content="file menu">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>File Menu</h1>
+<h1>Network Identity File Menu</h1>
 
 <p>
 Click an item on the menu to go to the description of the action, or
@@ -22,22 +22,21 @@ right of the action.  You can use the hot key to trigger the action
 without invoking the <span class="pre">File</span> menu.
 </p>
 
-<map id="menumap">
-<area shape = "rect" coords = "12,24,115,46" href = "#properties">
-<area shape = "rect" coords = "12,55,166,76" href = "#exit">
-</map>
-
 <p>
-<img src="images/screen_menu_file.bmp" usemap="#menumap"/>
+<map name="FPMap0">
+<area href="#properties" shape="rect" coords="1, 21, 131, 42">
+<area href="#exit" shape="rect" coords="1, 40, 129, 65">
+</map>
+<img src="images/screen_menu_file.png" usemap="#FPMap0"/>
 </p>
 
 <ul>
 
-  <li><a name="properties"/>
+  <li><a name="properties"></a>
   <span class="title">Properties...</span>: Displays a property
   sheet for the selected credential, identity or credential type.</li>
 
-  <li><a name="exit" />
+  <li><a name="exit"></a>
   <span class="title">Exit</span>: Exits Network Identity Manager</li>
 
 </ul>
diff --git a/src/windows/identity/help/html/menu_help.htm b/src/windows/identity/help/html/menu_help.htm
index d1ac6ae..7cd368e 100644
--- a/src/windows/identity/help/html/menu_help.htm
+++ b/src/windows/identity/help/html/menu_help.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>Help Menu</title>
+  <title>Network Identity Manager - Help Menu</title>
   <meta name="description" content="Help Menu">
   <meta name="keywords" content="help menu">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Help Menu</h1>
+<h1>Network Identity Manager - Help Menu</h1>
 
 <p>
 You can activate the menu by pressing <span class="pre">Alt + H</span>
@@ -21,32 +21,30 @@ the question mark icon in the title bar and then clicking on the
 dialog box control that you want help with.
 </p>
 
-<map id="menumap">
-
-<area shape = "rect" coords = "12,27,166,48" href = "#ctx">
-<area shape = "rect" coords = "13,53,167,76" href = "#contents">
-<area shape = "rect" coords = "14,77,160,101" href = "#index">
-<area shape = "rect" coords = "15,107,173,132" href = "#about">
-
-</map>
 
 <p>
-<img src="images/screen_menu_help.bmp" usemap="#menumap"/>
+<map name="FPMap0">
+<area href="#contents" shape="rect" coords="173, 22, 373, 43">
+<area href="#index" shape="rect" coords="173, 43, 373, 68">
+<area href="#about" shape="rect" coords="172, 103, 373, 128">
+<area href="#plug-in" shape="rect" coords="173, 67, 372, 102">
+</map>
+<img src="images/screen_menu_help.png" usemap="#FPMap0"/>
 </p>
 
 <ul>
 
-  <li><a name="ctx" /><span class="title">Context</span>: Provides
-  context sensitive help.  You can invoke help at any time by pressing
-  <span class="pre">F1</span></li>
+  
 
-  <li><a name="contents" /><span class="title">Contents</span>: Opens
+  <li><a name="contents"></a><span class="title">Contents</span>: Opens
   the table of contents for the user documentation</li>
 
-  <li><a name="index" /><span class="title">Index</span>: Opens the
+  <li><a name="index"></a><span class="title">Index</span>: Opens the
   index for the user documentation</li>
-
-  <li><a name="about" /><span class="title">About</span>: Opens a
+  
+  <li><a name="plug-in"></a><span class="title">Plug-in specific help</span>: 
+  Plug-ins can register their own on-line help.</li>
+  <li><a name="about"></a><span class="title">About</span>: Opens a
   dialog box containing information about this version of NetIDMgr as
   well as the modules that are currently loaded.</li>
 
diff --git a/src/windows/identity/help/html/menu_options.htm b/src/windows/identity/help/html/menu_options.htm
index 08aad4f..df10f2e 100644
--- a/src/windows/identity/help/html/menu_options.htm
+++ b/src/windows/identity/help/html/menu_options.htm
@@ -1,68 +1,60 @@
 <html>
 <head>
-  <title>Options Menu</title>
+  <title>Network Identity Manager - Options Menu</title>
   <meta name="description" content="options menu">
   <meta name="keywords" content="options menu">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Options Menu</h1>
+<h1>Network Identity Manager - Options Menu</h1>
 
 <p>
 Click an item on the menu to go to the description of the action, or
-choose from the list below.  You can activate the by pressing <span
+choose from the list below.  You can activate the menu by pressing <span
 class="pre">Alt + O</span> and you can activate each action by
-pressing the highlited character.
+pressing the highlighted character.
 </p>
 
-<p>
-Actions which have an associated hot key show this hot key to the
-right of the action.  You can use the hot key to trigger the action
-without invoking the <span class="pre">Options</span> menu.
-</p>
-
-<map id="menumap">
-
-<area shape = "rect" coords = "12,24,139,48" href = "#general">
-<area shape = "rect" coords = "11,46,144,68" href = "#apperance">
-<area shape = "rect" coords = "11,68,142,89" href = "#identities">
-<area shape = "rect" coords = "12,91,139,111" href = "#notifications">
-<area shape = "rect" coords = "14,111,134,133" href = "#plugins">
-<area shape = "rect" coords = "12,141,139,208" href = "#pluginspec">
-
-</map>
 
 <p>
-<img src="images/screen_menu_options.bmp" usemap="#menumap"/>
+<map name="FPMap0">
+<area href="#general" shape="rect" coords="124, 20, 239, 40">
+<area href="#appearance" shape="rect" coords="124, 38, 239, 56">
+<area href="#identities" shape="rect" coords="122, 54, 239, 73">
+<area href="#notifications" shape="rect" coords="123, 71, 239, 93">
+<area href="#plugins" shape="rect" coords="123, 91, 239, 112">
+<area href="#pluginspec" shape="rect" coords="124, 110, 239, 169">
+</map>
+<img src="images/screen_menu_options.png" usemap="#FPMap0"/>
 </p>
 
 <ul>
 
-<li><a name="general" /><span class="title">General ...</span>: Opens
+<li><a name="general"></a><span class="title">General ...</span>: Opens
 the NetIDMgr general configuration panel.  This panel allows you to
 configure settings related to the startup/shutdown of NetIDMgr in
 addition to debugging and monitoring options.</li>
 
-<li><a name="apperance" /><span class="title">Appearance ...</span>:
+<li><a name="appearance"></a><span class="title">Appearance ...</span>:
 Provides options for customizing the appearance of the credentials
 window.  Currently, the only options provided are for selecting the
 font used for the credentials list.</li>
 
-<li><a name="identities" /><span class="title">Identities ...</span>:
+<li><a name="identities"></a><span class="title">Identities ...</span>:
 Opens the identities configuration panel.  These options control
 credentials defaults for all identities or for specific identities.</li>
 
-<li><a name="notifications" /><span class="title">Notifications
+<li><a name="notifications"></a><span class="title">Notifications
 ...</span>: The notifications configuration panel controls the
 settings used by the NetIDMgr timer that triggers warnings and
 identity renewals.</li>
 
-<li><a name="plugins" /><span class="title">Plugins ...</span>:
-Options for enabling or disabling specific plugins and also for
-viewing information about loaded plugins.</li>
+<li><a name="plugins"></a><span class="title">plug-ins ...</span>:
+Options for enabling or disabling specific plug-ins and also for
+viewing information about loaded plug-ins.</li>
 
-<li><a name="pluginspec" /><span class="title">Plugin specific
+<li><a name="pluginspec"></a><span class="title">Plugin specific
 configuration panels</span>: Each registered plugin can register one
 or more configuration panels which will appear on the <span
 class="pre">Options</span> menu.</li>
diff --git a/src/windows/identity/help/html/menu_view.htm b/src/windows/identity/help/html/menu_view.htm
index 2401b3c..0080559 100644
--- a/src/windows/identity/help/html/menu_view.htm
+++ b/src/windows/identity/help/html/menu_view.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>View Menu</title>
+  <title>Network Identity Manager - View Menu</title>
   <meta name="description" content="View menu">
   <meta name="keywords" content="view menu">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>View Menu</h1>
+<h1>Network Identity Manager - View Menu</h1>
 
 <p>
 Click an item on the menu to go to the description of the action, or
@@ -22,28 +22,38 @@ right of the action.  You can use the hot key to trigger the action
 without invoking the <span class="pre">View</span> menu.
 </p>
 
-<map id="menumap">
-<area shape = "rect" coords = "11,24,159,45" href = "#choosecol">
-<area shape = "rect" coords = "11,47,160,70" href = "#layout">
-<area shape = "rect" coords = "11,74,159,100" href = "#refresh">
-</map>
-
 <p>
-<img src="images/screen_menu_view.bmp" usemap="#menumap"/>
+<map name="menumap">
+<area href="#advanced" shape="rect" coords="91, 20, 230, 39">
+<area href="#choosecol" shape="rect" coords="89, 38, 230, 57">
+<area href="#layout" shape="rect" coords="89, 52, 229, 76">
+<area href="#layout" shape="rect" coords="225, 54, 319, 125">
+<area href="#refresh" shape="rect" coords="91, 77, 226, 101">
+</map>
+<img src="images/screen_menu_view.png" usemap="#menumap" />
 </p>
 
 <ul>
 
-<li><a name="choosecol" /> <span class="title">View columns</span>:
+<li><a name="advanced"></a> <span class="title">Advanced F7</span>:
+
+Toggles the display mode between <b>basic</b> and <b>advanced</b> modes.  
+In basic mode, the Network Identity Manager displays a list of identities 
+and their current status.  In the advanced mode, NetIdMgr provides a 
+customizable list of all discovered credentials.
+</li>
+
+<li><a name="choosecol"></a> <span class="title">View columns</span>:
 
+<i>Only available in Advanced mode.</i>
 Invokes a submenu from which you can choose the columns that are
 displayed in the credentials window.  If you change the columns, or
 their order, a new custom layout will be created for you which you can
 later use using the <span class="pre">Layout</span> submenu later. For
-more information about managing layouts, see the <a
-href="use_layout.htm">Layout</a> topic.</li>
+more information about managing layouts, see the <a href="use_layout.htm">Layout</a> topic.</li>
 
-<li><a name="layout" /> <span class="title">Layout</span>: Opens a
+<li><a name="layout"></a> <span class="title">Layout</span>: 
+<i>Only available in Advanced mode.</i>  Opens a
 submenu where you can select the layout for the credentials
 display.
    <ul>
@@ -73,8 +83,8 @@ display.
 
 </li>
 
-<li><a name="refresh" /> <span class="title">Refresh</span>: Refresh
-the credentials view.  This queries each <a
+<li><a name="refresh"></a> <span class="title">Refresh view F5</span>: Refresh
+the contents of the credentials view.  This queries each <a
 href="concept_cred_pro.htm">credential provider</a> for any
 credentials and redraws the credentials view.</li>
 
diff --git a/src/windows/identity/help/html/tb_standard.htm b/src/windows/identity/help/html/tb_standard.htm
index 945063f..46517a8 100644
--- a/src/windows/identity/help/html/tb_standard.htm
+++ b/src/windows/identity/help/html/tb_standard.htm
@@ -1,20 +1,20 @@
 <html>
 <head>
-  <title>Standard Toolbar</title>
+  <title>Network Identity Manager - Standard Toolbar</title>
   <meta name="description" content="Standard Toolbar">
   <meta name="keywords" content="standard toolbar">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Standard Toolbar</h1>
+<h1>Network Identity Manager - Standard Toolbar</h1>
 
 <p>The standard toolbar appears below along with descriptions of what
 each button does.
 </p>
 
 <p>
-<img src="images/screen_tb_standard.bmp" />
+<img src="images/screen_tb_standard.png" />
 </p>
 
 <ol>
diff --git a/src/windows/identity/help/html/template.htm b/src/windows/identity/help/html/template.htm
index 5e39963..3357741 100644
--- a/src/windows/identity/help/html/template.htm
+++ b/src/windows/identity/help/html/template.htm
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>title</title>
+  <title>Network Identity Manager - title</title>
   <meta name="description" content="">
   <meta name="keywords" content="">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
diff --git a/src/windows/identity/help/html/use_config.htm b/src/windows/identity/help/html/use_config.htm
index 6d4cbeb..c5fded2 100644
--- a/src/windows/identity/help/html/use_config.htm
+++ b/src/windows/identity/help/html/use_config.htm
@@ -1,132 +1,317 @@
 <html>
+
 <head>
-  <title>Configuring NetIDMgr and identities</title>
-  <meta name="description" content="">
-  <meta name="keywords" content="configuration">
-  <link rel="stylesheet" type="text/css" href="nidmgr.css">
+<title>Network Identity Manager - Configuration</title>
+<meta name="description" content>
+<meta name="keywords" content="configuration">
+<link rel="stylesheet" type="text/css" href="nidmgr.css">
+<style>
+<!--
+ li.MsoNormal
+	{mso-style-parent:"";
+	margin-bottom:.0001pt;
+	text-autospace:none;
+	font-size:10.0pt;
+	font-family:"Times New Roman";
+	margin-left:0pt; margin-right:0pt; margin-top:0pt}
+-->
+</style>
 </head>
-<body>
 
-<h1>Configuring NetIDMgr and identities</h1>
+<body>
 
-<p>All NetIDMgr configuration options can be accessed via the <span
-class="pre">Options</span> menu.  The available configuration panels
-are:
+<h1>Network Identity Manager - Configuration</h1>
+<p>All Network Identity Manager configuration options can be accessed via the
+<span class="pre">Options</span> menu. The available configuration panels are:
 </p>
-
-<p>
+<p></p>
 <ul>
-  <li><p><span class="title">General</span>: General application options
-  for NetIDMgr.</p>
-
-  <ul>
-
-    <li><p><span class="title">Obtain new credentials at
-    startup</span>: If checked, NetIDMgr will check there are initial
-    credentials for the default identity.  If no such credentials are
-    found, NetIDMgr will display a new credentials dialog.</p> </li>
-
-    <li><p><span class="title">Run NetIDMgr in system tray after
-    window close</span>: If checked, NetIDMgr will continue running in
-    the system notification area (sometimes referred to as the system
-    tray) after you close the NetIDMgr window.</p> </li>
-
-    <li><p><span class="title">Monitor network connectivity</span>: When
-    changes to network connectivity are detected, NetIDMgr can notify
-    individual plug-ins about these changes.  Doing so allows each
-    plug-in to respond to the change by obtaining new credentials etc.
-    If this option is cleared, no such notifications are sent and the
-    application would not respond to network changes.</p></li>
-
-    <li><p><span class="title">Log trace events</span>: NetIDMgr can
-    generate debugging information during the course of performing
-    certain actions.  This information aids the developers in fixing
-    problems that you may encounter while using NetIDMgr.</p> </li>
-
-  </ul>
-
-  </li>
-
-  <li><p><span class="title">Appearance</span>: Allows you to set the
-  font used by NetIDMgr.</p></li>
-
-  <li><p><span class="title">Identities</span>: Default settings for all
-  identities and settings for each identity.  Details <a
-  href="#cfg_idents">below</a>.</p></li>
-
-  <li><p><span class="title">Notifications</span>: Notification and timer
-  options.  NetIDMgr can issue warnings when credentials are about to
-  expire. This configuration panel allows you to set the thresholds at
-  which these warnings are issued.  For example, if the warning
-  timeout is set for 10 minutes, NetIDMgr will issue a warning 10
-  minutes before a credential expires.</p>
-
-  <p>The panel also allows you to control the credentials renew timer.
-  If the timer is disabled, NetIDMgr will not automatically attempt to
-  renew credentials.  If the <span class="pre">Renew at half life
-  intervals when possible</span> option is set, then the timer will
-  expire after the credential has less than half its lifetime left.
-  If the renewal operation fails, it will attempt another renwal after
-  half of the remaining liftime is over (i.e. when the credential has
-  less than 1/4 of its original lifetime left) and so on.
-  </p>
-
-  </li>
-
-  <li><p><span class="title">Plugins</span>: Enable/disable and check
-  the status of registered plug-ins.  Enabling or disabling a plug-in
-  only takes effect after a restart of NetIDMgr.</p></li>
-
+	<li>
+	<p><span class="title">General</span>: General application options for NetIDMgr.</p>
+	<ul>
+		<li>
+		<p><span class="title">Obtain new credentials at startup</span>: If checked, 
+		NetIDMgr will check there are initial credentials for the default identity. 
+		If no such credentials are found, NetIDMgr will display a new credentials 
+		dialog.</p>
+		</li>
+		<li>
+		<p><span class="title">Run NetIDMgr in system tray after window close</span>: 
+		If checked, NetIDMgr will continue running in the system notification area 
+		(sometimes referred to as the system tray) after you close the NetIDMgr 
+		window.</p>
+		</li>
+		<li>
+		<p><span class="title">Monitor network connectivity</span>: When changes 
+		to network connectivity are detected, NetIDMgr can notify individual plug-ins 
+		about these changes. Doing so allows each plug-in to respond to the change 
+		by obtaining new credentials etc. If this option is cleared, no such notifications 
+		are sent and the application would not respond to network changes.</p>
+		</li>
+		<li>
+		<p><span class="title">Log trace events</span>: NetIDMgr can generate debugging 
+		information during the course of performing certain actions. This information 
+		aids the developers in fixing problems that you may encounter while using 
+		NetIDMgr.</p>
+		</li>
+	</ul>
+	</li>
+	<li>
+	<p><span class="title">Appearance</span>: Allows you to set the font used by 
+	NetIDMgr.</p>
+	</li>
+	<li>
+	<p><span class="title">Identities</span>: Default settings for all identities 
+	and settings for each identity. Details <a href="#cfg_idents">below</a>.</p>
+	</li>
+	<li>
+	<p><span class="title">Notifications</span>: Notification and timer options. 
+	NetIDMgr can issue warnings when credentials are about to expire. This configuration 
+	panel allows you to set the thresholds at which these warnings are issued. For 
+	example, if the warning timeout is set for 10 minutes, NetIDMgr will issue a 
+	warning 10 minutes before a credential expires.</p>
+	<p>The panel also allows you to control the credentials renew timer. If the 
+	timer is disabled, NetIDMgr will not automatically attempt to renew credentials. 
+	If the <span class="pre">Renew at half life intervals when possible</span> option 
+	is set, then the timer will expire after the credential has less than half its 
+	lifetime left. If the renewal operation fails, it will attempt another renwal 
+	after half of the remaining liftime is over (i.e. when the credential has less 
+	than 1/4 of its original lifetime left) and so on. </p>
+	</li>
+	<li>
+	<p><span class="title">Plugins</span>: Enable/disable and check the status of 
+	registered plug-ins. Enabling or disabling a plug-in only takes effect after 
+	a restart of NetIDMgr.</p>
+	</li>
 </ul>
-</p>
+<p></p>
+<h3>General Options</h3>
+<p>The General options dialog, accessed via the Options menu, allows you to configure 
+operational properties specific to the NetIdMgr application.</p>
+<p><img src="images/screen_config_general.png" /> </p>
+<p>The <b>Obtain new credentials at startup (if none are present)</b> checkbox will 
+determine whether or not NetIdMgr will display the New Credentials dialog at startup 
+when no valid credentials exist.</p>
+<p>The <b>Destroy all credentials on exit </b>option can be used to empty all of 
+the credential caches when the NetIdMgr is terminated.</p>
+<p>The <b>Run NetIdMgr in taskbar notification area after window close </b>checkbox 
+determines the behavior of the window close button. When checked, NetIdMgr will 
+close the window but will continue running and can be accessed from the taskbar 
+notification area. When unchecked, NetIdMgr will behave as if File-&gt;Exit was selected 
+from the menu.</p>
+<p><b>Clicking on the notification icon</b> can be configured to either Show Network 
+Identity Manager or Obtain New Credentials. This option controls which menu item 
+on the notification icon menu is the default action.</p>
+<p>The <b>Monitor network connectivity</b> option determines whether or not NetIdMgr 
+monitors the configuration of IP addresses on the machine. When IP addresses are 
+added or removed and this feature is activated, the NetIdMgr will probe the identity 
+management servers (e.g., Kerberos Key Distribution Centers) to determine if they 
+are reachable and if so will automatically obtain credentials.</p>
+<p>The <b>Log trace events to trace log at the following location</b> option is 
+used to activate a log file that can be used to help debug the behavior of NetIdMgr 
+and its plug-ins. Press the <b>Show log</b> button to view the log file in Windows 
+Notepad. </p>
 
-<p><img src="images/screen_config_general.bmp" />
-</p>
+<h3>Appearance Options</h3>
+<p>The Appearance Options page can be used to select an alternate typeface to be 
+used when displaying credentials in the NetIdMgr.</p>
+<p><img src="images/screen_config_appearance.png" /> </p>
 
-<a name="cfg_idents" />
+
+<a name="cfg_idents"></a>
 <h3>Configuration of default settings for all identities</h3>
+<p>The <span class="pre">Identities</span> configuration panel allows you to set 
+the defaults that will be used for all identities. However, most of the settings 
+displayed here can be overridden with specific per-identity settings. </p>
+<p>The panel will have a number of sub panels (or tabs) corresponding to each plug-in 
+that maintains per-identity configuration. </p>
+<p>A list of identities for which configuration information is maintained will be 
+shown under the main <span class="pre">Identities</span> configuration panel name. 
+Each of these correspond to a <a href="#cfg_ident">per identity</a> configuration 
+panel. </p>
+<p>Note that adding or removing an identity in the configuration panel only has 
+the effect of adding or removing the identity to or from the list of identities 
+for which configuration information is maintained. </p>
 
-<p>The <span class="pre">Identities</span> configuration panel allows
-you to set the defaults that will be used for all identities.
-However, most of the settings displayed here can be overridden with
-specific per-identity settings.
-</p>
+<h4>Global Identity Settings</h4>
+<p><img src="images/screen_config_idents.png" /> </p>
+<p class="MsoNormal">There are three general settings that can be used to set 
+global defaults.</p>
+<p class="MsoNormal">The <b>Monitor credential expiration</b> setting determines 
+whether or not NetIdMgr should monitor the credential lifetimes and issue 
+expiration notifications.&nbsp;&nbsp; This value is used as the default for all new 
+identities.</p>
+<p class="MsoNormal">The <b>Automatically renew</b> setting determines if <i>
+renewable</i> credentials are automatically renewed prior to expiration.&nbsp; This 
+value is used as the default for all new identities.</p>
+<p class="MsoNormal">The <b>Always show in the credentials list (Pinned)</b> 
+setting determines whether new identities are always pinned within the 
+credentials list.&nbsp; A pinned identity will always be displayed regardless of 
+whether or not there are credentials associated with it.</p>
 
-<p>The panel will have a number of sub panels (or tabs) corresponding
-to each plug-in that maintains per-identity configuration.
-</p>
+<h4>Global Kerberos v5 Identity Settings</h4>
+<p><img src="images/screen_config_global_krb5.png" /> </p>
+<p class="MsoNormal">The global Kerberos v5 settings define default credential 
+lifetimes and minimum and maximum values for use in constructing the slider 
+controls used to set the lifetimes.&nbsp; </p>
+<p class="MsoNormal">There are two expiration times associated with Kerberos 
+tickets.&nbsp; The first specifies the length of the time period during which the 
+tickets are valid for use.&nbsp; The second specifies the length of the renewable 
+lifetime.&nbsp; Valid Kerberos tickets may have their valid use lifetime repeatedly 
+extended up until the renewable lifetime expires.&nbsp; The settings on this page are 
+used to configure default lifetime values for NetIdMgr to use when requesting 
+Kerberos tickets from the Kerberos server (key distribution center).&nbsp; The 
+Kerberos server may issue tickets with shorter lifetimes than were requested.</p>
+<p class="MsoNormal">The <b>Renewable</b>, <b>Forwardable</b>, and <b>
+Addressless</b> options determine whether or not new identities default to 
+obtaining Kerberos v5 tickets with these options.</p>
+<p class="MsoNormal">When <b>Forwardable </b>tickets are received from the 
+Kerberos Server, these tickets can be forwarded to a remote host when you 
+connect via telnet, ssh, ftp, rlogin, or similar applications.&nbsp; When tickets are 
+forwarded, there is no need to obtain Kerberos tickets again to access 
+Kerberized services on the remote host.&nbsp;&nbsp; <b>Forwardable</b> tickets are often 
+required when authenticating to a remote host using ssh or ftp when the remote 
+host requires the ability to authenticate to a remote file system such as AFS.</p>
+<p class="MsoNormal">When <b>Renewable</b> tickets are received from the 
+Kerberos Server, the ticket lifetimes may be renewed without prompting the user 
+for her password.&nbsp; This allows Kerberos tickets to be issued with short 
+lifetimes allowing compromised accounts to be disabled on short notice without 
+requiring the user to enter a password every few hours.&nbsp; When combined with <b>
+Automatic Ticket Renewal</b>, NetIdMgr can maintain valid tickets for a week, a 
+month, or longer by automatically renewing tickets prior to their expiration.&nbsp; 
+The ability to renew tickets without a password is limited by the ticket�s 
+renewable lifetime as issued by the Kerberos Server.</p>
+<p class="MsoNormal">When <b>Addressless</b> is selected, the tickets do not 
+contain IP address information.&nbsp; This enables the tickets to be used from behind 
+Network Address Translators which are frequently found in Cable and DSL Modems.</p>
+<p class="MsoNormal">The minimum and maximum ranges are used by the ticket 
+initialization dialog box when constructing the Lifetime and Renewable Lifetime 
+sliders.&nbsp; These sliders can be used to modify the requested ticket lifetimes 
+when Kerberos tickets are initialized.</p>
 
-<p>A list of identities for which configuration information is
-maintained will be shown under the main <span
-class="pre">Identities</span> configuration panel name.  Each of these
-correspond to a <a href="#cfg_ident">per identity</a> configuration
-panel.
-</p>
+<h4>Global Kerberos v4 Identity Settings</h4>
+<p><img src="images/screen_config_global_krb4.png" /> </p>
+<p class="MsoNormal">When the <b>Obtain Kerberos v4 credentials</b> button is 
+checked, NetIdMgr will attempt to retrieve Kerberos v4 credentials when ticket 
+initialization, renewal, or importation is performed. &nbsp;Kerberos realms are 
+increasingly configured to support only Kerberos v5 (e.g., Windows Active 
+Directory Domains.)&nbsp; If the realms you use do not support Kerberos v4 it is 
+suggested that this button be unchecked.</p>
+<p class="MsoNormal">Be aware that only the default identity can obtain Kerberos 
+v4 credentials.&nbsp;&nbsp; This limitation is due to the inability of Kerberos v4 
+applications on Microsoft Windows to specify a credentials cache. </p>
 
-<p>Note that adding or removing an identity in the configuration panel
-only has the effect of adding or removing the identity to or from the
-list of identities for which configuration information is maintained.
-</p>
-
-<p><img src="images/screen_config_idents.bmp" />
-</p>
 
-<a name="cfg_ident" />
+<a name="cfg_ident"></a>
 <h3>Per identity configuration</h3>
+<p>You can access the per-identity configuration panel for a specific identity by 
+selecting the identity name from the list of configuration panels in the configuration 
+dialog. </p>
+<p>These panels are similar to the <span class="pre">Identities</span> configuration 
+panel, but they change per-identity settings. Changes you make in these panels will 
+override the defaults set in the <span class="pre">Identities</span> panel. </p>
+<h4>Per identity General Configuration</h4>
+<p><img src="images/screen_config_ident.png" /> </p>
+<p class="MsoNormal">The General page contains a <b>Remove Identity</b> button 
+that can be used to delete this Identity from the Network Identity Manager.</p>
 
-<p>You can access the per-identity configuration panel for a specific
-identity by selecting the identity name from the list of configuration
-panels in the configuration dialog.
-</p>
+<h4>Per identity Kerberos v5 Configuration</h4>
 
-<p>These panels are similar to the <span class="pre">Identities</span>
-configuration panel, but they change per-identity settings.  Changes
-you make in these panels will override the defaults set in the <span
-class="pre">Identities</span> panel.
-</p>
+<p><img src="images/screen_config_ident_krb5.png" /> </p>
+<p class="MsoNormal">The Kerberos v5 page displays the name of the credential 
+cache currently associated with the Identity.</p>
 
-<p><img src="images/screen_config_ident.bmp" />
-</p>
+<h4>Per identity Kerberos v4 Configuration</h4>
+
+<p><img src="images/screen_config_ident_krb4.png" /></p>
+<p class="MsoNormal">The Kerberos v4 page is optional and may not appear on all 
+systems.&nbsp; Only one identity can obtain Kerberos v4 credentials at a time.&nbsp; </p>
+
+<h3>Notification Configuration</h3>
+
+<p><img src="images/screen_config_notifications.png" /> </p>
+<p class="MsoNormal">The <b>Renew automatically at</b> check box determines 
+whether or not renewable tickets will be renewed by NetIdMgr when they reach the 
+specified time remaining.&nbsp;&nbsp; </p>
+<p class="MsoNormal">The <b>Initial warning at</b> check box determines whether 
+or not a warning will be issued when the specified time remaining is reached.</p>
+<p class="MsoNormal">The <b>Final warning at</b> check box determines whether or 
+not a warning will be issued when the specified time remaining is reached.</p>
+<p class="MsoNormal">Notifications are performed in two ways.&nbsp; First, icons are 
+displayed next to the affected credentials in the flags column of the display.&nbsp; 
+Second, a balloon tip is displayed off of the NetIdMgr taskbar notification area 
+icon.</p>
+
+<h3>Plug-in Configuration</h3>
+<p><img src="images/screen_config_plug_ins.png" /> </p>
+<p><span style="font-size: 10.0pt; font-family: Times New Roman">The Plug-ins 
+and Modules page provides status information on the currently loaded plug-ins 
+and modules include a description of their purpose; whether or not it was loaded 
+properly; which other modules are required; and what organization developed it.
+</span> </p>
+
+<h4>Kerberos v5 Plug-in Configuration</h4>
+
+<p><img src="images/screen_config_plug_in_krb5.png" /> </p>
+<p class="MsoNormal">The <b>Kerberos v5 Configuration</b> tab allows you to 
+alter the behavior of&nbsp; the Kerberos v5 identity provider.&nbsp; </p>
+<p class="MsoNormal">In the <b>Default Realm</b> field, select a Kerberos realm 
+from the dropdown list.</p>
+<p class="MsoBodyTextIndent2" style="text-indent:0pt">The <b>Include all 
+configured realms in New Credentials realm list</b> determines whether all of 
+the realms declared in the Kerberos v5 Configuration file are included in the 
+realms list of the <b>Obtain New Credentials</b> dialog.&nbsp; If disabled, only the 
+realms previously used to obtain credentials are displayed.</p>
+<p class="MsoBodyTextIndent2" style="text-indent:0pt">The <b>Configuration File
+</b>field displays the path to the Kerberos v5 configuration file, krb5.ini.</p>
+<p class="MsoNormal"><span style="display: none">The Kerberos libraries depend 
+on configuration files for their proper operation.&nbsp; When <b>Create file if 
+missing </b>is checked, NetIdMgr will construct replacements for missing 
+configuration files upon startup.&nbsp; This is performed by extracting Kerberos 
+configuration information from the local Windows registry and the Domain Name 
+System.&nbsp; The contents of the created file may then be edited using the <b>
+Kerberos Properties Dialog</b>.&nbsp; [This functionality is not available in this 
+release.]</span></p>
+<p class="MsoNormal">The field labeled <b>Host Name</b> displays the name of 
+your local machine.&nbsp; The <b>Domain Name</b> field displays the domain to which 
+your local machine currently belongs.&nbsp;</p>
+<p class="MsoNormal">The <b>Import Tickets</b> listbox allows you to configure 
+how NetIdMgr interacts with the Microsoft Kerberos Authentication Provider.&nbsp; 
+NetIdMgr will automatically import Kerberos Tickets from the Microsoft LSA at 
+startup depending upon the selected option and whether or not the Kerberos 
+Authentication Provider was used for Windows Logon authorization.&nbsp; </p>
+<ul style="margin-top: 0pt; margin-bottom: 0pt" type="disc">
+	<li class="MsoNormal"><b>Never</b> means do not import tickets from the 
+	MSLSA; </li>
+	<li class="MsoNormal"><b>Always</b> means do import tickets from the MSLSA; 
+	and </li>
+	<li class="MsoNormal"><b>Only when the Principal matches</b> means import 
+	tickets from the MSLSA only if the MSLSA Kerberos principal belongs to the 
+	Default Realm.</li>
+</ul>
+<p class="MsoNormal">When the Windows Logon identity is imported and is 
+configured as the default identity, the MIT credential cache will be used in 
+preference to the MSLSA credential cache.</p>
+
+<h4>Kerberos v5 Realm Configuration</h4>
+<p><img src="images/screen_config_plug_in_krb5_realm.png" /> </p>
+
+<h4>Kerberos v5 Credential Cache Configuration</h4>
+<p><img src="images/screen_config_plug_in_krb5_ccache.png" /> </p>
+<p class="MsoNormal">The Kerberos Realm Configuration dialog can be used to 
+manage the contents of the [Realms] and [Domain_Realm] sections of the Kerberos 
+v5 configuration file.</p>
+
+<h4>Kerberos v4 Plug-in Configuration</h4>
+<p><img src="images/screen_config_plug_in_krb4.png" /> </p>
+<p class="MsoBodyTextIndent2" style="text-indent:0pt">Here, you can specify the 
+name of the in-memory cache used to store the Kerberos v4 tickets.&nbsp; The format 
+of the name is �API:� followed by the cache name.&nbsp; Disk caches are not supported 
+by Kerberos for Windows.</p>
+<p class="MsoNormal">The paths to the Kerberos v4 configuration files: krb.con 
+and krbrealm.con may be viewed from this dialog.&nbsp; The default is to store the 
+configuration files in the Windows directory.</p>
 
 </body>
-</html>
+
+</html>
+\ No newline at end of file
diff --git a/src/windows/identity/help/html/use_icon.htm b/src/windows/identity/help/html/use_icon.htm
index 212099e..353443f 100644
--- a/src/windows/identity/help/html/use_icon.htm
+++ b/src/windows/identity/help/html/use_icon.htm
@@ -1,17 +1,16 @@
 <html>
 <head>
-  <title>NetIDMgr Notification Icon</title>
+  <title>Network Identity Manager Notification Icon</title>
   <meta name="description" content="NetIDMgr Notification Icon">
   <meta name="keywords" content="icon, netidmgr, notification, tray">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>NetIDMgr Notification Icon</h1>
+<h1>Network Identity Manager Notification Icon</h1>
+<h3>Visual Representation of Identity State Information</h3>
 
-<p>When NetIDMgr is running, an icon will be placed in the system
-notification area (sometimes referred to as the "tray" area, or the
-"system tray").  The icon will change to reflect the current state of
+<p>When Network Identity Manager is running, an icon will appear in the taskbar notification area.&nbsp;  The icon will change to reflect the current state of
 the managed credentials.</p>
 
 <p>The icons and their meanings are described below:</p>
@@ -19,33 +18,56 @@ the managed credentials.</p>
 <table width="100%" border="1">
 
 <tr>
-<td><img src="images/appicon_empty.bmp" /></td>
+<td><img src="images/appicon_empty.png" /></td>
 <td>There are no managed credentials for any identity.</td>
 </tr>
 
 <tr>
-<td><img src="images/appicon_good.bmp" /></td>
+<td><img src="images/appicon_good.png" /></td>
 <td>There are valid credentials for all the identities.</td>
 </tr>
 
 <tr>
-<td><img src="images/appicon_warnexp.bmp" /></td> <td>Some of the
+<td><img src="images/appicon_warnexp.png" /></td> <td>Some of the
 credentials will expire in the next few minutes.  This icon will be
 displayed even if automatic renewals are enabled.  In this case, the
 credentials in question may get renewed before they expire, and the
 icon will change to reflect this change.</td> </tr>
 
 <tr>
-<td><img src="images/appicon_expired.bmp" /></td>
-<td>some of the managed credentials have expired.</td>
+<td><img src="images/appicon_expired.png" /></td>
+<td>At least one identity's credentials have expired.</td>
 </tr>
 
 <tr>
-<td><img src="images/appicon_warning.bmp" /></td> <td>A warning
+<td><img src="images/appicon_warning.png" /></td> <td>A warning
 message is waiting to be displayed.  Click the icon to view the
 warning message.</td> </tr>
 
 </table>
 
+<h3>Notification Icon Menu</h3>
+<p>Clicking on the notification with the second mouse button displays a menu 
+(see right) which contains the most commonly used Network Identity Manager 
+operations.&nbsp; </p>
+
+<ul>
+  <li><a href="act_new_creds.htm">Obtaining new credentials</a></li>
+  <li><a href="act_destroy_creds.htm">Destroying credentials</a></li>
+  <li><a href="act_import_creds.htm">Import credentials from the Microsoft Logon 
+	Session cache</a></li>
+  <li><a href="act_renew_creds.htm">Renew credentials</a></li>
+  <li><a href="act_chpw.htm">Change password</a></li>
+</ul>
+
+<div class="sidebar">
+<img src="images/notification_icon_menu.png" />
+<p class="caption">Figure 1. Notification Icon Menu</p>
+</div>
+<p></p>
+<h3>Notification Icon Default Action</h3>
+
+<p>Clicking on the icon with the first mouse button will open or close the Network Identity Manager application window or open the Obtain New Credentials dialog based upon the current configuration.  The behavior can be adjusted from the Options-&gt;General page.  Clicking with the second mouse button will display a menu of commands.</p>
+
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/use_layout.htm b/src/windows/identity/help/html/use_layout.htm
index 7a0d070..ab1ad6f 100644
--- a/src/windows/identity/help/html/use_layout.htm
+++ b/src/windows/identity/help/html/use_layout.htm
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title>Managing the credentials view layout</title>
+  <title>Network Identity Manager - Managing the credentials view layout</title>
   <meta name="description" content="Managing the credentials view layout">
   <meta name="keywords" content="view, layout">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Managing the credentials view layout</h1>
+<h1>Network Identity Manager - Managing the credentials view layout</h1>
 
 <p>The credentials view layout provides an outlined view of the
 credentials that are being managed by NetIDMgr.  The columns that are
@@ -24,8 +24,8 @@ customizations that can be performed:</p>
   <li><a href="#group">Grouping by a column.</a></li>
 </ul>
 
-<a name="predef" />
-<h3>Predefined layouts</h3>
+<a name="predef"></a>
+<h3>Pre-defined layouts</h3>
 
 <p>The predefined layouts in NetIDMgr are:</p>
 
@@ -46,7 +46,7 @@ customizations that can be performed:</p>
 
 </ul>
 
-<a name="addcol" />
+<a name="addcol"></a>
 <h3>Adding and removing columns</h3>
 
 <p>The <span class="pre">View Columns</span> menu lists all the
@@ -60,9 +60,9 @@ display.</p>
 area or by invoking the <span class="pre">View</span> menu.  The menu
 is shown below.</p>
 
-<p><img src="images/screen_menu_view_cols.bmp"/> </p>
+<p><img src="images/screen_menu_view_cols.png"/> </p>
 
-<a name="sort" />
+<a name="sort"></a>
 <h3>Sorting by a column</h3>
 
 <p>Clicking on a column header will change the sort order of the
@@ -73,7 +73,7 @@ will start sorting in increasing order by that column.</p>
 <p>Double-clicking a column that is not used for grouping will stop
 sorting by that column.</p>
 
-<a name="group" />
+<a name="group"></a>
 <h3>Grouping by a column</h3>
 
 <p>Double-clicking on a column header will start grouping by that
diff --git a/src/windows/identity/help/html/use_start.htm b/src/windows/identity/help/html/use_start.htm
index 1f1a7d6..4c1b7ab 100644
--- a/src/windows/identity/help/html/use_start.htm
+++ b/src/windows/identity/help/html/use_start.htm
@@ -1,24 +1,24 @@
 <html>
 <head>
-  <title>Starting NetIDMgr</title>
+  <title>Network Identity Manager - Starting Network Identity Manager</title>
   <meta name="description" content="starting NetIDMgr">
   <meta name="keywords" content="starting">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Starting NetIDMgr</h1>
+<h1>Network Identity Manager - Starting Network Identity Manager</h1>
 
-<h3>Opening the NetIDMgr window from the notification icon</h3>
+<h3>Opening the Network Identity Manager window from the notification icon</h3>
 
-<p>Depending on how you have installed NetIDMgr, it may start as soon
-as you login, or it may need to be started manually.  NetIDMgr is a
-tray application.  Hence it doesn't appear on your task bar.  This is
-based on the assumption that you don't need to run NetIDMgr very
-often, and helps reduce clutter on the desktop.</p>
+<p>Depending on how Network Identity Manager was installed, it may be configured 
+with a shortcut in the Startup Folder, or it may require a manual start. NetIDMgr is a
+notification tray application and therefore it is not listed in the Microsoft 
+Windows task bar.&nbsp; This design is based on the assumption that most users 
+rarely interact directly with the application.</p>
 
 <div class="sidebar">
-<img src="images/screen_tray_icon.bmp"/>
+<img src="images/screen_tray_icon.png"/>
 <p class="caption">Figure 1: NetIDMgr notification icon</p>
 </div>
 
@@ -27,14 +27,15 @@ notification area (sometimes referred to as the "system tray") as
 shown in figure 1.  Details about the state information represented by
 the icon can be found <a href="use_icon.htm">here</a>.</p>
 
-<p>Clicking on this icon brings up the NetIDMgr window.  Right
-clicking on the icon, on the other hand, brings up a menu.</p>
+<p>Left clicking on this icon executes the default action which either changes 
+the view state of the credential list or displays the <i>Obtain New Credentials</i> 
+dialog. Right clicking on the icon displays a menu.</p>
 
-<h3>Starting NetIDMgr from the Start Menu or command line</h3>
+<h3>Starting Network Identity Manager from the Start Menu or command line</h3>
 
 <div class="sidebar">
-<img src="images/screen_app_icon.bmp" />
-<p class="caption">Figure 2: NetIDMgr application icon</p>
+<img src="images/screen_app_icon.png" />
+<p class="caption">Figure 2: NetIDMgr application shortcut</p>
 </div>
 
 <p>If NetIDMgr was not configured to start automatically when you
diff --git a/src/windows/identity/help/html/using.htm b/src/windows/identity/help/html/using.htm
index c66ee8a..de17273 100644
--- a/src/windows/identity/help/html/using.htm
+++ b/src/windows/identity/help/html/using.htm
@@ -1,28 +1,35 @@
 <html>
 <head>
-  <title>Using NetIDMgr</title>
+  <title>Using Network Identity Manager</title>
   <meta name="description" content="Using NetIDMgr">
   <meta name="keywords" content="using">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Using NetIDMgr</h1>
+<h1>Using Network Identity Manager</h1>
 
 <p>
-Depending on how NetIDMgr was installed, it might already be running
-in the system notification area or it might need to be started
-manually. See the topic <a href="use_start.htm">starting
-NetIDMgr</a> for details.  Essentially, to open the NetIDMgr window,
-you either have to click the <a href="use_icon.htm">application
-icon</a> in the system notification area, select the icon from the
-start menu, or type 'netidmgr' at a command prompt.
+Depending on how Network Identity Manager was installed, it might already be running
+in the Windows taskbar notification area or it might need to be started
+manually. See the topic <a href="use_start.htm">Starting
+Network Identity Manager</a> for details.&nbsp;
+</p>
+<p>
+To open the NetIDMgr window when the <a href="use_icon.htm">application
+icon</a> is displayed in the Windows taskbar notification area, click on the 
+icon with the 2nd mouse button (usually the right mouse button) and select <b>Show Network Identity Manager window</b> from the menu.  
+</p>
+<p>
+If NetIdMgr is not displayed in the Windows taskbar notification area, it can be 
+started from the
+Start Menu, or type 'netidmgr' at a command prompt.
 </p>
 
 <p>
-Once you open the NetIDMgr window, you will be presented with a view
-of your existing credentials, or a message notifying you that you
-don't have any.  Details of the credentials view objects <a
+Once the NetIDMgr window is visible, you will be presented with a view
+of your existing identies, or a message notifying you that you
+don't have any.&nbsp;&nbsp; Details of the credentials view objects <a
 href="wnd_main.htm">can be found here.</a>
 </p>
 
@@ -31,18 +38,20 @@ Brief overviews of how to perform common tasks are linked below:
 </p>
 
 <ul>
-  <li><a href="act_new_creds.htm">Getting new credentials</a></li>
+  <li><a href="act_new_creds.htm">Obtaining new credentials</a></li>
   <li><a href="act_destroy_creds.htm">Destroying credentials</a></li>
-  <li><a href="act_import_creds.htm">Import credentials from the MSLSA cache</a></li>
+  <li><a href="act_import_creds.htm">Import credentials from the Microsoft Logon 
+	Session cache</a></li>
   <li><a href="act_renew_creds.htm">Renew credentials</a></li>
   <li><a href="act_chpw.htm">Change password</a></li>
-  <li><a href="use_layout.htm">Managing the credentials view layout</a></li>
-  <li><a href="use_config.htm">Configuring NetIDMgr and identities</a></li>
+  <li><a href="use_layout.htm">Customizing the advanced credentials view layout</a></li>
+  <li><a href="use_config.htm">Configuring Network Identity Manager</a></li>
+	<li><a href="tb_standard.htm">Using the Toobar</a></li>
 </ul>
 
 <p>
-A more comprehensive list of how-to topics can be found in the <span
-class="pre"><a href="howdoi.htm">How do I...</a></span> section.</p>
+A more comprehensive list of how-to topics can be found in the 
+<a href="howdoi.htm">How do I...</a> section.</p>
 
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/welcome.htm b/src/windows/identity/help/html/welcome.htm
index 18a6312..263be8c 100644
--- a/src/windows/identity/help/html/welcome.htm
+++ b/src/windows/identity/help/html/welcome.htm
@@ -4,6 +4,8 @@
   <meta name="description" content="Welcome">
   <meta name="keywords" content="welcome">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
+	<style>
+</style>
 </head>
 
 <h1>Welcome to the Network Identity Manager</h1>
@@ -12,25 +14,76 @@
 <img src="images/logo.jpg" width="100" height="100"/>
 </div>
 
-<p>
-The Network Identity Manager (or NetIDMgr for short) allows you to
-manage your network identities and the associated credentials 
-(Kerberos tickets, AFS tokens, etc.).
-</p>
-
-<p>
-NetIDMgr is extensible using plugins.  In fact, most of the features
-are implemented in plugins, some of which are themselves extensible.
-Support for additional protocols and credential types can be added by
-installing the appropriate plugins.
+<p>Network Identity Manager (NetIdMgr) is a graphical 
+tool designed to simplify the management of network identities and their credentials 
+which are used by network authentication protocols while providing 
+secure access to network services.&nbsp; When NetIDMgr is used with Kerberos v5 each 
+network identity is a unique Kerberos principal name and the credentials 
+are Kerberos v5 tickets.&nbsp; Kerberos v5 tickets can be used by NetIDMgr to 
+obtain Andrew File System (AFS) tokens and X.509 public key certificates if the 
+appropriate plug-ins are available.</p>
+<p>When you log into Microsoft Windows with a domain account, 
+your account name and the Windows Domain name when combined form a Kerberos 
+principal name.&nbsp; As an example, �WINDOWS\jaltman� is actually a short form 
+representation of
+jaltman@WINDOWS.SECURE-ENDPOINTS.COM.&nbsp;&nbsp; Microsoft Windows uses 
+Kerberos-based network identities for all domain-based network authentications.&nbsp;
 </p>
-
+<p>Since Microsoft Windows already provides a network 
+identity, why do you need NetIdMgr?&nbsp; Here are some examples:</p>
+<ol>
+	<li>Your only network identity is your Windows Domain 
+	account but you have third-party applications that rely on MIT Kerberos for 
+	authentication for access to remote files, e-mail, web data, or other 
+	services.&nbsp; In this scenario, NetIdMgr will automatically import your Windows 
+	Domain credentials into a form that can be used by applications that rely on 
+	MIT Kerberos.</li>
+	<li>You do not have a Windows Domain account but you must 
+	obtain network credentials in order to securely access a network service.&nbsp; 
+	In this scenario, NetIdMgr can be used to obtain new credentials for network 
+	identities and can automatically renew them before they expire.</li>
+	<li>You have Kerberos credentials for a network identity 
+	and you have third-party applications that require an alternative form of 
+	network credential, such as an AFS token or a X.509 certificate, which can 
+	be obtained via a Kerberos authentication.&nbsp; In this scenario, NetIdMgr can 
+	automatically use your existing credentials to obtain and renew the 
+	additional network credentials types.</li>
+	<li>You have a Windows Domain account but you need to 
+	authenticate to a service belonging to a Kerberos realm outside the Windows 
+	Domain.&nbsp; In this scenario, NetIdMgr can be used to manage multiple network 
+	identities, the Windows Domain identity as well as the additional Kerberos 
+	identity required for the external network services.&nbsp; </li>
+	<li>You have multiple network identities within the same 
+	Kerberos realm which are used for different roles.&nbsp; For example, an 
+	unprivileged user identity and a privileged identity that is only meant to 
+	be used for system administration.&nbsp; In this scenario, NetIdMgr can be used 
+	to obtain credentials for all of your identities and automatically renew 
+	them as necessary.</li>
+</ol>
+<p>NetIdMgr�s automated credential acquisition and renewal 
+makes it an invaluable tool which provides users with a Single Sign-on 
+experience. </p>
+<p>NetIdMgr is most commonly configured as a StartUp item that runs an icon in the Taskbar Notification Area until you logout.&nbsp; 
+While running, NetIDMgr automatically renews your credentials, notifies you of 
+pending expirations and prompts you when a Kerberized application requires 
+credentials that have not already been obtained.&nbsp; </p>
+<p>When configured to do so, NetIdMgr will prompt you 
+immediately after it starts to obtain Kerberos credentials.&nbsp; This is often 
+referred to as logging on to Kerberos.&nbsp; NetIdMgr does not perform a logon in the 
+sense of the Windows Logon Service.&nbsp; A logon service would do more than manage 
+Kerberos tickets. A logon service would authenticate you to the local machine, 
+validate access to your local file system and performs additional set-up tasks. 
+These are beyond the scope of NetIdMgr. NetIdMgr simply allows you to manage 
+Kerberos identities on behalf of compatible applications and to change your 
+Kerberos password.</p>
 <p>
-This version is distributed as a part of the MIT Kerberos for Windows
-product along with the Kerberos 5 and Kerberos 4 plugins.  The OpenAFS
-plugin, which is required for supporting AFS tokens, is
-distributed separately.
-</p>
+NetIDMgr is distributed as a part of MIT Kerberos for Windows
+along with the Kerberos v5 and Kerberos v4 plug-ins.  Plug-ins for additional 
+credential types including AFS tokens and KCA certificates are available as 
+separate distributions.&nbsp; The OpenAFS plug-in, which is required for supporting AFS tokens, is
+distributed as part of <a href="http://www.openafs.org/windows.html">OpenAFS for 
+Windows</a>.&nbsp; The KCA plug-in is distributed by
+<a href="http://www.secure-endpoints.com/">Secure Endpoints Inc.</a></p>
 
 <ul>
 <li><a href="copyright.htm">Legal information</a></li>
@@ -43,34 +96,35 @@ distributed separately.
 <li><a href="concepts.htm">NetIDMgr concepts</a></li>
 <li><a href="using.htm">Using NetIDMgr</a></li>
 <li><a href="howdoi.htm">How do I ...</a></li>
+<li><a href="menu_all.htm">All Menus</a></li>
 </ul>
 
 <h3>Information for developers</h3>
 
 <p>
-If you are interested in developing plugins or extending the features
-of NetIDMgr, your first stop should be the NetIDMgr SDK.  This is
-included in the Kerberos for Windows SDK, which itself is a part of
-the Kerberos for Windows distribution.
-</p>
+If you are interested in developing plug-ins or extending the features
+of NetIDMgr, your first stop should be the NetIDMgr SDK which is included in the 
+MIT Kerberos for Windows SDK.</p>
 
 <p>
-We highly recommend interested developers to contact the <a
+Contact the <a
 href="mailto:netidmgr@secure-endpoints.com">netidmgr@secure-endpoints.com</a>
-mailing list.
-</p>
+mailing list with questions or comments.</p>
 
 <h3>External links</h3>
 
 <ul>
-<li><a class="external" href="http://web.mit.edu/kerberos">http://web.mit.edu/kerbeors</a>:
+<li><a class="external" href="http://web.mit.edu/kerberos">http://web.mit.edu/kerberos</a>:
 
 MIT Kerberos distribution
 </li>
-<li><a class="external" href="http://openafs.org">http://openafs.org</a>:
+<li><a class="external" href="http://www.openafs.org/windows.html">http://www.openafs.org/windows.html</a>:
 
-OpenAFS
+OpenAFS for Windows
 </li>
+<li>
+<a class="external" href="http://www.secure-endpoints.com/">http://www.secure-endpoints.com/</a>: 
+Secure Endpoints Inc.</li>
 </ul>
 
 </html>
 \ No newline at end of file
diff --git a/src/windows/identity/help/html/wnd_main.htm b/src/windows/identity/help/html/wnd_main.htm
index 3c10378..2441e22 100644
--- a/src/windows/identity/help/html/wnd_main.htm
+++ b/src/windows/identity/help/html/wnd_main.htm
@@ -1,17 +1,29 @@
 <html>
 <head>
-  <title>Main Window</title>
+  <title>Network Identity Manager - Application Window</title>
   <meta name="description" content="Main Window">
   <meta name="keywords" content="main window">
   <link rel="stylesheet" type="text/css" href="nidmgr.css">
 </head>
 <body>
 
-<h1>Main Window</h1>
+<h1>Network Identity Manager - Application Window</h1>
 
-<p>The main window of Network Identity Manager is structured as follows</p>
+<p>The application window of Network Identity Manager can be displayed in two modes: <b>basic</b> and <b>advanced</b>.</p>
 
-<img src="images/screen_main_wnd.bmp" usemap="#main_wnd_map"/>
+<p>The basic view provides status information of the currently available identities whereas the advanced 
+view provides more detailed information of all the active credentials.</p>
+
+<div>
+<img src="images/screen_main_wnd_basic.png"/>
+<p class="caption">Figure 1. Network Identity Manager Basic View</p>
+</div>
+
+<div>
+
+<img src="images/screen_main_wnd.png"/>
+<p class="caption">Figure 2.  Network Identity Manager Advanced View</p>
+</div>
 
 <ol>
   <li>Menu bar</li>
@@ -65,4 +77,4 @@ The threshold for this is always zero.
 </p> 
 
 </body>
-</html>
+</html>
+\ No newline at end of file
author	Tom Yu <tlyu@mit.edu>	2007-04-12 20:12:32 +0000
committer	Tom Yu <tlyu@mit.edu>	2007-04-12 20:12:32 +0000
commit	4389aeb47a02bebb79315ddb288ebf4a9312000b (patch)
tree	dafd2edcc2ac18a400563f96843b63b79e3523ad /src
parent	fd7c05e9b3837d460c6ed35eb289bb63b479dbf4 (diff)
download	krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.zip krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.tar.gz krb5-4389aeb47a02bebb79315ddb288ebf4a9312000b.tar.bz2