Set svn:eol-style on a bunch of text-looking files that didn't have it

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19972 dc483132-0cff-0310-8789-dd5450dbe970

87 files changed, 7787 insertions, 7787 deletions

diff --git a/src/windows/identity/config/Makefile b/src/windows/identity/config/Makefile
index 41e29bf82..e5bc7eea8 100644
--- a/src/windows/identity/config/Makefile
+++ b/src/windows/identity/config/Makefile
@@ -1,147 +1,147 @@
-#

-# Copyright (c) 2004,2005,2006 Massachusetts Institute of Technology

-# Copyright (c) 2006 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=config

-!include <Makefile.w32>

-

-all: showvars showvers mkalldirs mkversion

-

-showvars:

-	$(ECHO) SRC= $(SRC)

-	$(ECHO) DESTDIR = $(DESTDIR)

-	$(ECHO) OBJDIR = $(OBJDIR)

-	$(ECHO).

-	$(ECHO) CC = $(CC)

-	$(ECHO) DOXYGEN = $(DOXYGEN)

-	$(ECHO) HHC = $(HHC)

-

-showvers:

-	$(ECHO) ---- Version Information ----

-	$(ECHO) NETIDMGR_VERSION=    $(NETIDMGR_VERSION)

-	$(ECHO) NETIDMGR_VERSION_API=$(NETIDMGR_VERSION_API)

-	$(ECHO) NETIDMGR_RELEASEDESC=$(NETIDMGR_RELEASEDESC)

-	$(ECHO) Build Type          :$(KH_BUILD), $(KH_RELEASE)

-	$(ECHO) Strings:

-	$(ECHO) Company    = $(NETIDMGR_SRC_COMPANY_1033)

-	$(ECHO) Copyright  = $(NETIDMGR_SRC_COPYRIGHT_1033)

-	$(ECHO) ---- End Version Information ---

-	$(ECHO).

-

-mkalldirs:

-!	if !exist($(DESTROOT))

-	-$(MKDIR) $(DESTROOT)

-!	endif

-!	if !exist($(OBJROOT))

-	-$(MKDIR) $(OBJROOT)

-!	endif

-!	if !exist($(DESTDIR))

-	-$(MKDIR) $(DESTDIR)

-!	endif

-!	if !exist($(OBJDIR))

-	-$(MKDIR) $(OBJDIR)

-!	endif

-!	if !exist($(INCDIR))

-	-$(MKDIR) $(INCDIR)

-!	endif

-!	if !exist($(BINDIR))

-	-$(MKDIR) $(BINDIR)

-!	endif

-!	if !exist($(LIBDIR))

-	-$(MKDIR) $(LIBDIR)

-!	endif

-!	if !exist($(DOCDIR))

-	-$(MKDIR) $(DOCDIR)

-!	endif

-!	if !exist($(OBJDIR)\W2K)

-	-$(MKDIR) $(OBJDIR)\W2K

-!	endif

-!	if !exist($(BINDIR)\W2K)

-	-$(MKDIR) $(BINDIR)\W2K

-!	endif

-!	if !exist($(LIBDIR)\W2K)

-	-$(MKDIR) $(LIBDIR)\W2K

-!	endif

-	$(ECHO) Done creating directories.

-

-VERSIONINT=$(INCDIR)\netidmgr_intver.h

-

-VERSIONEXT=$(INCDIR)\netidmgr_version.h

-

-# Version related defines

-

-! if "$(KH_BUILD)"=="RETAIL"

-kh_fileflags=0

-! else

-kh_fileflags=VS_FF_DEBUG

-! endif

-! if "$(KH_RELEASE)"=="PRERELEASE"

-kh_fileflags=$(kh_fileflags) | VS_FF_PRERELEASE

-! elseif "$(KH_RELEASE)"=="PRIVATE"

-kh_fileflags=$(kh_fileflags) | VS_FF_PRIVATEBUILD

-! elseif "$(KH_RELEASE)"=="SPECIAL"

-kh_fileflags=$(kh_fileflags) | VS_FF_SPECIALBUILD

-! endif

-

-kh_fileos=VOS_NT_WINDOWS32

-kh_filetype_app=VFT_APP

-kh_filetype_dll=VFT_DLL

-

-mkversion: $(VERSIONINT) $(VERSIONEXT)

-

-# Version and build strings

-

-!if "$(KH_RELEASE)" == "OFFICIAL"

-NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION)

-NETIDMGR_COMMENT_STR_1033=Official build.  Please send bug reports to kfw-bugs@MIT.EDU

-!elseif "$(KH_RELEASE)" == "PRERELEASE"

-NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION) Prelease $(NETIDMGR_RELEASEDESC)

-NETIDMGR_COMMENT_STR_1033=Prerelease build.  Please send bug reports to kfw-bugs@MIT.EDU

-!elseif "$(KH_RELEASE)" == "PRIVATE"

-NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION).PRIVATE

-NETIDMGR_PRIVATE_STR_1033=Private build.  Please send bug reports to kfw-bugs@MIT.EDU

-!elseif "$(KH_RELEASE)" == "SPECIAL"

-NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION).SPECIAL

-NETIDMGR_SPECIAL_STR_1033=Special build.  Please send bug reports to kfw-bugs@MIT.EDU

-!endif

-

-!if "$(KH_BUILD)" == "DEBUG"

-NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION_STR_1033).DEBUG

-!else

-!endif

-

-NETIDMGR_PRODUCT_1033=NetIDMgr $(NETIDMGR_VERSION_STR_1033)

-

-!include netidmgr_version.h.in

-

-!include netidmgr_intver.h.in

-

-clean::

-!	if exist($(VERSIONINT))

-	$(RM) $(VERSIONINT)

-!	endif

-!	if exist($(VERSIONEXT))

-	$(RM) $(VERSIONEXT)

-!	endif

-

+#
+# Copyright (c) 2004,2005,2006 Massachusetts Institute of Technology
+# Copyright (c) 2006 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=config
+!include <Makefile.w32>
+
+all: showvars showvers mkalldirs mkversion
+
+showvars:
+	$(ECHO) SRC= $(SRC)
+	$(ECHO) DESTDIR = $(DESTDIR)
+	$(ECHO) OBJDIR = $(OBJDIR)
+	$(ECHO).
+	$(ECHO) CC = $(CC)
+	$(ECHO) DOXYGEN = $(DOXYGEN)
+	$(ECHO) HHC = $(HHC)
+
+showvers:
+	$(ECHO) ---- Version Information ----
+	$(ECHO) NETIDMGR_VERSION=    $(NETIDMGR_VERSION)
+	$(ECHO) NETIDMGR_VERSION_API=$(NETIDMGR_VERSION_API)
+	$(ECHO) NETIDMGR_RELEASEDESC=$(NETIDMGR_RELEASEDESC)
+	$(ECHO) Build Type          :$(KH_BUILD), $(KH_RELEASE)
+	$(ECHO) Strings:
+	$(ECHO) Company    = $(NETIDMGR_SRC_COMPANY_1033)
+	$(ECHO) Copyright  = $(NETIDMGR_SRC_COPYRIGHT_1033)
+	$(ECHO) ---- End Version Information ---
+	$(ECHO).
+
+mkalldirs:
+!	if !exist($(DESTROOT))
+	-$(MKDIR) $(DESTROOT)
+!	endif
+!	if !exist($(OBJROOT))
+	-$(MKDIR) $(OBJROOT)
+!	endif
+!	if !exist($(DESTDIR))
+	-$(MKDIR) $(DESTDIR)
+!	endif
+!	if !exist($(OBJDIR))
+	-$(MKDIR) $(OBJDIR)
+!	endif
+!	if !exist($(INCDIR))
+	-$(MKDIR) $(INCDIR)
+!	endif
+!	if !exist($(BINDIR))
+	-$(MKDIR) $(BINDIR)
+!	endif
+!	if !exist($(LIBDIR))
+	-$(MKDIR) $(LIBDIR)
+!	endif
+!	if !exist($(DOCDIR))
+	-$(MKDIR) $(DOCDIR)
+!	endif
+!	if !exist($(OBJDIR)\W2K)
+	-$(MKDIR) $(OBJDIR)\W2K
+!	endif
+!	if !exist($(BINDIR)\W2K)
+	-$(MKDIR) $(BINDIR)\W2K
+!	endif
+!	if !exist($(LIBDIR)\W2K)
+	-$(MKDIR) $(LIBDIR)\W2K
+!	endif
+	$(ECHO) Done creating directories.
+
+VERSIONINT=$(INCDIR)\netidmgr_intver.h
+
+VERSIONEXT=$(INCDIR)\netidmgr_version.h
+
+# Version related defines
+
+! if "$(KH_BUILD)"=="RETAIL"
+kh_fileflags=0
+! else
+kh_fileflags=VS_FF_DEBUG
+! endif
+! if "$(KH_RELEASE)"=="PRERELEASE"
+kh_fileflags=$(kh_fileflags) | VS_FF_PRERELEASE
+! elseif "$(KH_RELEASE)"=="PRIVATE"
+kh_fileflags=$(kh_fileflags) | VS_FF_PRIVATEBUILD
+! elseif "$(KH_RELEASE)"=="SPECIAL"
+kh_fileflags=$(kh_fileflags) | VS_FF_SPECIALBUILD
+! endif
+
+kh_fileos=VOS_NT_WINDOWS32
+kh_filetype_app=VFT_APP
+kh_filetype_dll=VFT_DLL
+
+mkversion: $(VERSIONINT) $(VERSIONEXT)
+
+# Version and build strings
+
+!if "$(KH_RELEASE)" == "OFFICIAL"
+NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION)
+NETIDMGR_COMMENT_STR_1033=Official build.  Please send bug reports to kfw-bugs@MIT.EDU
+!elseif "$(KH_RELEASE)" == "PRERELEASE"
+NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION) Prelease $(NETIDMGR_RELEASEDESC)
+NETIDMGR_COMMENT_STR_1033=Prerelease build.  Please send bug reports to kfw-bugs@MIT.EDU
+!elseif "$(KH_RELEASE)" == "PRIVATE"
+NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION).PRIVATE
+NETIDMGR_PRIVATE_STR_1033=Private build.  Please send bug reports to kfw-bugs@MIT.EDU
+!elseif "$(KH_RELEASE)" == "SPECIAL"
+NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION).SPECIAL
+NETIDMGR_SPECIAL_STR_1033=Special build.  Please send bug reports to kfw-bugs@MIT.EDU
+!endif
+
+!if "$(KH_BUILD)" == "DEBUG"
+NETIDMGR_VERSION_STR_1033=$(NETIDMGR_VERSION_STR_1033).DEBUG
+!else
+!endif
+
+NETIDMGR_PRODUCT_1033=NetIDMgr $(NETIDMGR_VERSION_STR_1033)
+
+!include netidmgr_version.h.in
+
+!include netidmgr_intver.h.in
+
+clean::
+!	if exist($(VERSIONINT))
+	$(RM) $(VERSIONINT)
+!	endif
+!	if exist($(VERSIONEXT))
+	$(RM) $(VERSIONEXT)
+!	endif
+
diff --git a/src/windows/identity/config/netidmgr_intver.h.in b/src/windows/identity/config/netidmgr_intver.h.in
index 15d47217f..e025fde20 100644
--- a/src/windows/identity/config/netidmgr_intver.h.in
+++ b/src/windows/identity/config/netidmgr_intver.h.in
@@ -1,47 +1,47 @@
-$(VERSIONINT): Makefile Makefile.w32

-	$(CP) << $(VERSIONINT)

-/*

- * This is an autogenerated file.  Do not modify directly.

- * 

- * File generated by running $(MAKE) in $(MAKEDIR)

- * To regenerate, run "$(MAKE) clean" and "$(MAKE) all" on $(MAKEDIR)

- */

-#ifndef __NETIDMGR_VERSION_INTERNAL_H

-#define __NETIDMGR_VERSION_INTERNAL_H

-

-#include<netidmgr_version.h>

-

-/* Language specific version strings */

-#define KH_VERSTR_COMPANY_1033	"$(NETIDMGR_SRC_COMPANY_1033)"

-#define KH_VERSTR_COPYRIGHT_1033 "$(NETIDMGR_SRC_COPYRIGHT_1033)"

-#define KH_VERSTR_PRODUCT_1033	"$(NETIDMGR_PRODUCT_1033)"

-#define KH_VERSTR_VERSION_1033	"$(NETIDMGR_VERSION_STR_1033)"

-

-!ifdef NETIDMGR_COMMENT_STR_1033

-#define KH_VERSTR_COMMENT_1033	"$(NETIDMGR_COMMENT_STR_1033)"

-#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_COMMENT_1033

-!endif

-!ifdef NETIDMGR_PRIVATE_STR_1033

-#define KH_VERSTR_PRIVATE_1033	"$(NETIDMGR_PRIVATE_STR_1033)"

-#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_PRIVATE_1033

-!endif

-!ifdef NETIDMGR_SPECIAL_STR_1033

-#define KH_VERSTR_SPECIAL_1033	"$(NETIDMGR_SPECIAL_STR_1033)"

-#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_SPECIAL_1033

-!endif

-#endif

-

-#define KH_BUILD "$(KH_BUILD)"

-

-! if "$(KH_BUILD)"=="RETAIL"

-#define KH_BUILD_RETAIL

-! elseif "$(KH_RELEASE)"=="PRERELEASE"

-#define KH_BUILD_PRERELEASE

-! elseif "$(KH_RELEASE)"=="PRIVATE"

-#define KH_BUILD_PRIVATE

-! elseif "$(KH_RELEASE)"=="SPECIAL"

-#define KH_BUILD_SPECIAL

-! endif

-

-<<

-

+$(VERSIONINT): Makefile Makefile.w32
+	$(CP) << $(VERSIONINT)
+/*
+ * This is an autogenerated file.  Do not modify directly.
+ * 
+ * File generated by running $(MAKE) in $(MAKEDIR)
+ * To regenerate, run "$(MAKE) clean" and "$(MAKE) all" on $(MAKEDIR)
+ */
+#ifndef __NETIDMGR_VERSION_INTERNAL_H
+#define __NETIDMGR_VERSION_INTERNAL_H
+
+#include<netidmgr_version.h>
+
+/* Language specific version strings */
+#define KH_VERSTR_COMPANY_1033	"$(NETIDMGR_SRC_COMPANY_1033)"
+#define KH_VERSTR_COPYRIGHT_1033 "$(NETIDMGR_SRC_COPYRIGHT_1033)"
+#define KH_VERSTR_PRODUCT_1033	"$(NETIDMGR_PRODUCT_1033)"
+#define KH_VERSTR_VERSION_1033	"$(NETIDMGR_VERSION_STR_1033)"
+
+!ifdef NETIDMGR_COMMENT_STR_1033
+#define KH_VERSTR_COMMENT_1033	"$(NETIDMGR_COMMENT_STR_1033)"
+#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_COMMENT_1033
+!endif
+!ifdef NETIDMGR_PRIVATE_STR_1033
+#define KH_VERSTR_PRIVATE_1033	"$(NETIDMGR_PRIVATE_STR_1033)"
+#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_PRIVATE_1033
+!endif
+!ifdef NETIDMGR_SPECIAL_STR_1033
+#define KH_VERSTR_SPECIAL_1033	"$(NETIDMGR_SPECIAL_STR_1033)"
+#define KH_VERSTR_BUILDINFO_1033 KH_VERSTR_SPECIAL_1033
+!endif
+#endif
+
+#define KH_BUILD "$(KH_BUILD)"
+
+! if "$(KH_BUILD)"=="RETAIL"
+#define KH_BUILD_RETAIL
+! elseif "$(KH_RELEASE)"=="PRERELEASE"
+#define KH_BUILD_PRERELEASE
+! elseif "$(KH_RELEASE)"=="PRIVATE"
+#define KH_BUILD_PRIVATE
+! elseif "$(KH_RELEASE)"=="SPECIAL"
+#define KH_BUILD_SPECIAL
+! endif
+
+<<
+
diff --git a/src/windows/identity/config/netidmgr_version.h.in b/src/windows/identity/config/netidmgr_version.h.in
index be53060d0..febbeb3d7 100644
--- a/src/windows/identity/config/netidmgr_version.h.in
+++ b/src/windows/identity/config/netidmgr_version.h.in
@@ -1,63 +1,63 @@
-$(VERSIONEXT): Makefile Makefile.w32

-	$(CP) << $(VERSIONEXT)

-/* Copyright (c) 2004 Massachusetts Institute of Technology

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use, copy,

- * modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- */

-

-#ifndef __NETIDMGR_VERSION_H

-#define __NETIDMGR_VERSION_H

-

-#include<windows.h>

-

-/* Version number macros */

-#define KH_VERSION_MAJOR 	$(NETIDMGR_VERSION_MAJOR)

-#define KH_VERSION_MINOR 	$(NETIDMGR_VERSION_MINOR)

-#define KH_VERSION_PATCH 	$(NETIDMGR_VERSION_PATCH)

-#define KH_VERSION_AUX 		$(NETIDMGR_VERSION_AUX)

-

-#define KH_VERSION_API          $(NETIDMGR_VERSION_API)

-#define KH_VERSION_API_MINCOMPAT $(NETIDMGR_VERSION_API_MINCOMPAT)

-

-#define KH_VERSION_LIST 	$(NETIDMGR_VERSIONC)

-#define KH_VERSION_STRING 	"$(NETIDMGR_VERSION)"

-#define KH_VERSION_STRINGW 	L"$(NETIDMGR_VERSION)"

-#define KH_VERSION_STRINGC 	"$(NETIDMGR_VERSIONC)"

-#define KH_VERSION_STRINGCW 	L"$(NETIDMGR_VERSIONC)"

-#define KH_VERSION_STRINGAPI    "$(NETIDMGR_VERSION_API)"

-

-/* Version definition macros */

-#define KH_VER_FILEFLAGMASK     0x17L

-#define KH_VER_FILEFLAGS 	$(kh_fileflags)

-#define KH_VER_FILEOS 		$(kh_fileos)

-#define KH_VER_FILETYPEDLL 	$(kh_filetype_dll)

-#define KH_VER_FILETYPEAPP 	$(kh_filetype_app)

-

-/* Special macros for NetIDMgr special string resources */

-#define NIMV_MODULE             "NIDM_Module"

-#define NIMV_PLUGINS            "NIDM_Plugins"

-#define NIMV_APIVER             "NIDM_APIVers"

-#define NIMV_SUPPORT            "NIDM_Support"

-

-#endif

-<<

-

+$(VERSIONEXT): Makefile Makefile.w32
+	$(CP) << $(VERSIONEXT)
+/* Copyright (c) 2004 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef __NETIDMGR_VERSION_H
+#define __NETIDMGR_VERSION_H
+
+#include<windows.h>
+
+/* Version number macros */
+#define KH_VERSION_MAJOR 	$(NETIDMGR_VERSION_MAJOR)
+#define KH_VERSION_MINOR 	$(NETIDMGR_VERSION_MINOR)
+#define KH_VERSION_PATCH 	$(NETIDMGR_VERSION_PATCH)
+#define KH_VERSION_AUX 		$(NETIDMGR_VERSION_AUX)
+
+#define KH_VERSION_API          $(NETIDMGR_VERSION_API)
+#define KH_VERSION_API_MINCOMPAT $(NETIDMGR_VERSION_API_MINCOMPAT)
+
+#define KH_VERSION_LIST 	$(NETIDMGR_VERSIONC)
+#define KH_VERSION_STRING 	"$(NETIDMGR_VERSION)"
+#define KH_VERSION_STRINGW 	L"$(NETIDMGR_VERSION)"
+#define KH_VERSION_STRINGC 	"$(NETIDMGR_VERSIONC)"
+#define KH_VERSION_STRINGCW 	L"$(NETIDMGR_VERSIONC)"
+#define KH_VERSION_STRINGAPI    "$(NETIDMGR_VERSION_API)"
+
+/* Version definition macros */
+#define KH_VER_FILEFLAGMASK     0x17L
+#define KH_VER_FILEFLAGS 	$(kh_fileflags)
+#define KH_VER_FILEOS 		$(kh_fileos)
+#define KH_VER_FILETYPEDLL 	$(kh_filetype_dll)
+#define KH_VER_FILETYPEAPP 	$(kh_filetype_app)
+
+/* Special macros for NetIDMgr special string resources */
+#define NIMV_MODULE             "NIDM_Module"
+#define NIMV_PLUGINS            "NIDM_Plugins"
+#define NIMV_APIVER             "NIDM_APIVers"
+#define NIMV_SUPPORT            "NIDM_Support"
+
+#endif
+<<
+
diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile
index 89380aff3..db40d0f65 100644
--- a/src/windows/identity/doc/Makefile
+++ b/src/windows/identity/doc/Makefile
@@ -1,71 +1,71 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=doc

-!include <../config/Makefile.w32>

-

-all: mkdirs docs

-

-docs:

-	$(DOXYGEN) <<

-@INCLUDE = doxyfile.cfg

-

-PROJECT_NUMBER = "$(KHIMAIRA_VERSION)"

-

-OUTPUT_DIRECTORY = "$(DOCDIR)"

-

-STRIP_FROM_PATH = "$(SRC)"

-

-INTERNAL_DOCS = NO

-

-WARN_LOGFILE = "$(OBJ)\doxywarnings.txt"

-

-INPUT =  "$(SRC)\include"

-INPUT += "$(SRC)\kconfig"

-INPUT += "$(SRC)\kcreddb"

-INPUT += "$(SRC)\kmq"

-INPUT += "$(SRC)\ui"

-INPUT += "$(SRC)\uilib"

-INPUT += "$(SRC)\util"

-INPUT += "$(SRC)\doc"

-INPUT += "$(SRC)\kmm"

-INPUT += "$(SRC)\kherr"

-!ifdef BUILD_AFS

-INPUT += "$(SRC)\plugins\afs"

-

-ALIASES =  "apiversion=$(NETIDMGR_VERSION_API)"

-!endif

-

-IMAGE_PATH = "$(SRC)\doc\images"

-

-INCLUDE_PATH = "$(INCDIR)" "$(SRC)\include"

-

-CHM_FILE = "$(DOCDIR)\netiddev.chm"

-<<

-	-$(HHC) $(DOCDIR)\html\index.hhp

-

-clean::

-	if exist "$(DOCDIR)/html" $(RMDIR) /s /q "$(DOCDIR)\html"

-	if exist "$(DOCDIR)" $(RM) "$(DOCDIR)\*.*"

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=doc
+!include <../config/Makefile.w32>
+
+all: mkdirs docs
+
+docs:
+	$(DOXYGEN) <<
+@INCLUDE = doxyfile.cfg
+
+PROJECT_NUMBER = "$(KHIMAIRA_VERSION)"
+
+OUTPUT_DIRECTORY = "$(DOCDIR)"
+
+STRIP_FROM_PATH = "$(SRC)"
+
+INTERNAL_DOCS = NO
+
+WARN_LOGFILE = "$(OBJ)\doxywarnings.txt"
+
+INPUT =  "$(SRC)\include"
+INPUT += "$(SRC)\kconfig"
+INPUT += "$(SRC)\kcreddb"
+INPUT += "$(SRC)\kmq"
+INPUT += "$(SRC)\ui"
+INPUT += "$(SRC)\uilib"
+INPUT += "$(SRC)\util"
+INPUT += "$(SRC)\doc"
+INPUT += "$(SRC)\kmm"
+INPUT += "$(SRC)\kherr"
+!ifdef BUILD_AFS
+INPUT += "$(SRC)\plugins\afs"
+
+ALIASES =  "apiversion=$(NETIDMGR_VERSION_API)"
+!endif
+
+IMAGE_PATH = "$(SRC)\doc\images"
+
+INCLUDE_PATH = "$(INCDIR)" "$(SRC)\include"
+
+CHM_FILE = "$(DOCDIR)\netiddev.chm"
+<<
+	-$(HHC) $(DOCDIR)\html\index.hhp
+
+clean::
+	if exist "$(DOCDIR)/html" $(RMDIR) /s /q "$(DOCDIR)\html"
+	if exist "$(DOCDIR)" $(RM) "$(DOCDIR)\*.*"
diff --git a/src/windows/identity/doc/doxyfile.cfg b/src/windows/identity/doc/doxyfile.cfg
index e26923566..7bb3092fe 100644
--- a/src/windows/identity/doc/doxyfile.cfg
+++ b/src/windows/identity/doc/doxyfile.cfg
@@ -1,1259 +1,1259 @@
-# Doxyfile 1.5.2

-

-# This file describes the settings to be used by the documentation system

-# doxygen (www.doxygen.org) for a project

-#

-# All text after a hash (#) is considered a comment and will be ignored

-# The format is:

-#       TAG = value [value, ...]

-# For lists items can also be appended using:

-#       TAG += value [value, ...]

-# Values that contain spaces should be placed between quotes (" ")

-

-#---------------------------------------------------------------------------

-# Project related configuration options

-#---------------------------------------------------------------------------

-

-# This tag specifies the encoding used for all characters in the config file that 

-# follow. The default is UTF-8 which is also the encoding used for all text before 

-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 

-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 

-# possible encodings.

-

-DOXYFILE_ENCODING      = UTF-8

-

-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 

-# by quotes) that should identify the project.

-

-PROJECT_NAME           = "Network Identity Manager"

-

-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 

-# This could be handy for archiving the generated documentation or 

-# if some version control system is used.

-

-PROJECT_NUMBER         = 

-

-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 

-# base path where the generated documentation will be put. 

-# If a relative path is entered, it will be relative to the location 

-# where doxygen was started. If left blank the current directory will be used.

-

-OUTPUT_DIRECTORY       = 

-

-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 

-# 4096 sub-directories (in 2 levels) under the output directory of each output 

-# format and will distribute the generated files over these directories. 

-# Enabling this option can be useful when feeding doxygen a huge amount of 

-# source files, where putting all generated files in the same directory would 

-# otherwise cause performance problems for the file system.

-

-CREATE_SUBDIRS         = NO

-

-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 

-# documentation generated by doxygen is written. Doxygen will use this 

-# information to generate all constant output in the proper language. 

-# The default language is English, other supported languages are: 

-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 

-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 

-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 

-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 

-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.

-

-OUTPUT_LANGUAGE        = English

-

-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 

-# include brief member descriptions after the members that are listed in 

-# the file and class documentation (similar to JavaDoc). 

-# Set to NO to disable this.

-

-BRIEF_MEMBER_DESC      = YES

-

-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 

-# the brief description of a member or function before the detailed description. 

-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 

-# brief descriptions will be completely suppressed.

-

-REPEAT_BRIEF           = YES

-

-# This tag implements a quasi-intelligent brief description abbreviator 

-# that is used to form the text in various listings. Each string 

-# in this list, if found as the leading text of the brief description, will be 

-# stripped from the text and the result after processing the whole list, is 

-# used as the annotated text. Otherwise, the brief description is used as-is. 

-# If left blank, the following values are used ("$name" is automatically 

-# replaced with the name of the entity): "The $name class" "The $name widget" 

-# "The $name file" "is" "provides" "specifies" "contains" 

-# "represents" "a" "an" "the"

-

-ABBREVIATE_BRIEF       = 

-

-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 

-# Doxygen will generate a detailed section even if there is only a brief 

-# description.

-

-ALWAYS_DETAILED_SEC    = NO

-

-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 

-# inherited members of a class in the documentation of that class as if those 

-# members were ordinary class members. Constructors, destructors and assignment 

-# operators of the base classes will not be shown.

-

-INLINE_INHERITED_MEMB  = NO

-

-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 

-# path before files name in the file list and in the header files. If set 

-# to NO the shortest path that makes the file name unique will be used.

-

-FULL_PATH_NAMES        = NO

-

-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 

-# can be used to strip a user-defined part of the path. Stripping is 

-# only done if one of the specified strings matches the left-hand part of 

-# the path. The tag can be used to show relative paths in the file list. 

-# If left blank the directory from which doxygen is run is used as the 

-# path to strip.

-

-STRIP_FROM_PATH        = 

-

-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 

-# the path mentioned in the documentation of a class, which tells 

-# the reader which header file to include in order to use a class. 

-# If left blank only the name of the header file containing the class 

-# definition is used. Otherwise one should specify the include paths that 

-# are normally passed to the compiler using the -I flag.

-

-STRIP_FROM_INC_PATH    = 

-

-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 

-# (but less readable) file names. This can be useful is your file systems 

-# doesn't support long names like on DOS, Mac, or CD-ROM.

-

-SHORT_NAMES            = NO

-

-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 

-# will interpret the first line (until the first dot) of a JavaDoc-style 

-# comment as the brief description. If set to NO, the JavaDoc 

-# comments will behave just like the Qt-style comments (thus requiring an 

-# explicit @brief command for a brief description.

-

-JAVADOC_AUTOBRIEF      = NO

-

-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 

-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 

-# comments) as a brief description. This used to be the default behaviour. 

-# The new default is to treat a multi-line C++ comment block as a detailed 

-# description. Set this tag to YES if you prefer the old behaviour instead.

-

-MULTILINE_CPP_IS_BRIEF = NO

-

-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 

-# will output the detailed description near the top, like JavaDoc.

-# If set to NO, the detailed description appears after the member 

-# documentation.

-

-DETAILS_AT_TOP         = YES

-

-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 

-# member inherits the documentation from any documented member that it 

-# re-implements.

-

-INHERIT_DOCS           = YES

-

-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 

-# a new page for each member. If set to NO, the documentation of a member will 

-# be part of the file/class/namespace that contains it.

-

-SEPARATE_MEMBER_PAGES  = NO

-

-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 

-# Doxygen uses this value to replace tabs by spaces in code fragments.

-

-TAB_SIZE               = 4

-

-# This tag can be used to specify a number of aliases that acts 

-# as commands in the documentation. An alias has the form "name=value". 

-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 

-# put the command \sideeffect (or @sideeffect) in the documentation, which 

-# will result in a user-defined paragraph with heading "Side Effects:". 

-# You can put \n's in the value part of an alias to insert newlines.

-

-ALIASES                = 

-

-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 

-# sources only. Doxygen will then generate output that is more tailored for C. 

-# For instance, some of the names that are used will be different. The list 

-# of all members will be omitted, etc.

-

-OPTIMIZE_OUTPUT_FOR_C  = YES

-

-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 

-# sources only. Doxygen will then generate output that is more tailored for Java. 

-# For instance, namespaces will be presented as packages, qualified scopes 

-# will look different, etc.

-

-OPTIMIZE_OUTPUT_JAVA   = NO

-

-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 

-# include (a tag file for) the STL sources as input, then you should 

-# set this tag to YES in order to let doxygen match functions declarations and 

-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 

-# func(std::string) {}). This also make the inheritance and collaboration 

-# diagrams that involve STL classes more complete and accurate.

-

-BUILTIN_STL_SUPPORT    = NO

-

-# If you use Microsoft's C++/CLI language, you should set this option to YES to

-# enable parsing support.

-

-CPP_CLI_SUPPORT        = NO

-

-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 

-# tag is set to YES, then doxygen will reuse the documentation of the first 

-# member in the group (if any) for the other members of the group. By default 

-# all members of a group must be documented explicitly.

-

-DISTRIBUTE_GROUP_DOC   = NO

-

-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 

-# the same type (for instance a group of public functions) to be put as a 

-# subgroup of that type (e.g. under the Public Functions section). Set it to 

-# NO to prevent subgrouping. Alternatively, this can be done per class using 

-# the \nosubgrouping command.

-

-SUBGROUPING            = YES

-

-#---------------------------------------------------------------------------

-# Build related configuration options

-#---------------------------------------------------------------------------

-

-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 

-# documentation are documented, even if no documentation was available. 

-# Private class members and static file members will be hidden unless 

-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES

-

-EXTRACT_ALL            = NO

-

-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 

-# will be included in the documentation.

-

-EXTRACT_PRIVATE        = NO

-

-# If the EXTRACT_STATIC tag is set to YES all static members of a file 

-# will be included in the documentation.

-

-EXTRACT_STATIC         = NO

-

-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 

-# defined locally in source files will be included in the documentation. 

-# If set to NO only classes defined in header files are included.

-

-EXTRACT_LOCAL_CLASSES  = YES

-

-# This flag is only useful for Objective-C code. When set to YES local 

-# methods, which are defined in the implementation section but not in 

-# the interface are included in the documentation. 

-# If set to NO (the default) only methods in the interface are included.

-

-EXTRACT_LOCAL_METHODS  = NO

-

-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 

-# undocumented members of documented classes, files or namespaces. 

-# If set to NO (the default) these members will be included in the 

-# various overviews, but no documentation section is generated. 

-# This option has no effect if EXTRACT_ALL is enabled.

-

-HIDE_UNDOC_MEMBERS     = NO

-

-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 

-# undocumented classes that are normally visible in the class hierarchy. 

-# If set to NO (the default) these classes will be included in the various 

-# overviews. This option has no effect if EXTRACT_ALL is enabled.

-

-HIDE_UNDOC_CLASSES     = NO

-

-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 

-# friend (class|struct|union) declarations. 

-# If set to NO (the default) these declarations will be included in the 

-# documentation.

-

-HIDE_FRIEND_COMPOUNDS  = NO

-

-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 

-# documentation blocks found inside the body of a function. 

-# If set to NO (the default) these blocks will be appended to the 

-# function's detailed documentation block.

-

-HIDE_IN_BODY_DOCS      = NO

-

-# The INTERNAL_DOCS tag determines if documentation 

-# that is typed after a \internal command is included. If the tag is set 

-# to NO (the default) then the documentation will be excluded. 

-# Set it to YES to include the internal documentation.

-

-INTERNAL_DOCS          = YES

-

-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 

-# file names in lower-case letters. If set to YES upper-case letters are also 

-# allowed. This is useful if you have classes or files whose names only differ 

-# in case and if your file system supports case sensitive file names. Windows 

-# and Mac users are advised to set this option to NO.

-

-CASE_SENSE_NAMES       = YES

-

-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 

-# will show members with their full class and namespace scopes in the 

-# documentation. If set to YES the scope will be hidden.

-

-HIDE_SCOPE_NAMES       = NO

-

-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 

-# will put a list of the files that are included by a file in the documentation 

-# of that file.

-

-SHOW_INCLUDE_FILES     = YES

-

-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 

-# is inserted in the documentation for inline members.

-

-INLINE_INFO            = YES

-

-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 

-# will sort the (detailed) documentation of file and class members 

-# alphabetically by member name. If set to NO the members will appear in 

-# declaration order.

-

-SORT_MEMBER_DOCS       = YES

-

-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 

-# brief documentation of file, namespace and class members alphabetically 

-# by member name. If set to NO (the default) the members will appear in 

-# declaration order.

-

-SORT_BRIEF_DOCS        = NO

-

-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 

-# sorted by fully-qualified names, including namespaces. If set to 

-# NO (the default), the class list will be sorted only by class name, 

-# not including the namespace part. 

-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.

-# Note: This option applies only to the class list, not to the 

-# alphabetical list.

-

-SORT_BY_SCOPE_NAME     = NO

-

-# The GENERATE_TODOLIST tag can be used to enable (YES) or 

-# disable (NO) the todo list. This list is created by putting \todo 

-# commands in the documentation.

-

-GENERATE_TODOLIST      = YES

-

-# The GENERATE_TESTLIST tag can be used to enable (YES) or 

-# disable (NO) the test list. This list is created by putting \test 

-# commands in the documentation.

-

-GENERATE_TESTLIST      = YES

-

-# The GENERATE_BUGLIST tag can be used to enable (YES) or 

-# disable (NO) the bug list. This list is created by putting \bug 

-# commands in the documentation.

-

-GENERATE_BUGLIST       = YES

-

-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 

-# disable (NO) the deprecated list. This list is created by putting 

-# \deprecated commands in the documentation.

-

-GENERATE_DEPRECATEDLIST= YES

-

-# The ENABLED_SECTIONS tag can be used to enable conditional 

-# documentation sections, marked by \if sectionname ... \endif.

-

-ENABLED_SECTIONS       = 

-

-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 

-# the initial value of a variable or define consists of for it to appear in 

-# the documentation. If the initializer consists of more lines than specified 

-# here it will be hidden. Use a value of 0 to hide initializers completely. 

-# The appearance of the initializer of individual variables and defines in the 

-# documentation can be controlled using \showinitializer or \hideinitializer 

-# command in the documentation regardless of this setting.

-

-MAX_INITIALIZER_LINES  = 30

-

-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 

-# at the bottom of the documentation of classes and structs. If set to YES the 

-# list will mention the files that were used to generate the documentation.

-

-SHOW_USED_FILES        = YES

-

-# If the sources in your project are distributed over multiple directories 

-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 

-# in the documentation. The default is NO.

-

-SHOW_DIRECTORIES       = NO

-

-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 

-# doxygen should invoke to get the current version for each file (typically from the 

-# version control system). Doxygen will invoke the program by executing (via 

-# popen()) the command <command> <input-file>, where <command> is the value of 

-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 

-# provided by doxygen. Whatever the program writes to standard output 

-# is used as the file version. See the manual for examples.

-

-FILE_VERSION_FILTER    = 

-

-#---------------------------------------------------------------------------

-# configuration options related to warning and progress messages

-#---------------------------------------------------------------------------

-

-# The QUIET tag can be used to turn on/off the messages that are generated 

-# by doxygen. Possible values are YES and NO. If left blank NO is used.

-

-QUIET                  = NO

-

-# The WARNINGS tag can be used to turn on/off the warning messages that are 

-# generated by doxygen. Possible values are YES and NO. If left blank 

-# NO is used.

-

-WARNINGS               = YES

-

-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 

-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 

-# automatically be disabled.

-

-WARN_IF_UNDOCUMENTED   = YES

-

-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 

-# potential errors in the documentation, such as not documenting some 

-# parameters in a documented function, or documenting parameters that 

-# don't exist or using markup commands wrongly.

-

-WARN_IF_DOC_ERROR      = YES

-

-# This WARN_NO_PARAMDOC option can be abled to get warnings for 

-# functions that are documented, but have no documentation for their parameters 

-# or return value. If set to NO (the default) doxygen will only warn about 

-# wrong or incomplete parameter documentation, but not about the absence of 

-# documentation.

-

-WARN_NO_PARAMDOC       = NO

-

-# The WARN_FORMAT tag determines the format of the warning messages that 

-# doxygen can produce. The string should contain the $file, $line, and $text 

-# tags, which will be replaced by the file and line number from which the 

-# warning originated and the warning text. Optionally the format may contain 

-# $version, which will be replaced by the version of the file (if it could 

-# be obtained via FILE_VERSION_FILTER)

-

-WARN_FORMAT            = "$file:$line: $text"

-

-# The WARN_LOGFILE tag can be used to specify a file to which warning 

-# and error messages should be written. If left blank the output is written 

-# to stderr.

-

-WARN_LOGFILE           = 

-

-#---------------------------------------------------------------------------

-# configuration options related to the input files

-#---------------------------------------------------------------------------

-

-# The INPUT tag can be used to specify the files and/or directories that contain 

-# documented source files. You may enter file names like "myfile.cpp" or 

-# directories like "/usr/src/myproject". Separate the files or directories 

-# with spaces.

-

-INPUT                  = 

-

-# This tag can be used to specify the character encoding of the source files that 

-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 

-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 

-# See http://www.gnu.org/software/libiconv for the list of possible encodings.

-

-INPUT_ENCODING         = UTF-8

-

-# If the value of the INPUT tag contains directories, you can use the 

-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

-# and *.h) to filter out the source-files in the directories. If left 

-# blank the following patterns are tested: 

-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 

-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py

-

-FILE_PATTERNS          = 

-

-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 

-# should be searched for input files as well. Possible values are YES and NO. 

-# If left blank NO is used.

-

-RECURSIVE              = NO

-

-# The EXCLUDE tag can be used to specify files and/or directories that should 

-# excluded from the INPUT source files. This way you can easily exclude a 

-# subdirectory from a directory tree whose root is specified with the INPUT tag.

-

-EXCLUDE                = 

-

-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 

-# directories that are symbolic links (a Unix filesystem feature) are excluded 

-# from the input.

-

-EXCLUDE_SYMLINKS       = NO

-

-# If the value of the INPUT tag contains directories, you can use the 

-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 

-# certain files from those directories. Note that the wildcards are matched 

-# against the file with absolute path, so to exclude all test directories 

-# for example use the pattern */test/*

-

-EXCLUDE_PATTERNS       = 

-

-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 

-# (namespaces, classes, functions, etc.) that should be excluded from the output. 

-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 

-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test

-

-EXCLUDE_SYMBOLS        = 

-

-# The EXAMPLE_PATH tag can be used to specify one or more files or 

-# directories that contain example code fragments that are included (see 

-# the \include command).

-

-EXAMPLE_PATH           = 

-

-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 

-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

-# and *.h) to filter out the source-files in the directories. If left 

-# blank all files are included.

-

-EXAMPLE_PATTERNS       = 

-

-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 

-# searched for input files to be used with the \include or \dontinclude 

-# commands irrespective of the value of the RECURSIVE tag. 

-# Possible values are YES and NO. If left blank NO is used.

-

-EXAMPLE_RECURSIVE      = NO

-

-# The IMAGE_PATH tag can be used to specify one or more files or 

-# directories that contain image that are included in the documentation (see 

-# the \image command).

-

-IMAGE_PATH             = 

-

-# The INPUT_FILTER tag can be used to specify a program that doxygen should 

-# invoke to filter for each input file. Doxygen will invoke the filter program 

-# by executing (via popen()) the command <filter> <input-file>, where <filter> 

-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 

-# input file. Doxygen will then use the output that the filter program writes 

-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 

-# ignored.

-

-INPUT_FILTER           = 

-

-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 

-# basis.  Doxygen will compare the file name with each pattern and apply the 

-# filter if there is a match.  The filters are a list of the form: 

-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 

-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 

-# is applied to all files.

-

-FILTER_PATTERNS        = 

-

-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 

-# INPUT_FILTER) will be used to filter the input files when producing source 

-# files to browse (i.e. when SOURCE_BROWSER is set to YES).

-

-FILTER_SOURCE_FILES    = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to source browsing

-#---------------------------------------------------------------------------

-

-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 

-# be generated. Documented entities will be cross-referenced with these sources. 

-# Note: To get rid of all source code in the generated output, make sure also 

-# VERBATIM_HEADERS is set to NO.

-

-SOURCE_BROWSER         = NO

-

-# Setting the INLINE_SOURCES tag to YES will include the body 

-# of functions and classes directly in the documentation.

-

-INLINE_SOURCES         = NO

-

-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 

-# doxygen to hide any special comment blocks from generated source code 

-# fragments. Normal C and C++ comments will always remain visible.

-

-STRIP_CODE_COMMENTS    = YES

-

-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 

-# then for each documented function all documented 

-# functions referencing it will be listed.

-

-REFERENCED_BY_RELATION = YES

-

-# If the REFERENCES_RELATION tag is set to YES (the default) 

-# then for each documented function all documented entities 

-# called/used by that function will be listed.

-

-REFERENCES_RELATION    = YES

-

-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)

-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from

-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will

-# link to the source code.  Otherwise they will link to the documentstion.

-

-REFERENCES_LINK_SOURCE = YES

-

-# If the USE_HTAGS tag is set to YES then the references to source code 

-# will point to the HTML generated by the htags(1) tool instead of doxygen 

-# built-in source browser. The htags tool is part of GNU's global source 

-# tagging system (see http://www.gnu.org/software/global/global.html). You 

-# will need version 4.8.6 or higher.

-

-USE_HTAGS              = NO

-

-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 

-# will generate a verbatim copy of the header file for each class for 

-# which an include is specified. Set to NO to disable this.

-

-VERBATIM_HEADERS       = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the alphabetical class index

-#---------------------------------------------------------------------------

-

-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 

-# of all compounds will be generated. Enable this if the project 

-# contains a lot of classes, structs, unions or interfaces.

-

-ALPHABETICAL_INDEX     = YES

-

-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 

-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 

-# in which this list will be split (can be a number in the range [1..20])

-

-COLS_IN_ALPHA_INDEX    = 5

-

-# In case all classes in a project start with a common prefix, all 

-# classes will be put under the same header in the alphabetical index. 

-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 

-# should be ignored while generating the index headers.

-

-IGNORE_PREFIX          = 

-

-#---------------------------------------------------------------------------

-# configuration options related to the HTML output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 

-# generate HTML output.

-

-GENERATE_HTML          = YES

-

-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `html' will be used as the default path.

-

-HTML_OUTPUT            = html

-

-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 

-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 

-# doxygen will generate files with .html extension.

-

-HTML_FILE_EXTENSION    = .html

-

-# The HTML_HEADER tag can be used to specify a personal HTML header for 

-# each generated HTML page. If it is left blank doxygen will generate a 

-# standard header.

-

-HTML_HEADER            = header.html

-

-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 

-# each generated HTML page. If it is left blank doxygen will generate a 

-# standard footer.

-

-HTML_FOOTER            = footer.html

-

-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 

-# style sheet that is used by each HTML page. It can be used to 

-# fine-tune the look of the HTML output. If the tag is left blank doxygen 

-# will generate a default style sheet. Note that doxygen will try to copy 

-# the style sheet file to the HTML output directory, so don't put your own 

-# stylesheet in the HTML output directory as well, or it will be erased!

-

-HTML_STYLESHEET        = stylesheet.css

-

-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 

-# files or namespaces will be aligned in HTML using tables. If set to 

-# NO a bullet list will be used.

-

-HTML_ALIGN_MEMBERS     = YES

-

-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 

-# will be generated that can be used as input for tools like the 

-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 

-# of the generated HTML documentation.

-

-GENERATE_HTMLHELP      = YES

-

-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 

-# be used to specify the file name of the resulting .chm file. You 

-# can add a path in front of the file if the result should not be 

-# written to the html output directory.

-

-CHM_FILE               = 

-

-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 

-# be used to specify the location (absolute path including file name) of 

-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 

-# the HTML help compiler on the generated index.hhp.

-

-HHC_LOCATION           = 

-

-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 

-# controls if a separate .chi index file is generated (YES) or that 

-# it should be included in the master .chm file (NO).

-

-GENERATE_CHI           = NO

-

-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 

-# controls whether a binary table of contents is generated (YES) or a 

-# normal table of contents (NO) in the .chm file.

-

-BINARY_TOC             = NO

-

-# The TOC_EXPAND flag can be set to YES to add extra items for group members 

-# to the contents of the HTML help documentation and to the tree view.

-

-TOC_EXPAND             = YES

-

-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 

-# top of each HTML page. The value NO (the default) enables the index and 

-# the value YES disables it.

-

-DISABLE_INDEX          = NO

-

-# This tag can be used to set the number of enum values (range [1..20]) 

-# that doxygen will group on one line in the generated HTML documentation.

-

-ENUM_VALUES_PER_LINE   = 4

-

-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be

-# generated containing a tree-like index structure (just like the one that 

-# is generated for HTML Help). For this to work a browser that supports 

-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 

-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 

-# probably better off using the HTML help feature.

-

-GENERATE_TREEVIEW      = YES

-

-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 

-# used to set the initial width (in pixels) of the frame in which the tree 

-# is shown.

-

-TREEVIEW_WIDTH         = 250

-

-#---------------------------------------------------------------------------

-# configuration options related to the LaTeX output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 

-# generate Latex output.

-

-GENERATE_LATEX         = NO

-

-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `latex' will be used as the default path.

-

-LATEX_OUTPUT           = latex

-

-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 

-# invoked. If left blank `latex' will be used as the default command name.

-

-LATEX_CMD_NAME         = latex

-

-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 

-# generate index for LaTeX. If left blank `makeindex' will be used as the 

-# default command name.

-

-MAKEINDEX_CMD_NAME     = makeindex

-

-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 

-# LaTeX documents. This may be useful for small projects and may help to 

-# save some trees in general.

-

-COMPACT_LATEX          = NO

-

-# The PAPER_TYPE tag can be used to set the paper type that is used 

-# by the printer. Possible values are: a4, a4wide, letter, legal and 

-# executive. If left blank a4wide will be used.

-

-PAPER_TYPE             = a4wide

-

-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 

-# packages that should be included in the LaTeX output.

-

-EXTRA_PACKAGES         = 

-

-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 

-# the generated latex document. The header should contain everything until 

-# the first chapter. If it is left blank doxygen will generate a 

-# standard header. Notice: only use this tag if you know what you are doing!

-

-LATEX_HEADER           = 

-

-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 

-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 

-# contain links (just like the HTML output) instead of page references 

-# This makes the output suitable for online browsing using a pdf viewer.

-

-PDF_HYPERLINKS         = NO

-

-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 

-# plain latex in the generated Makefile. Set this option to YES to get a 

-# higher quality PDF documentation.

-

-USE_PDFLATEX           = NO

-

-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 

-# command to the generated LaTeX files. This will instruct LaTeX to keep 

-# running if errors occur, instead of asking the user for help. 

-# This option is also used when generating formulas in HTML.

-

-LATEX_BATCHMODE        = NO

-

-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 

-# include the index chapters (such as File Index, Compound Index, etc.) 

-# in the output.

-

-LATEX_HIDE_INDICES     = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the RTF output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 

-# The RTF output is optimized for Word 97 and may not look very pretty with 

-# other RTF readers or editors.

-

-GENERATE_RTF           = NO

-

-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `rtf' will be used as the default path.

-

-RTF_OUTPUT             = rtf

-

-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 

-# RTF documents. This may be useful for small projects and may help to 

-# save some trees in general.

-

-COMPACT_RTF            = NO

-

-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 

-# will contain hyperlink fields. The RTF file will 

-# contain links (just like the HTML output) instead of page references. 

-# This makes the output suitable for online browsing using WORD or other 

-# programs which support those fields. 

-# Note: wordpad (write) and others do not support links.

-

-RTF_HYPERLINKS         = NO

-

-# Load stylesheet definitions from file. Syntax is similar to doxygen's 

-# config file, i.e. a series of assignments. You only have to provide 

-# replacements, missing definitions are set to their default value.

-

-RTF_STYLESHEET_FILE    = 

-

-# Set optional variables used in the generation of an rtf document. 

-# Syntax is similar to doxygen's config file.

-

-RTF_EXTENSIONS_FILE    = 

-

-#---------------------------------------------------------------------------

-# configuration options related to the man page output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 

-# generate man pages

-

-GENERATE_MAN           = NO

-

-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `man' will be used as the default path.

-

-MAN_OUTPUT             = man

-

-# The MAN_EXTENSION tag determines the extension that is added to 

-# the generated man pages (default is the subroutine's section .3)

-

-MAN_EXTENSION          = .3

-

-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 

-# then it will generate one additional man file for each entity 

-# documented in the real man page(s). These additional files 

-# only source the real man page, but without them the man command 

-# would be unable to find the correct page. The default is NO.

-

-MAN_LINKS              = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the XML output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_XML tag is set to YES Doxygen will 

-# generate an XML file that captures the structure of 

-# the code including all documentation.

-

-GENERATE_XML           = NO

-

-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 

-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 

-# put in front of it. If left blank `xml' will be used as the default path.

-

-XML_OUTPUT             = xml

-

-# The XML_SCHEMA tag can be used to specify an XML schema, 

-# which can be used by a validating XML parser to check the 

-# syntax of the XML files.

-

-XML_SCHEMA             = 

-

-# The XML_DTD tag can be used to specify an XML DTD, 

-# which can be used by a validating XML parser to check the 

-# syntax of the XML files.

-

-XML_DTD                = 

-

-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 

-# dump the program listings (including syntax highlighting 

-# and cross-referencing information) to the XML output. Note that 

-# enabling this will significantly increase the size of the XML output.

-

-XML_PROGRAMLISTING     = YES

-

-#---------------------------------------------------------------------------

-# configuration options for the AutoGen Definitions output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 

-# generate an AutoGen Definitions (see autogen.sf.net) file 

-# that captures the structure of the code including all 

-# documentation. Note that this feature is still experimental 

-# and incomplete at the moment.

-

-GENERATE_AUTOGEN_DEF   = NO

-

-#---------------------------------------------------------------------------

-# configuration options related to the Perl module output

-#---------------------------------------------------------------------------

-

-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 

-# generate a Perl module file that captures the structure of 

-# the code including all documentation. Note that this 

-# feature is still experimental and incomplete at the 

-# moment.

-

-GENERATE_PERLMOD       = NO

-

-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 

-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 

-# to generate PDF and DVI output from the Perl module output.

-

-PERLMOD_LATEX          = NO

-

-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 

-# nicely formatted so it can be parsed by a human reader.  This is useful 

-# if you want to understand what is going on.  On the other hand, if this 

-# tag is set to NO the size of the Perl module output will be much smaller 

-# and Perl will parse it just the same.

-

-PERLMOD_PRETTY         = YES

-

-# The names of the make variables in the generated doxyrules.make file 

-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 

-# This is useful so different doxyrules.make files included by the same 

-# Makefile don't overwrite each other's variables.

-

-PERLMOD_MAKEVAR_PREFIX = 

-

-#---------------------------------------------------------------------------

-# Configuration options related to the preprocessor   

-#---------------------------------------------------------------------------

-

-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 

-# evaluate all C-preprocessor directives found in the sources and include 

-# files.

-

-ENABLE_PREPROCESSING   = YES

-

-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 

-# names in the source code. If set to NO (the default) only conditional 

-# compilation will be performed. Macro expansion can be done in a controlled 

-# way by setting EXPAND_ONLY_PREDEF to YES.

-

-MACRO_EXPANSION        = NO

-

-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 

-# then the macro expansion is limited to the macros specified with the 

-# PREDEFINED and EXPAND_AS_DEFINED tags.

-

-EXPAND_ONLY_PREDEF     = NO

-

-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 

-# in the INCLUDE_PATH (see below) will be search if a #include is found.

-

-SEARCH_INCLUDES        = YES

-

-# The INCLUDE_PATH tag can be used to specify one or more directories that 

-# contain include files that are not input files but should be processed by 

-# the preprocessor.

-

-INCLUDE_PATH           = 

-

-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 

-# patterns (like *.h and *.hpp) to filter out the header-files in the 

-# directories. If left blank, the patterns specified with FILE_PATTERNS will 

-# be used.

-

-INCLUDE_FILE_PATTERNS  = 

-

-# The PREDEFINED tag can be used to specify one or more macro names that 

-# are defined before the preprocessor is started (similar to the -D option of 

-# gcc). The argument of the tag is a list of macros of the form: name 

-# or name=definition (no spaces). If the definition and the = are 

-# omitted =1 is assumed. To prevent a macro definition from being 

-# undefined via #undef or recursively expanded use the := operator 

-# instead of the = operator.

-

-PREDEFINED             = _WIN32 \

-                         UNICODE \

-                         _UNICODE

-

-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 

-# this tag can be used to specify a list of macro names that should be expanded. 

-# The macro definition that is found in the sources will be used. 

-# Use the PREDEFINED tag if you want to use a different macro definition.

-

-EXPAND_AS_DEFINED      = 

-

-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 

-# doxygen's preprocessor will remove all function-like macros that are alone 

-# on a line, have an all uppercase name, and do not end with a semicolon. Such 

-# function macros are typically used for boiler-plate code, and will confuse 

-# the parser if not removed.

-

-SKIP_FUNCTION_MACROS   = YES

-

-#---------------------------------------------------------------------------

-# Configuration::additions related to external references   

-#---------------------------------------------------------------------------

-

-# The TAGFILES option can be used to specify one or more tagfiles. 

-# Optionally an initial location of the external documentation 

-# can be added for each tagfile. The format of a tag file without 

-# this location is as follows: 

-#   TAGFILES = file1 file2 ... 

-# Adding location for the tag files is done as follows: 

-#   TAGFILES = file1=loc1 "file2 = loc2" ... 

-# where "loc1" and "loc2" can be relative or absolute paths or 

-# URLs. If a location is present for each tag, the installdox tool 

-# does not have to be run to correct the links.

-# Note that each tag file must have a unique name

-# (where the name does NOT include the path)

-# If a tag file is not located in the directory in which doxygen 

-# is run, you must also specify the path to the tagfile here.

-

-TAGFILES               = 

-

-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 

-# a tag file that is based on the input files it reads.

-

-GENERATE_TAGFILE       = 

-

-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 

-# in the class index. If set to NO only the inherited external classes 

-# will be listed.

-

-ALLEXTERNALS           = NO

-

-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 

-# in the modules index. If set to NO, only the current project's groups will 

-# be listed.

-

-EXTERNAL_GROUPS        = YES

-

-# The PERL_PATH should be the absolute path and name of the perl script 

-# interpreter (i.e. the result of `which perl').

-

-PERL_PATH              = /usr/bin/perl

-

-#---------------------------------------------------------------------------

-# Configuration options related to the dot tool   

-#---------------------------------------------------------------------------

-

-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 

-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 

-# or super classes. Setting the tag to NO turns the diagrams off. Note that 

-# this option is superseded by the HAVE_DOT option below. This is only a 

-# fallback. It is recommended to install and use dot, since it yields more 

-# powerful graphs.

-

-CLASS_DIAGRAMS         = YES

-

-# You can define message sequence charts within doxygen comments using the \msc 

-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 

-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 

-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 

-# be found in the default search path.

-

-MSCGEN_PATH            = 

-

-# If set to YES, the inheritance and collaboration graphs will hide 

-# inheritance and usage relations if the target is undocumented 

-# or is not a class.

-

-HIDE_UNDOC_RELATIONS   = YES

-

-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 

-# available from the path. This tool is part of Graphviz, a graph visualization 

-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 

-# have no effect if this option is set to NO (the default)

-

-HAVE_DOT               = NO

-

-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 

-# will generate a graph for each documented class showing the direct and 

-# indirect inheritance relations. Setting this tag to YES will force the 

-# the CLASS_DIAGRAMS tag to NO.

-

-CLASS_GRAPH            = YES

-

-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 

-# will generate a graph for each documented class showing the direct and 

-# indirect implementation dependencies (inheritance, containment, and 

-# class references variables) of the class with other documented classes.

-

-COLLABORATION_GRAPH    = YES

-

-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 

-# will generate a graph for groups, showing the direct groups dependencies

-

-GROUP_GRAPHS           = YES

-

-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 

-# collaboration diagrams in a style similar to the OMG's Unified Modeling 

-# Language.

-

-UML_LOOK               = NO

-

-# If set to YES, the inheritance and collaboration graphs will show the 

-# relations between templates and their instances.

-

-TEMPLATE_RELATIONS     = YES

-

-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 

-# tags are set to YES then doxygen will generate a graph for each documented 

-# file showing the direct and indirect include dependencies of the file with 

-# other documented files.

-

-INCLUDE_GRAPH          = YES

-

-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 

-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 

-# documented header file showing the documented files that directly or 

-# indirectly include this file.

-

-INCLUDED_BY_GRAPH      = YES

-

-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 

-# generate a call dependency graph for every global function or class method. 

-# Note that enabling this option will significantly increase the time of a run. 

-# So in most cases it will be better to enable call graphs for selected 

-# functions only using the \callgraph command.

-

-CALL_GRAPH             = NO

-

-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 

-# generate a caller dependency graph for every global function or class method. 

-# Note that enabling this option will significantly increase the time of a run. 

-# So in most cases it will be better to enable caller graphs for selected 

-# functions only using the \callergraph command.

-

-CALLER_GRAPH           = NO

-

-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 

-# will graphical hierarchy of all classes instead of a textual one.

-

-GRAPHICAL_HIERARCHY    = YES

-

-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 

-# then doxygen will show the dependencies a directory has on other directories 

-# in a graphical way. The dependency relations are determined by the #include

-# relations between the files in the directories.

-

-DIRECTORY_GRAPH        = YES

-

-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 

-# generated by dot. Possible values are png, jpg, or gif

-# If left blank png will be used.

-

-DOT_IMAGE_FORMAT       = png

-

-# The tag DOT_PATH can be used to specify the path where the dot tool can be 

-# found. If left blank, it is assumed the dot tool can be found in the path.

-

-DOT_PATH               = 

-

-# The DOTFILE_DIRS tag can be used to specify one or more directories that 

-# contain dot files that are included in the documentation (see the 

-# \dotfile command).

-

-DOTFILE_DIRS           = 

-

-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 

-# nodes that will be shown in the graph. If the number of nodes in a graph 

-# becomes larger than this value, doxygen will truncate the graph, which is 

-# visualized by representing a node as a red box. Note that doxygen will always 

-# show the root nodes and its direct children regardless of this setting.

-

-DOT_GRAPH_MAX_NODES    = 50

-

-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 

-# background. This is disabled by default, which results in a white background. 

-# Warning: Depending on the platform used, enabling this option may lead to 

-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 

-# read).

-

-DOT_TRANSPARENT        = NO

-

-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 

-# files in one run (i.e. multiple -o and -T options on the command line). This 

-# makes dot run faster, but since only newer versions of dot (>1.8.10) 

-# support this, this feature is disabled by default.

-

-DOT_MULTI_TARGETS      = NO

-

-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 

-# generate a legend page explaining the meaning of the various boxes and 

-# arrows in the dot generated graphs.

-

-GENERATE_LEGEND        = YES

-

-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 

-# remove the intermediate dot files that are used to generate 

-# the various graphs.

-

-DOT_CLEANUP            = YES

-

-#---------------------------------------------------------------------------

-# Configuration::additions related to the search engine   

-#---------------------------------------------------------------------------

-

-# The SEARCHENGINE tag specifies whether or not a search engine should be 

-# used. If set to NO the values of all tags below this one will be ignored.

-

-SEARCHENGINE           = NO

+# Doxyfile 1.5.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file that 
+# follow. The default is UTF-8 which is also the encoding used for all text before 
+# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into 
+# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of 
+# possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "Network Identity Manager"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, 
+# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, 
+# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, 
+# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = 
+
+# This tag can be used to specify the character encoding of the source files that 
+# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
+# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. 
+# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+
+FILE_PATTERNS          = 
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the output. 
+# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, 
+# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = header.html
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = footer.html
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = stylesheet.css
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = YES
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = _WIN32 \
+                         UNICODE \
+                         _UNICODE
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
+# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to 
+# specify the directory where the mscgen tool resides. If left empty the tool is assumed to 
+# be found in the default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a caller dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable caller graphs for selected 
+# functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen will always 
+# show the root nodes and its direct children regardless of this setting.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/src/windows/identity/doc/footer.html b/src/windows/identity/doc/footer.html
index c46b93960..6383e6a57 100644
--- a/src/windows/identity/doc/footer.html
+++ b/src/windows/identity/doc/footer.html
@@ -1,21 +1,21 @@
-<hr size="1">

-

-<table width="100%" border="0">

-  <tr>

-    <td>

-      <address style="align:right;">

-        <small>Generated on $datetime for $projectname $projectnumber by&nbsp;<a href="http://www.doxygen.org/index.html">Doxygen</a> $doxygenversion<br>

-	&copy; 2004-2007 Massachusetts Institute of Technology.<br>

-        &copy; 2005-2007 Secure Endpoints Inc.<br>

-        Contact <a href="mailto:khimaira@mit.edu">khimaira@mit.edu</a><br>

-	</small>

-      </address>

-    </td>

-    <td width="100" align="right">

-      <img src="khimaira_logo_small.png" border="0">

-    </td>

-  </tr>

-</table>

-

-</body>

-</html>

+<hr size="1">
+
+<table width="100%" border="0">
+  <tr>
+    <td>
+      <address style="align:right;">
+        <small>Generated on $datetime for $projectname $projectnumber by&nbsp;<a href="http://www.doxygen.org/index.html">Doxygen</a> $doxygenversion<br>
+	&copy; 2004-2007 Massachusetts Institute of Technology.<br>
+        &copy; 2005-2007 Secure Endpoints Inc.<br>
+        Contact <a href="mailto:khimaira@mit.edu">khimaira@mit.edu</a><br>
+	</small>
+      </address>
+    </td>
+    <td width="100" align="right">
+      <img src="khimaira_logo_small.png" border="0">
+    </td>
+  </tr>
+</table>
+
+</body>
+</html>
diff --git a/src/windows/identity/doc/header.html b/src/windows/identity/doc/header.html
index d696ed5bb..b85d6a1e7 100644
--- a/src/windows/identity/doc/header.html
+++ b/src/windows/identity/doc/header.html
@@ -1,6 +1,6 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">

-<title>$title</title>

-<link href="$relpath$stylesheet.css" rel="stylesheet" type="text/css">

-<link href="$relpath$tabs.css" rel="stylesheet" type="text/css">

-</head><body>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>$title</title>
+<link href="$relpath$stylesheet.css" rel="stylesheet" type="text/css">
+<link href="$relpath$tabs.css" rel="stylesheet" type="text/css">
+</head><body>
diff --git a/src/windows/identity/doc/stylesheet.css b/src/windows/identity/doc/stylesheet.css
index d5af4e91c..f1183ee37 100644
--- a/src/windows/identity/doc/stylesheet.css
+++ b/src/windows/identity/doc/stylesheet.css
@@ -1,387 +1,387 @@
-BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {

-	font-family: Geneva, Arial, Helvetica, sans-serif;

-}

-BODY,TD {

-       font-size: 90%;

-}

-H1 {

-	text-align: center;

-        font-size: 160%;

-        border-bottom: 1px solid #88b7c8;

-        margin-bottom: 1em;

-        padding-top: 0.5em;

-        padding-bottom: 0.5em;

-        background-color: #e8eef2;

-}

-H2 {

-        margin-top: 1em;

-        font-size: 120%;

-        padding: 0.5em;

-        background-color: #f0f0f0;

-        border-bottom: 1px solid #888888;

-}

-H3 {

-       font-size: 100%;

-}

-

-H4 {

-       font-size: 100%;

-}

-

-CAPTION { font-weight: bold }

-DIV.qindex {

-	width: 100%;

-	background-color: #e8eef2;

-	border: 1px solid #84b0c7;

-	text-align: center;

-	margin: 2px;

-	padding: 2px;

-	line-height: 140%;

-}

-DIV.nav {

-	width: 100%;

-	background-color: #e8eef2;

-	border: 1px solid #84b0c7;

-	text-align: center;

-	margin: 2px;

-	padding: 2px;

-	line-height: 140%;

-}

-DIV.navtab {

-       background-color: #e8eef2;

-       border: 1px solid #84b0c7;

-       text-align: center;

-       margin: 2px;

-       margin-right: 15px;

-       padding: 2px;

-}

-TD.navtab {

-       font-size: 70%;

-}

-A.qindex {

-       text-decoration: none;

-       font-weight: bold;

-       color: #1A419D;

-}

-A.qindex:visited {

-       text-decoration: none;

-       font-weight: bold;

-       color: #1A419D

-}

-A.qindex:hover {

-	text-decoration: none;

-	background-color: #ddddff;

-}

-A.qindexHL {

-	text-decoration: none;

-	font-weight: bold;

-	background-color: #6666cc;

-	color: #ffffff;

-	border: 1px double #9295C2;

-}

-A.qindexHL:hover {

-	text-decoration: none;

-	background-color: #6666cc;

-	color: #ffffff;

-}

-A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }

-A.el { text-decoration: none; font-weight: bold }

-A.elRef { font-weight: bold }

-A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}

-A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}

-A.codeRef:link { font-weight: normal; color: #0000FF}

-A.codeRef:visited { font-weight: normal; color: #0000FF}

-A:hover { text-decoration: none; background-color: #f2f2ff }

-DL.el { margin-left: -1cm }

-.fragment {

-       font-family: monospace, fixed;

-       font-size: 95%;

-}

-PRE.fragment {

-	border: 1px solid #CCCCCC;

-	background-color: #f5f5f5;

-	margin-top: 4px;

-	margin-bottom: 4px;

-	margin-left: 2px;

-	margin-right: 8px;

-	padding-left: 6px;

-	padding-right: 6px;

-	padding-top: 4px;

-	padding-bottom: 4px;

-}

-DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }

-

-DIV.groupHeader {

-       margin-left: 16px;

-       margin-top: 12px;

-       margin-bottom: 6px;

-       font-weight: bold;

-}

-DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% }

-BODY {

-	background: white;

-	color: black;

-	margin-right: 20px;

-	margin-left: 20px;

-}

-TD.indexkey {

-	background-color: #e8eef2;

-	font-weight: bold;

-	padding-right  : 10px;

-	padding-top    : 2px;

-	padding-left   : 10px;

-	padding-bottom : 2px;

-	margin-left    : 0px;

-	margin-right   : 0px;

-	margin-top     : 2px;

-	margin-bottom  : 2px;

-	border: 1px solid #CCCCCC;

-}

-TD.indexvalue {

-	background-color: #e8eef2;

-	font-style: italic;

-	padding-right  : 10px;

-	padding-top    : 2px;

-	padding-left   : 10px;

-	padding-bottom : 2px;

-	margin-left    : 0px;

-	margin-right   : 0px;

-	margin-top     : 2px;

-	margin-bottom  : 2px;

-	border: 1px solid #CCCCCC;

-}

-TR.memlist {

-   background-color: #f0f0f0; 

-}

-P.formulaDsp { text-align: center; }

-IMG.formulaDsp { }

-IMG.formulaInl { vertical-align: middle; }

-SPAN.keyword       { color: #008000 }

-SPAN.keywordtype   { color: #604020 }

-SPAN.keywordflow   { color: #e08000 }

-SPAN.comment       { color: #800000 }

-SPAN.preprocessor  { color: #806020 }

-SPAN.stringliteral { color: #002080 }

-SPAN.charliteral   { color: #008080 }

-.mdescLeft {

-       padding: 0px 8px 4px 8px;

-	font-size: 80%;

-	font-style: italic;

-	background-color: #FAFAFA;

-	border-top: 1px none #E0E0E0;

-	border-right: 1px none #E0E0E0;

-	border-bottom: 1px none #E0E0E0;

-	border-left: 1px none #E0E0E0;

-	margin: 0px;

-}

-.mdescRight {

-       padding: 0px 8px 4px 8px;

-	font-size: 80%;

-	font-style: italic;

-	background-color: #FAFAFA;

-	border-top: 1px none #E0E0E0;

-	border-right: 1px none #E0E0E0;

-	border-bottom: 1px none #E0E0E0;

-	border-left: 1px none #E0E0E0;

-	margin: 0px;

-}

-.memItemLeft {

-	padding: 1px 0px 0px 8px;

-	margin: 4px;

-	border-top-width: 1px;

-	border-right-width: 1px;

-	border-bottom-width: 1px;

-	border-left-width: 1px;

-	border-top-color: #E0E0E0;

-	border-right-color: #E0E0E0;

-	border-bottom-color: #E0E0E0;

-	border-left-color: #E0E0E0;

-	border-top-style: solid;

-	border-right-style: none;

-	border-bottom-style: none;

-	border-left-style: none;

-	background-color: #FAFAFA;

-	font-size: 80%;

-}

-.memItemRight {

-	padding: 1px 8px 0px 8px;

-	margin: 4px;

-	border-top-width: 1px;

-	border-right-width: 1px;

-	border-bottom-width: 1px;

-	border-left-width: 1px;

-	border-top-color: #E0E0E0;

-	border-right-color: #E0E0E0;

-	border-bottom-color: #E0E0E0;

-	border-left-color: #E0E0E0;

-	border-top-style: solid;

-	border-right-style: none;

-	border-bottom-style: none;

-	border-left-style: none;

-	background-color: #FAFAFA;

-	font-size: 80%;

-}

-.memTemplItemLeft {

-	padding: 1px 0px 0px 8px;

-	margin: 4px;

-	border-top-width: 1px;

-	border-right-width: 1px;

-	border-bottom-width: 1px;

-	border-left-width: 1px;

-	border-top-color: #E0E0E0;

-	border-right-color: #E0E0E0;

-	border-bottom-color: #E0E0E0;

-	border-left-color: #E0E0E0;

-	border-top-style: none;

-	border-right-style: none;

-	border-bottom-style: none;

-	border-left-style: none;

-	background-color: #FAFAFA;

-	font-size: 80%;

-}

-.memTemplItemRight {

-	padding: 1px 8px 0px 8px;

-	margin: 4px;

-	border-top-width: 1px;

-	border-right-width: 1px;

-	border-bottom-width: 1px;

-	border-left-width: 1px;

-	border-top-color: #E0E0E0;

-	border-right-color: #E0E0E0;

-	border-bottom-color: #E0E0E0;

-	border-left-color: #E0E0E0;

-	border-top-style: none;

-	border-right-style: none;

-	border-bottom-style: none;

-	border-left-style: none;

-	background-color: #FAFAFA;

-	font-size: 80%;

-}

-.memTemplParams {

-	padding: 1px 0px 0px 8px;

-	margin: 4px;

-	border-top-width: 1px;

-	border-right-width: 1px;

-	border-bottom-width: 1px;

-	border-left-width: 1px;

-	border-top-color: #E0E0E0;

-	border-right-color: #E0E0E0;

-	border-bottom-color: #E0E0E0;

-	border-left-color: #E0E0E0;

-	border-top-style: solid;

-	border-right-style: none;

-	border-bottom-style: none;

-	border-left-style: none;

-       color: #606060;

-	background-color: #FAFAFA;

-	font-size: 80%;

-}

-.search     { color: #003399;

-              font-weight: bold;

-}

-FORM.search {

-              margin-bottom: 0px;

-              margin-top: 0px;

-}

-INPUT.search { font-size: 75%;

-               color: #000080;

-               font-weight: normal;

-               background-color: #e8eef2;

-}

-TD.tiny      { font-size: 75%;

-}

-a {

-	color: #1A41A8;

-}

-a:visited {

-	color: #2A3798;

-}

-.dirtab { padding: 4px;

-          border-collapse: collapse;

-          border: 1px solid #84b0c7;

-}

-TH.dirtab { background: #e8eef2;

-            font-weight: bold;

-}

-HR { height: 1px;

-     border: none;

-     border-top: 1px solid black;

-     border-color: #88b7c8;

-}

-

-/* Style for detailed member documentation */

-.memtemplate {

-  font-size: 80%;

-  color: #606060;

-  font-weight: normal;

-} 

-.memnav { 

-  background-color: #e8eef2;

-  border: 1px solid #84b0c7;

-  text-align: center;

-  margin: 2px;

-  margin-right: 15px;

-  padding: 2px;

-}

-.memitem {

-  padding: 4px;

-  background-color: #eef3f5;

-  border-width: 1px;

-  border-style: solid;

-  border-color: #dedeee;

-  -moz-border-radius: 8px 8px 8px 8px;

-}

-.memname {

-  white-space: nowrap;

-  font-weight: bold;

-}

-.memdoc{

-  padding-left: 10px;

-}

-.memproto {

-  background-color: #d5e1e8;

-  width: 100%;

-  border-width: 1px;

-  border-style: solid;

-  border-color: #84b0c7;

-  font-weight: bold;

-  -moz-border-radius: 8px 8px 8px 8px;

-}

-.paramkey {

-  text-align: right;

-}

-.paramtype {

-  white-space: nowrap;

-}

-.paramname {

-  color: #602020;

-  font-style: italic;

-  white-space: nowrap;

-}

-/* End Styling for detailed member documentation */

-

-/* for the tree view */

-.ftvtree {

-	font-family: sans-serif;

-	margin:0.5em;

-}

-.directory { font-size: 9pt; font-weight: bold; }

-.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }

-.directory > h3 { margin-top: 0; }

-.directory p { margin: 0px; white-space: nowrap; }

-.directory div { display: none; margin: 0px; }

-.directory img { vertical-align: -30%; }

-

-DL.note {

-  background-color: #eeeeee;

-  width: 100%;

-  border-width: 1px;

-  border-style: solid;

-  border-color: #bbbbbb;

-  -moz-border-radius: 4px 4px 4px 4px;

-}

-

-DL.note DT {

-  font-size: 75%;

-}

-

+BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
+	font-family: Geneva, Arial, Helvetica, sans-serif;
+}
+BODY,TD {
+       font-size: 90%;
+}
+H1 {
+	text-align: center;
+        font-size: 160%;
+        border-bottom: 1px solid #88b7c8;
+        margin-bottom: 1em;
+        padding-top: 0.5em;
+        padding-bottom: 0.5em;
+        background-color: #e8eef2;
+}
+H2 {
+        margin-top: 1em;
+        font-size: 120%;
+        padding: 0.5em;
+        background-color: #f0f0f0;
+        border-bottom: 1px solid #888888;
+}
+H3 {
+       font-size: 100%;
+}
+
+H4 {
+       font-size: 100%;
+}
+
+CAPTION { font-weight: bold }
+DIV.qindex {
+	width: 100%;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
+	text-align: center;
+	margin: 2px;
+	padding: 2px;
+	line-height: 140%;
+}
+DIV.nav {
+	width: 100%;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
+	text-align: center;
+	margin: 2px;
+	padding: 2px;
+	line-height: 140%;
+}
+DIV.navtab {
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
+       text-align: center;
+       margin: 2px;
+       margin-right: 15px;
+       padding: 2px;
+}
+TD.navtab {
+       font-size: 70%;
+}
+A.qindex {
+       text-decoration: none;
+       font-weight: bold;
+       color: #1A419D;
+}
+A.qindex:visited {
+       text-decoration: none;
+       font-weight: bold;
+       color: #1A419D
+}
+A.qindex:hover {
+	text-decoration: none;
+	background-color: #ddddff;
+}
+A.qindexHL {
+	text-decoration: none;
+	font-weight: bold;
+	background-color: #6666cc;
+	color: #ffffff;
+	border: 1px double #9295C2;
+}
+A.qindexHL:hover {
+	text-decoration: none;
+	background-color: #6666cc;
+	color: #ffffff;
+}
+A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
+A.el { text-decoration: none; font-weight: bold }
+A.elRef { font-weight: bold }
+A.code:link { text-decoration: none; font-weight: normal; color: #0000FF}
+A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF}
+A.codeRef:link { font-weight: normal; color: #0000FF}
+A.codeRef:visited { font-weight: normal; color: #0000FF}
+A:hover { text-decoration: none; background-color: #f2f2ff }
+DL.el { margin-left: -1cm }
+.fragment {
+       font-family: monospace, fixed;
+       font-size: 95%;
+}
+PRE.fragment {
+	border: 1px solid #CCCCCC;
+	background-color: #f5f5f5;
+	margin-top: 4px;
+	margin-bottom: 4px;
+	margin-left: 2px;
+	margin-right: 8px;
+	padding-left: 6px;
+	padding-right: 6px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
+
+DIV.groupHeader {
+       margin-left: 16px;
+       margin-top: 12px;
+       margin-bottom: 6px;
+       font-weight: bold;
+}
+DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% }
+BODY {
+	background: white;
+	color: black;
+	margin-right: 20px;
+	margin-left: 20px;
+}
+TD.indexkey {
+	background-color: #e8eef2;
+	font-weight: bold;
+	padding-right  : 10px;
+	padding-top    : 2px;
+	padding-left   : 10px;
+	padding-bottom : 2px;
+	margin-left    : 0px;
+	margin-right   : 0px;
+	margin-top     : 2px;
+	margin-bottom  : 2px;
+	border: 1px solid #CCCCCC;
+}
+TD.indexvalue {
+	background-color: #e8eef2;
+	font-style: italic;
+	padding-right  : 10px;
+	padding-top    : 2px;
+	padding-left   : 10px;
+	padding-bottom : 2px;
+	margin-left    : 0px;
+	margin-right   : 0px;
+	margin-top     : 2px;
+	margin-bottom  : 2px;
+	border: 1px solid #CCCCCC;
+}
+TR.memlist {
+   background-color: #f0f0f0; 
+}
+P.formulaDsp { text-align: center; }
+IMG.formulaDsp { }
+IMG.formulaInl { vertical-align: middle; }
+SPAN.keyword       { color: #008000 }
+SPAN.keywordtype   { color: #604020 }
+SPAN.keywordflow   { color: #e08000 }
+SPAN.comment       { color: #800000 }
+SPAN.preprocessor  { color: #806020 }
+SPAN.stringliteral { color: #002080 }
+SPAN.charliteral   { color: #008080 }
+.mdescLeft {
+       padding: 0px 8px 4px 8px;
+	font-size: 80%;
+	font-style: italic;
+	background-color: #FAFAFA;
+	border-top: 1px none #E0E0E0;
+	border-right: 1px none #E0E0E0;
+	border-bottom: 1px none #E0E0E0;
+	border-left: 1px none #E0E0E0;
+	margin: 0px;
+}
+.mdescRight {
+       padding: 0px 8px 4px 8px;
+	font-size: 80%;
+	font-style: italic;
+	background-color: #FAFAFA;
+	border-top: 1px none #E0E0E0;
+	border-right: 1px none #E0E0E0;
+	border-bottom: 1px none #E0E0E0;
+	border-left: 1px none #E0E0E0;
+	margin: 0px;
+}
+.memItemLeft {
+	padding: 1px 0px 0px 8px;
+	margin: 4px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-color: #E0E0E0;
+	border-right-color: #E0E0E0;
+	border-bottom-color: #E0E0E0;
+	border-left-color: #E0E0E0;
+	border-top-style: solid;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+	background-color: #FAFAFA;
+	font-size: 80%;
+}
+.memItemRight {
+	padding: 1px 8px 0px 8px;
+	margin: 4px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-color: #E0E0E0;
+	border-right-color: #E0E0E0;
+	border-bottom-color: #E0E0E0;
+	border-left-color: #E0E0E0;
+	border-top-style: solid;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+	background-color: #FAFAFA;
+	font-size: 80%;
+}
+.memTemplItemLeft {
+	padding: 1px 0px 0px 8px;
+	margin: 4px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-color: #E0E0E0;
+	border-right-color: #E0E0E0;
+	border-bottom-color: #E0E0E0;
+	border-left-color: #E0E0E0;
+	border-top-style: none;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+	background-color: #FAFAFA;
+	font-size: 80%;
+}
+.memTemplItemRight {
+	padding: 1px 8px 0px 8px;
+	margin: 4px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-color: #E0E0E0;
+	border-right-color: #E0E0E0;
+	border-bottom-color: #E0E0E0;
+	border-left-color: #E0E0E0;
+	border-top-style: none;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+	background-color: #FAFAFA;
+	font-size: 80%;
+}
+.memTemplParams {
+	padding: 1px 0px 0px 8px;
+	margin: 4px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-color: #E0E0E0;
+	border-right-color: #E0E0E0;
+	border-bottom-color: #E0E0E0;
+	border-left-color: #E0E0E0;
+	border-top-style: solid;
+	border-right-style: none;
+	border-bottom-style: none;
+	border-left-style: none;
+       color: #606060;
+	background-color: #FAFAFA;
+	font-size: 80%;
+}
+.search     { color: #003399;
+              font-weight: bold;
+}
+FORM.search {
+              margin-bottom: 0px;
+              margin-top: 0px;
+}
+INPUT.search { font-size: 75%;
+               color: #000080;
+               font-weight: normal;
+               background-color: #e8eef2;
+}
+TD.tiny      { font-size: 75%;
+}
+a {
+	color: #1A41A8;
+}
+a:visited {
+	color: #2A3798;
+}
+.dirtab { padding: 4px;
+          border-collapse: collapse;
+          border: 1px solid #84b0c7;
+}
+TH.dirtab { background: #e8eef2;
+            font-weight: bold;
+}
+HR { height: 1px;
+     border: none;
+     border-top: 1px solid black;
+     border-color: #88b7c8;
+}
+
+/* Style for detailed member documentation */
+.memtemplate {
+  font-size: 80%;
+  color: #606060;
+  font-weight: normal;
+} 
+.memnav { 
+  background-color: #e8eef2;
+  border: 1px solid #84b0c7;
+  text-align: center;
+  margin: 2px;
+  margin-right: 15px;
+  padding: 2px;
+}
+.memitem {
+  padding: 4px;
+  background-color: #eef3f5;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #dedeee;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.memname {
+  white-space: nowrap;
+  font-weight: bold;
+}
+.memdoc{
+  padding-left: 10px;
+}
+.memproto {
+  background-color: #d5e1e8;
+  width: 100%;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #84b0c7;
+  font-weight: bold;
+  -moz-border-radius: 8px 8px 8px 8px;
+}
+.paramkey {
+  text-align: right;
+}
+.paramtype {
+  white-space: nowrap;
+}
+.paramname {
+  color: #602020;
+  font-style: italic;
+  white-space: nowrap;
+}
+/* End Styling for detailed member documentation */
+
+/* for the tree view */
+.ftvtree {
+	font-family: sans-serif;
+	margin:0.5em;
+}
+.directory { font-size: 9pt; font-weight: bold; }
+.directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; }
+.directory > h3 { margin-top: 0; }
+.directory p { margin: 0px; white-space: nowrap; }
+.directory div { display: none; margin: 0px; }
+.directory img { vertical-align: -30%; }
+
+DL.note {
+  background-color: #eeeeee;
+  width: 100%;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #bbbbbb;
+  -moz-border-radius: 4px 4px 4px 4px;
+}
+
+DL.note DT {
+  font-size: 75%;
+}
+
diff --git a/src/windows/identity/help/Index.hhk b/src/windows/identity/help/Index.hhk
index 2e24f6f3e..c0ba08a9a 100644
--- a/src/windows/identity/help/Index.hhk
+++ b/src/windows/identity/help/Index.hhk
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

-<HTML>

-<HEAD>

-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">

-<!-- Sitemap 1.0 -->

-</HEAD><BODY>

-<UL>

-</UL>

-</BODY></HTML>

+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<UL>
+</UL>
+</BODY></HTML>
diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile
index e8e435f6c..8838bbd0d 100644
--- a/src/windows/identity/help/Makefile
+++ b/src/windows/identity/help/Makefile
@@ -1,41 +1,41 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=help

-!include <..\config\Makefile.w32>

-

-CHMFILE=$(BINDIR)\netidmgr.chm

-

-INCFILES=$(INCDIR)\khhelp.h

-

-all: mkdirs $(CHMFILE) $(INCFILES)

-

-$(CHMFILE): netidmgr.hhp

-	-$(HHC) netidmgr.hhp

-	$(CP) netidmgr.chm $(CHMFILE)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

-	if exist netidmgr.chm $(RM) netidmgr.chm

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=help
+!include <..\config\Makefile.w32>
+
+CHMFILE=$(BINDIR)\netidmgr.chm
+
+INCFILES=$(INCDIR)\khhelp.h
+
+all: mkdirs $(CHMFILE) $(INCFILES)
+
+$(CHMFILE): netidmgr.hhp
+	-$(HHC) netidmgr.hhp
+	$(CP) netidmgr.chm $(CHMFILE)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)
+	if exist netidmgr.chm $(RM) netidmgr.chm
diff --git a/src/windows/identity/help/html/about_netidmgr.htm b/src/windows/identity/help/html/about_netidmgr.htm
index d6fec057b..14c0e2020 100644
--- a/src/windows/identity/help/html/about_netidmgr.htm
+++ b/src/windows/identity/help/html/about_netidmgr.htm
@@ -1,68 +1,68 @@
-<html>

-<head>

-  <title>About Network Identity Manager</title>

-  <meta name="description" content="About NetIDMgr">

-  <meta name="keywords" content="">

-  <link rel="stylesheet" type="text/css" href="nidmgr.css">

-</head>

-<body>

-

-<h1>About Network Identity Manager</h1>

-

-<p>

-This is strictly an informative page about the origins of Network

-Identity Manager.

-</p>

-

-<h3>In the beginning</h3>

-

-<p>

-Network Identity Manager was conceived as an identity management

-solution to make up for the shortcomings of Leash32 (distributed with

-MIT Kerberos for Windows) and AFSCreds (distributed with OpenAFS).

-</p>

-

-<p>

-The work started as Unified Credentials Manager, a final project for

-the MIT course 6.831 : User Interface Design and Implementation,

-taught by <a href="http://people.csail.mit.edu/rcm/">Professor Rob

-Miller</a>.  By the time actual code was written, it was named

-Khimaira (which was later changed to Network Identity Manager around

-October, 2005).  Traces of the name Khimaira might still exist in the

-source code.

-</p>

-

-<p>

-Khimaira was presented at the <a

-href="http://www.pmw.org/afsbpw05/">AFS and Kerberos Best Practices

-Workshop 2005</a>.  The slides can be found on the workshop website and <a

-href="http://web.mit.edu/asanka/www/misc.shtml">here</a>.

-</p>

-

-<p>

-The work on Network Identity Manager was supported by <a

-href="http://web.mit.edu">MIT</a> <a

-href="http://web.mit.edu/ist/">Information Services and

-Technology</a>, <a href="http://www.jpl.nasa.gov">NASA Jet Propulsion Laboratory</a>,

-and <a href="http://www.secure-endpoints.com">Secure Endpoints Inc.</a>.

-</p>

-

-<h3>Design</h3>

-

-<p>

-A plugin based architecture was chosen so that support for additional

-credential types and features could be added without making changes to

-the mainline code.  In addition to making the application easily

-extensible, this also allows the AFS plugin to be maintained within

-the OpenAFS code base and separates the code supporting Kerberos 5 and

-Kerberos 4.  Furthermore, it is anticipated that this would encourage

-third party developers to develop plugins for NetIDMgr.

-</p>

-

-<p>

-More information about the concepts used in the design of Network

-Identity Manager can be found <a href="concepts.htm">here</a>.

-</p>

-

-</body>

+<html>
+<head>
+  <title>About Network Identity Manager</title>
+  <meta name="description" content="About NetIDMgr">
+  <meta name="keywords" content="">
+  <link rel="stylesheet" type="text/css" href="nidmgr.css">
+</head>
+<body>
+
+<h1>About Network Identity Manager</h1>
+
+<p>
+This is strictly an informative page about the origins of Network
+Identity Manager.
+</p>
+
+<h3>In the beginning</h3>
+
+<p>
+Network Identity Manager was conceived as an identity management
+solution to make up for the shortcomings of Leash32 (distributed with
+MIT Kerberos for Windows) and AFSCreds (distributed with OpenAFS).
+</p>
+
+<p>
+The work started as Unified Credentials Manager, a final project for
+the MIT course 6.831 : User Interface Design and Implementation,
+taught by <a href="http://people.csail.mit.edu/rcm/">Professor Rob
+Miller</a>.  By the time actual code was written, it was named
+Khimaira (which was later changed to Network Identity Manager around
+October, 2005).  Traces of the name Khimaira might still exist in the
+source code.
+</p>
+
+<p>
+Khimaira was presented at the <a
+href="http://www.pmw.org/afsbpw05/">AFS and Kerberos Best Practices
+Workshop 2005</a>.  The slides can be found on the workshop website and <a
+href="http://web.mit.edu/asanka/www/misc.shtml">here</a>.
+</p>
+
+<p>
+The work on Network Identity Manager was supported by <a
+href="http://web.mit.edu">MIT</a> <a
+href="http://web.mit.edu/ist/">Information Services and
+Technology</a>, <a href="http://www.jpl.nasa.gov">NASA Jet Propulsion Laboratory</a>,
+and <a href="http://www.secure-endpoints.com">Secure Endpoints Inc.</a>.
+</p>
+
+<h3>Design</h3>
+
+<p>
+A plugin based architecture was chosen so that support for additional
+credential types and features could be added without making changes to
+the mainline code.  In addition to making the application easily
+extensible, this also allows the AFS plugin to be maintained within
+the OpenAFS code base and separates the code supporting Kerberos 5 and
+Kerberos 4.  Furthermore, it is anticipated that this would encourage
+third party developers to develop plugins for NetIDMgr.
+</p>
+
+<p>
+More information about the concepts used in the design of Network
+Identity Manager can be found <a href="concepts.htm">here</a>.
+</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/act_chpw.htm b/src/windows/identity/help/html/act_chpw.htm
index 33ec3a2b9..a68f73336 100644
--- a/src/windows/identity/help/html/act_chpw.htm
+++ b/src/windows/identity/help/html/act_chpw.htm
@@ -1,35 +1,35 @@
-<html>

-<head>

-  <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">

-  

-  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Changing Passwords">

-</OBJECT>

-</head>

-<body>

-

-<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 v5).

-</p>

-<p><img border="0" src="images/screen_chng_pwd.png" width="456" height="244"></p>

-

-<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

-twice.

-</p>

-

-<p>Note that currently, when the password for an identity is being

-changed, only the associated Kerberos v5 password is changed.

-</p>

-

-</body>

+<html>
+<head>
+  <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">
+  
+  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Changing Passwords">
+</OBJECT>
+</head>
+<body>
+
+<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 v5).
+</p>
+<p><img border="0" src="images/screen_chng_pwd.png" width="456" height="244"></p>
+
+<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
+twice.
+</p>
+
+<p>Note that currently, when the password for an identity is being
+changed, only the associated Kerberos v5 password is changed.
+</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/act_destroy_creds.htm b/src/windows/identity/help/html/act_destroy_creds.htm
index f1643f162..196631bc9 100644
--- a/src/windows/identity/help/html/act_destroy_creds.htm
+++ b/src/windows/identity/help/html/act_destroy_creds.htm
@@ -1,36 +1,36 @@
-<html>

-<head>

-  <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">

-<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Destroying Credentials">

-<param name="Keyword" value="Ctrl + D">

-<param name="Keyword" value="Delete key">

-</OBJECT></head>

-<body>

-

-<h1>Network Identity Manager - Destroy Credentials</h1>

-

-<p>This action will attempt to destroy the credentials that are

-currently selected in the credentials window.

-</p>

-

-<p>In some cases, you may need to select all the credentials of a

-specific type for the delete operation to succeed.  This happens when

-the credentials provider does not support deleting individual

-credentials, but supports deleting all the credentials stored in one

-specific location.

-</p>

-

-<p>The action can be invoked by selecting the credentials and then

-pressing the <span class="pre">Delete</span> key or by pressing <span

-class="pre">Ctrl + D</span>.  You can also select the <span

-class="pre">Delete credentials</span> action from the context menu

-(available via right-clicking inside the credentials window) or the

-credentials menu.

-</p>

-

-</body>

+<html>
+<head>
+  <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">
+<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Destroying Credentials">
+<param name="Keyword" value="Ctrl + D">
+<param name="Keyword" value="Delete key">
+</OBJECT></head>
+<body>
+
+<h1>Network Identity Manager - Destroy Credentials</h1>
+
+<p>This action will attempt to destroy the credentials that are
+currently selected in the credentials window.
+</p>
+
+<p>In some cases, you may need to select all the credentials of a
+specific type for the delete operation to succeed.  This happens when
+the credentials provider does not support deleting individual
+credentials, but supports deleting all the credentials stored in one
+specific location.
+</p>
+
+<p>The action can be invoked by selecting the credentials and then
+pressing the <span class="pre">Delete</span> key or by pressing <span
+class="pre">Ctrl + D</span>.  You can also select the <span
+class="pre">Delete credentials</span> action from the context menu
+(available via right-clicking inside the credentials window) or the
+credentials menu.
+</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/act_import_creds.htm b/src/windows/identity/help/html/act_import_creds.htm
index 59ab2db1d..c465c060d 100644
--- a/src/windows/identity/help/html/act_import_creds.htm
+++ b/src/windows/identity/help/html/act_import_creds.htm
@@ -1,31 +1,31 @@
-<html>

-<head>

-  <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">

-

-<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Importing Credentials">

-<param name="Keyword" value="Ctrl + I">

-<param name="Keyword" value="MSLSA">

-</OBJECT></head>

-<body>

-

-<h1>Network Identity Manager - Import Credentials</h1>

-

-<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 v5

-configuration pane accessible via the <a

-href="menu_options.htm">Options</a> menu contain settings that

-control when the importing of credentials are performed at startup.

-</p>

-

-</body>

+<html>
+<head>
+  <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">
+
+<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Importing Credentials">
+<param name="Keyword" value="Ctrl + I">
+<param name="Keyword" value="MSLSA">
+</OBJECT></head>
+<body>
+
+<h1>Network Identity Manager - Import Credentials</h1>
+
+<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 v5
+configuration pane accessible via the <a
+href="menu_options.htm">Options</a> menu contain settings that
+control when the importing of credentials are performed at startup.
+</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/act_new_creds.htm b/src/windows/identity/help/html/act_new_creds.htm
index 7f1dbc6de..7c15be30a 100644
--- a/src/windows/identity/help/html/act_new_creds.htm
+++ b/src/windows/identity/help/html/act_new_creds.htm
@@ -1,118 +1,118 @@
-<html>

-<head>

-  <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">

-  

-  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Obtaining New Credentials">

-<param name="Keyword" value="Ctrl + N">

-<param name="Keyword" value="New Credentials Dialog">

-<param name="Keyword" value="Kerberos v5 ticket flags">

-<param name="Keyword" value="Changing Passwords">

-<param name="Keyword" value="Obtain New Credentials at Startup">

-</OBJECT>

-</head>

-<body>

-

-<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

-class="pre">Ctrl + N</span>, using the context menu in the credentials

-window or using the context menu in the NetIDMgr icon in the system

-notification area.

-</p>

-

-<p>Once invoked, you will be presented with a dialog similar to the

-following:

-</p>

-

-<p>

-<img src="images/screen_new_creds.png" alt="New credentials dialog"/>

-<p class="caption">New credentials dialog with a valid identity

-selected.</p> 

-

-<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

-authentication for new credentials to be obtained.

-</p>

-

-<p>Below the prompts is the credentials summary window.  This window

-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">&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.png"

-alt="Expanded new credentials window" />

-

-<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 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>

-

-<p>The credentials summary window provides an overview of the

-credentials that will be obtained after the successful completion of

-the new credentials dialog.  The window contains hyperlinks that will

-take you to the corresponding credentials option panels where you will

-be able to set additional options for each type.

-</p>

-

-<p>If there is a problem with the selected identity, the credentials

-window will display a message describing the problem.  For example:

-</p>

-

-<p>

-<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 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 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

-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>

-command line option, the new credentials dialog will be displayed if

-there are no credentials available.

-</p>

-

-<p>

-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>

+<html>
+<head>
+  <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">
+  
+  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Obtaining New Credentials">
+<param name="Keyword" value="Ctrl + N">
+<param name="Keyword" value="New Credentials Dialog">
+<param name="Keyword" value="Kerberos v5 ticket flags">
+<param name="Keyword" value="Changing Passwords">
+<param name="Keyword" value="Obtain New Credentials at Startup">
+</OBJECT>
+</head>
+<body>
+
+<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
+class="pre">Ctrl + N</span>, using the context menu in the credentials
+window or using the context menu in the NetIDMgr icon in the system
+notification area.
+</p>
+
+<p>Once invoked, you will be presented with a dialog similar to the
+following:
+</p>
+
+<p>
+<img src="images/screen_new_creds.png" alt="New credentials dialog"/>
+<p class="caption">New credentials dialog with a valid identity
+selected.</p> 
+
+<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
+authentication for new credentials to be obtained.
+</p>
+
+<p>Below the prompts is the credentials summary window.  This window
+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">&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.png"
+alt="Expanded new credentials window" />
+
+<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 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>
+
+<p>The credentials summary window provides an overview of the
+credentials that will be obtained after the successful completion of
+the new credentials dialog.  The window contains hyperlinks that will
+take you to the corresponding credentials option panels where you will
+be able to set additional options for each type.
+</p>
+
+<p>If there is a problem with the selected identity, the credentials
+window will display a message describing the problem.  For example:
+</p>
+
+<p>
+<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 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 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
+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>
+command line option, the new credentials dialog will be displayed if
+there are no credentials available.
+</p>
+
+<p>
+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>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/act_renew_creds.htm b/src/windows/identity/help/html/act_renew_creds.htm
index e582b2340..a62c92fec 100644
--- a/src/windows/identity/help/html/act_renew_creds.htm
+++ b/src/windows/identity/help/html/act_renew_creds.htm
@@ -1,40 +1,40 @@
-<html>

-<head>

-  <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">

-  

-  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Renewing Credentials">

-<param name="Keyword" value="Ctrl + R">

-<param name="Keyword" value="Monitor Credential Expiration">

-<param name="Keyword" value="krb524 translator">

-<param name="Keyword" value="">

-<param name="Keyword" value="">

-</OBJECT>

-</head>

-<body>

-

-<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 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 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 v5, if the initial ticket is

-renewable and not expired, then it will obtain a renewed initial

-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 v4 initial ticket.</p>

-

-</body>

+<html>
+<head>
+  <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">
+  
+  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Renewing Credentials">
+<param name="Keyword" value="Ctrl + R">
+<param name="Keyword" value="Monitor Credential Expiration">
+<param name="Keyword" value="krb524 translator">
+<param name="Keyword" value="">
+<param name="Keyword" value="">
+</OBJECT>
+</head>
+<body>
+
+<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 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 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 v5, if the initial ticket is
+renewable and not expired, then it will obtain a renewed initial
+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 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 6dccd235c..dce442c43 100644
--- a/src/windows/identity/help/html/act_set_default.htm
+++ b/src/windows/identity/help/html/act_set_default.htm
@@ -1,20 +1,20 @@
-<html>

-<head>

-  <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>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>

+<html>
+<head>
+  <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>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>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/bugs.htm b/src/windows/identity/help/html/bugs.htm
index f934dffd2..6fbbc140c 100644
--- a/src/windows/identity/help/html/bugs.htm
+++ b/src/windows/identity/help/html/bugs.htm
@@ -1,33 +1,33 @@
-<html>

-<head>

-  <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>Network Identity Manager - Reporting Bugs</h1>

-

-<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 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>

-or subscribe via the web page:</p>

-

-<p> <a href="http://mailman.mit.edu/mailman/listinfo/kerberos"

-class="external">

-http://mailman.mit.edu/mailman/listinfo/kerberos</a></p>

-

-<p>Information about Kerberos mailing lists can be found at <a

-href="http://web.mit.edu/kerberos/mail-lists.html"

-class="external">http://web.mit.edu/kerberos/mail-lists.html</a></p>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - Reporting Bugs</h1>
+
+<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 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>
+or subscribe via the web page:</p>
+
+<p> <a href="http://mailman.mit.edu/mailman/listinfo/kerberos"
+class="external">
+http://mailman.mit.edu/mailman/listinfo/kerberos</a></p>
+
+<p>Information about Kerberos mailing lists can be found at <a
+href="http://web.mit.edu/kerberos/mail-lists.html"
+class="external">http://web.mit.edu/kerberos/mail-lists.html</a></p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/cmdline_netidmgr.htm b/src/windows/identity/help/html/cmdline_netidmgr.htm
index f77c47598..8767460bc 100644
--- a/src/windows/identity/help/html/cmdline_netidmgr.htm
+++ b/src/windows/identity/help/html/cmdline_netidmgr.htm
@@ -1,38 +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>
+<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 db936aa00..ab8f7c40e 100644
--- a/src/windows/identity/help/html/concept_cred_pro.htm
+++ b/src/windows/identity/help/html/concept_cred_pro.htm
@@ -1,38 +1,38 @@
-<html>

-<head>

-  <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>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>
+<head>
+  <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>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
index eca302ef3..0fadbf599 100644
--- a/src/windows/identity/help/html/concept_credential.htm
+++ b/src/windows/identity/help/html/concept_credential.htm
@@ -1,31 +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>
+<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 d17c23b94..4fca8674e 100644
--- a/src/windows/identity/help/html/concept_ident_pro.htm
+++ b/src/windows/identity/help/html/concept_ident_pro.htm
@@ -1,32 +1,32 @@
-<html>

-<head>

-  <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>Network Identity Manager Concepts: Identity Provider</h1>

-

-<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>
+<head>
+  <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>Network Identity Manager Concepts: Identity Provider</h1>
+
+<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 434067916..c573ed9d5 100644
--- a/src/windows/identity/help/html/concept_identity.htm
+++ b/src/windows/identity/help/html/concept_identity.htm
@@ -1,33 +1,33 @@
-<html>

-<head>

-  <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>Network Identity Manager Concepts: Identity</h1>

-

-<p>While there are many approaches to defining what an identity is, as

-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>

-

-<p>

-</p>

-

-<a name="default_identity" />

-<h3>Default Identity</h3>

-

-<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>

-</body>

+<html>
+<head>
+  <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>Network Identity Manager Concepts: Identity</h1>
+
+<p>While there are many approaches to defining what an identity is, as
+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>
+
+<p>
+</p>
+
+<a name="default_identity" />
+<h3>Default Identity</h3>
+
+<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>
+</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 2ce38e97f..194aeddfa 100644
--- a/src/windows/identity/help/html/concepts.htm
+++ b/src/windows/identity/help/html/concepts.htm
@@ -1,48 +1,48 @@
-<html>

-<head>

-  <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>Network Identity Manager Concepts</h1>

-

-<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 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 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">credential providers</a>.  Other plug-ins

-may extend the functionality of these plug-ins or provide additional

-functionality for NetIDMgr.

-</p>

-

-<p>

-</p>

-

-<p>The following topics provider further details: </p>

-

-<ul>

-  <li><a href="concept_identity.htm">Identity</a></li>

-

-  <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>
+<head>
+  <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>Network Identity Manager Concepts</h1>
+
+<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 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 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">credential providers</a>.  Other plug-ins
+may extend the functionality of these plug-ins or provide additional
+functionality for NetIDMgr.
+</p>
+
+<p>
+</p>
+
+<p>The following topics provider further details: </p>
+
+<ul>
+  <li><a href="concept_identity.htm">Identity</a></li>
+
+  <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>
\ 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 b62753d7a..d31417df4 100644
--- a/src/windows/identity/help/html/copyright.htm
+++ b/src/windows/identity/help/html/copyright.htm
@@ -1,48 +1,48 @@
-<html>

-<head>

-  <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>

-

-<p>This software is being provided to you, the LICENSEE, by the

-Massachusetts Institute of Technology (M.I.T) under the following

-license. By obtaining, using and/or copying this software, you agree

-that you have read, understood, and will comply with these terms and

-conditions:</p>

-

-<p>Permission to use, copy, modify and distribute this software and its

-documentation for any purpose and without fee or royalty is hereby

-granted, provided that you agree to comply with the following

-copyright notice and statements, including the disclaimer, and that

-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-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

-OR WARRANTIES, EXPRESS OR IMPLIED. By way of example, but not

-limitation, M.I.T. MAKES NO REPRESENTATIONS OR WARRANTIES OF

-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE

-OF THE LICENSED SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD

-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>

-

-<p>The name of the Massachusetts Institute of Technology or M.I.T. may

-NOT be used in advertising or publicity pertaining to distribution of

-the software. Title to copyright in this software and any associated

-documentation shall at all times remain with M.I.T., and USER agrees

-to preserve same.</p>

-

-<p>Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira,

-OLC, X Window System, and Zephyr are trademarks of the Massachusetts

-Institute of Technology (MIT). No commercial use of these trademarks

-may be made without prior written permission of MIT.</p>

-

-</body>

-</html>

+<html>
+<head>
+  <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>
+
+<p>This software is being provided to you, the LICENSEE, by the
+Massachusetts Institute of Technology (M.I.T) under the following
+license. By obtaining, using and/or copying this software, you agree
+that you have read, understood, and will comply with these terms and
+conditions:</p>
+
+<p>Permission to use, copy, modify and distribute this software and its
+documentation for any purpose and without fee or royalty is hereby
+granted, provided that you agree to comply with the following
+copyright notice and statements, including the disclaimer, and that
+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-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
+OR WARRANTIES, EXPRESS OR IMPLIED. By way of example, but not
+limitation, M.I.T. MAKES NO REPRESENTATIONS OR WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE
+OF THE LICENSED SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>The name of the Massachusetts Institute of Technology or M.I.T. may
+NOT be used in advertising or publicity pertaining to distribution of
+the software. Title to copyright in this software and any associated
+documentation shall at all times remain with M.I.T., and USER agrees
+to preserve same.</p>
+
+<p>Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira,
+OLC, X Window System, and Zephyr are trademarks of the Massachusetts
+Institute of Technology (MIT). No commercial use of these trademarks
+may be made without prior written permission of MIT.</p>
+
+</body>
+</html>
diff --git a/src/windows/identity/help/html/howdoi.htm b/src/windows/identity/help/html/howdoi.htm
index 9826ac20a..3b2c2a336 100644
--- a/src/windows/identity/help/html/howdoi.htm
+++ b/src/windows/identity/help/html/howdoi.htm
@@ -1,44 +1,44 @@
-<html>

-<head>

-  <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>Network Identity Manager - How do I ...</h1>

-

-<h3>Startup</h3>

-<ul>

-

-  <li><a href="use_start.htm">Start or Open the Network Identity Manager

-  window</a></li>

-

-</ul>

-

-<h3>Credentials related actions</h3>

-<ul>

-

-  <li><a href="act_new_creds.htm">Get new credentials</a></li>

-

-  <li><a href="act_destroy_creds.htm">Destroy credentials</a></li>

-

-  <li><a href="act_import_creds.htm">Import credentials from the MSLSA

-  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>

-

-<h3>Credentials view</h3>

-<ul>

-

-  <li><a href="use_layout.htm">Managing the credentials view layout</a></li>

-

-</ul>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - How do I ...</h1>
+
+<h3>Startup</h3>
+<ul>
+
+  <li><a href="use_start.htm">Start or Open the Network Identity Manager
+  window</a></li>
+
+</ul>
+
+<h3>Credentials related actions</h3>
+<ul>
+
+  <li><a href="act_new_creds.htm">Get new credentials</a></li>
+
+  <li><a href="act_destroy_creds.htm">Destroy credentials</a></li>
+
+  <li><a href="act_import_creds.htm">Import credentials from the MSLSA
+  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>
+
+<h3>Credentials view</h3>
+<ul>
+
+  <li><a href="use_layout.htm">Managing the credentials view layout</a></li>
+
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_all.htm b/src/windows/identity/help/html/menu_all.htm
index 6cd811393..c5efbb216 100644
--- a/src/windows/identity/help/html/menu_all.htm
+++ b/src/windows/identity/help/html/menu_all.htm
@@ -1,41 +1,41 @@
-<html>

-<head>

-  <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>Network Identity Manager - The Menu Bar</h1>

-

-<p>

-Click an item on the menu to go to the description of the submenu, or

-choose from the list below.  You can activate the menu bar using <span

-class="pre">F10</span>.  Alternatively, you can activate each

-individual submenu by pressing <span class="pre">Alt +

-&lt;key&gt;</span> where <span class="pre">key</span> is the

-highlighted character on the submenu.

-</p>

-

-<map id="menu_bar_map">

-<area shape = "rect" coords = "0,1,34,20" href = "menu_file.htm">

-<area shape = "rect" coords = "37,2,110,20" href = "menu_credential.htm">

-<area shape = "rect" coords = "117,1,156,20" href = "menu_view.htm">

-<area shape = "rect" coords = "161,1,221,20" href = "menu_options.htm">

-<area shape = "rect" coords = "226,0,269,20" href = "menu_help.htm">

-</map>

-

-<p>

-<img src="images/screen_menu_bar.png" usemap="#menu_bar_map"/>

-</p>

-

-<ul>

-  <li><a href="menu_file.htm">File menu</li>

-  <li><a href="menu_credential.htm">Credential menu</li>

-  <li><a href="menu_view.htm">View menu</li>

-  <li><a href="menu_options.htm">Options menu</li>

-  <li><a href="menu_help.htm">Help menu</li>

-</ul>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - The Menu Bar</h1>
+
+<p>
+Click an item on the menu to go to the description of the submenu, or
+choose from the list below.  You can activate the menu bar using <span
+class="pre">F10</span>.  Alternatively, you can activate each
+individual submenu by pressing <span class="pre">Alt +
+&lt;key&gt;</span> where <span class="pre">key</span> is the
+highlighted character on the submenu.
+</p>
+
+<map id="menu_bar_map">
+<area shape = "rect" coords = "0,1,34,20" href = "menu_file.htm">
+<area shape = "rect" coords = "37,2,110,20" href = "menu_credential.htm">
+<area shape = "rect" coords = "117,1,156,20" href = "menu_view.htm">
+<area shape = "rect" coords = "161,1,221,20" href = "menu_options.htm">
+<area shape = "rect" coords = "226,0,269,20" href = "menu_help.htm">
+</map>
+
+<p>
+<img src="images/screen_menu_bar.png" usemap="#menu_bar_map"/>
+</p>
+
+<ul>
+  <li><a href="menu_file.htm">File menu</li>
+  <li><a href="menu_credential.htm">Credential menu</li>
+  <li><a href="menu_view.htm">View menu</li>
+  <li><a href="menu_options.htm">Options menu</li>
+  <li><a href="menu_help.htm">Help menu</li>
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_credential.htm b/src/windows/identity/help/html/menu_credential.htm
index f34312827..9a83af039 100644
--- a/src/windows/identity/help/html/menu_credential.htm
+++ b/src/windows/identity/help/html/menu_credential.htm
@@ -1,81 +1,81 @@
-<html>

-<head>

-  <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>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 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">Credential</span> menu.

-</p>

-

-<p>

-<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"></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

-  the dialog.

-  <p>

-  See <span class="pre"><a href="act_new_creds.htm">New Credentials

-  Action</a></span> for more information.

-  </p></li>

-

-  <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"></a> <span class="title">Destroy

-  credentials...</span>: Destroys the selected credentials.</li>

-

-  <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>.

-  <p>

-  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"></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"></a> <span class="title">Import

-  Credentials</span>: Import any existing credentials from external

-  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>

-

-</body>

+<html>
+<head>
+  <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>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 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">Credential</span> menu.
+</p>
+
+<p>
+<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"></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
+  the dialog.
+  <p>
+  See <span class="pre"><a href="act_new_creds.htm">New Credentials
+  Action</a></span> for more information.
+  </p></li>
+
+  <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"></a> <span class="title">Destroy
+  credentials...</span>: Destroys the selected credentials.</li>
+
+  <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>.
+  <p>
+  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"></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"></a> <span class="title">Import
+  Credentials</span>: Import any existing credentials from external
+  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>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_file.htm b/src/windows/identity/help/html/menu_file.htm
index 2f734af91..f82490efa 100644
--- a/src/windows/identity/help/html/menu_file.htm
+++ b/src/windows/identity/help/html/menu_file.htm
@@ -1,45 +1,45 @@
-<html>

-<head>

-  <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>Network Identity File 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 + F</span> and you can activate each action by

-pressing the highlited 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">File</span> menu.

-</p>

-

-<p>

-<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"></a>

-  <span class="title">Properties...</span>: Displays a property

-  sheet for the selected credential, identity or credential type.</li>

-

-  <li><a name="exit"></a>

-  <span class="title">Exit</span>: Exits Network Identity Manager</li>

-

-</ul>

-

-</body>

+<html>
+<head>
+  <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>Network Identity File 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 + F</span> and you can activate each action by
+pressing the highlited 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">File</span> menu.
+</p>
+
+<p>
+<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"></a>
+  <span class="title">Properties...</span>: Displays a property
+  sheet for the selected credential, identity or credential type.</li>
+
+  <li><a name="exit"></a>
+  <span class="title">Exit</span>: Exits Network Identity Manager</li>
+
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_help.htm b/src/windows/identity/help/html/menu_help.htm
index 7cd368ec2..8f65c71b8 100644
--- a/src/windows/identity/help/html/menu_help.htm
+++ b/src/windows/identity/help/html/menu_help.htm
@@ -1,54 +1,54 @@
-<html>

-<head>

-  <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>Network Identity Manager - Help Menu</h1>

-

-<p>

-You can activate the menu by pressing <span class="pre">Alt + H</span>

-and you can activate each action by pressing the highlighted character.

-</p>

-

-<p>

-You can invoke help anytime by pressing the <span

-class="pre">F1</span> key or if you are in a dialog box, by clicking

-the question mark icon in the title bar and then clicking on the

-dialog box control that you want help with.

-</p>

-

-

-<p>

-<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="contents"></a><span class="title">Contents</span>: Opens

-  the table of contents for the user documentation</li>

-

-  <li><a name="index"></a><span class="title">Index</span>: Opens the

-  index for the user documentation</li>

-  

-  <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>

-

-</ul>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - Help Menu</h1>
+
+<p>
+You can activate the menu by pressing <span class="pre">Alt + H</span>
+and you can activate each action by pressing the highlighted character.
+</p>
+
+<p>
+You can invoke help anytime by pressing the <span
+class="pre">F1</span> key or if you are in a dialog box, by clicking
+the question mark icon in the title bar and then clicking on the
+dialog box control that you want help with.
+</p>
+
+
+<p>
+<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="contents"></a><span class="title">Contents</span>: Opens
+  the table of contents for the user documentation</li>
+
+  <li><a name="index"></a><span class="title">Index</span>: Opens the
+  index for the user documentation</li>
+  
+  <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>
+
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_options.htm b/src/windows/identity/help/html/menu_options.htm
index df10f2ec3..1022a320d 100644
--- a/src/windows/identity/help/html/menu_options.htm
+++ b/src/windows/identity/help/html/menu_options.htm
@@ -1,65 +1,65 @@
-<html>

-<head>

-  <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>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 menu by pressing <span

-class="pre">Alt + O</span> and you can activate each action by

-pressing the highlighted character.

-</p>

-

-

-<p>

-<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"></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="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"></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"></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"></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"></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>

-

-</ul>

-

-</body>

+<html>
+<head>
+  <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>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 menu by pressing <span
+class="pre">Alt + O</span> and you can activate each action by
+pressing the highlighted character.
+</p>
+
+
+<p>
+<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"></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="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"></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"></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"></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"></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>
+
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/menu_view.htm b/src/windows/identity/help/html/menu_view.htm
index 008055916..d2a4987a5 100644
--- a/src/windows/identity/help/html/menu_view.htm
+++ b/src/windows/identity/help/html/menu_view.htm
@@ -1,94 +1,94 @@
-<html>

-<head>

-  <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>Network Identity Manager - View 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 + V</span> and you can activate each action by

-pressing the highlited 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">View</span> menu.

-</p>

-

-<p>

-<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="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>

-

-<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>

-

-      <li><span class="title">By Identity</span>: A predefined layout

-      where the credentials will be grouped by identity and by

-      credentials type, in that order.</li>

-

-      <li><span class="title">By Type</span>: <b>Not implemented in

-      this release.</b> A predefined layout

-      where the credentials are grouped by credentials type</li>

-

-      <li><span class="title">By Location</span>: A predefined layout

-      where the credentials are grouped by the location where they are

-      stored in.  For Kerberos 5, the location is the name of the

-      credentials cache in which the tickets are stored, and for AFS,

-      the locatino is always the cache manager.  Individual <a

-      href="concept_cred_pro.htm">credential providers</a> choose the

-      interpretation of the <span class="pre">location</span> property

-      as the concept of location changes from type to type.</li>

-

-      <li><span class="title">Custom</span>: If you customize any of

-      the above layouts by adding, removing, reordering or changing

-      the sort or outline columns, then NetIDMgr will store your new

-      layout settings under this layout.  Invoking this menu item

-      restores your customizations.</ul>

-

-</li>

-

-<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>

-

-</ul>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - View 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 + V</span> and you can activate each action by
+pressing the highlited 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">View</span> menu.
+</p>
+
+<p>
+<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="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>
+
+<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>
+
+      <li><span class="title">By Identity</span>: A predefined layout
+      where the credentials will be grouped by identity and by
+      credentials type, in that order.</li>
+
+      <li><span class="title">By Type</span>: <b>Not implemented in
+      this release.</b> A predefined layout
+      where the credentials are grouped by credentials type</li>
+
+      <li><span class="title">By Location</span>: A predefined layout
+      where the credentials are grouped by the location where they are
+      stored in.  For Kerberos 5, the location is the name of the
+      credentials cache in which the tickets are stored, and for AFS,
+      the locatino is always the cache manager.  Individual <a
+      href="concept_cred_pro.htm">credential providers</a> choose the
+      interpretation of the <span class="pre">location</span> property
+      as the concept of location changes from type to type.</li>
+
+      <li><span class="title">Custom</span>: If you customize any of
+      the above layouts by adding, removing, reordering or changing
+      the sort or outline columns, then NetIDMgr will store your new
+      layout settings under this layout.  Invoking this menu item
+      restores your customizations.</ul>
+
+</li>
+
+<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>
+
+</ul>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/nidmgr.css b/src/windows/identity/help/html/nidmgr.css
index 99a50d17e..0fb975eb7 100644
--- a/src/windows/identity/help/html/nidmgr.css
+++ b/src/windows/identity/help/html/nidmgr.css
@@ -1,122 +1,122 @@
-  body {

-    font-family: helvetica,sans-serif;

-    font-size: 9pt;

-    font-style: normal;

-    background-color: white;

-    margin-top: 0pt;

-    margin-left: 0pt;

-    margin-right: 0pt;

-    }

-

-  h1 { border-bottom: 1px solid black;

-    padding: 1em;

-    font-size: 12pt;

-    background-color: rgb(247, 247, 247);

-    }

-

-  h2 {  }

-

-  h3 { border-bottom: 1px solid lightgrey;

-    padding: 1em;

-    font-size: 11pt;

-    }

-

-  h4 { border-bottom: 1px dashed lightgrey;

-    font-size: 10pt;

-    font-style: italic;

-    margin-left: 2em;

-    }

-

-  p { margin-left: 1em;

-    margin-right: 1em;

-    }

-

-  p.caption { margin-left: 1em;

-    margin-right: 1em;

-    font-style: italic;

-    }

-

-  div.inline { float: left;

-    }

-

-  div.sidebar { border: 1px solid rgb(255, 255, 0);

-    float: right;

-    background-color: rgb(255, 255, 185);

-    }

-

-  a.external {  }

-

-  a.mail {  }

-

-  img { border: 0pt none ;

-    }

-

-  span.pre { font-family: monospace;

-    }

-

-  span.title { font-weight: bold;

-    }

-

-  div.schema-space { border-left: 1px solid rgb(230, 206, 142);

-    padding: 0pt;

-    margin-left: 1em;

-    margin-top: 0.5em;

-    margin-bottom: 0.5em;

-    }

-

-  div.schema-templ { border-left: 1px solid rgb(98, 161, 143);

-    background-color: rgb(208, 242, 233);

-    }

-

-  div.schema-space-doc { margin: 1em 3em;

-    }

-

-  p.schema-space { border-top: 1px solid rgb(230, 206, 142);

-    margin: 0pt;

-    padding: 1em;

-    font-weight: bold;

-    font-size: 10pt;

-    background-color: rgb(242, 233, 208);

-    }

-

-  p.schema-reg { margin: 0pt;

-    padding-top: 0.4em;

-    padding-bottom: 0.4em;

-    background-color: rgb(247, 247, 247);

-    }

-

-  span.schema-label { display: block;

-    float: left;

-    margin-left: 2em;

-    width: 10em;

-    }

-

-  span.schema-value { width: 100%;

-    background-color: rgb(255, 255, 255);

-    padding-top: 0.3em;

-    padding-bottom: 0.3em;

-    }

-

-  div.schema-value { border: 1px solid rgb(153, 171, 94);

-    background-color: rgb(234, 242, 208);

-    margin-left: 1em;

-    margin-right: 1em;

-    margin-bottom: 1em;

-    }

-

-  p.schema-value-name { margin: 0.5em 1em;

-    padding: 0.5em 1em;

-    }

-

-  span.schema-value-name { font-size: 10pt;

-    font-weight: bold;

-    }

-

-  p.schema-value-type {  }

-

-  p.schema-value-def {  }

-

-  div.schema-value-doc { padding: 1em;

-    }

-

-

+  body {
+    font-family: helvetica,sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    background-color: white;
+    margin-top: 0pt;
+    margin-left: 0pt;
+    margin-right: 0pt;
+    }
+
+  h1 { border-bottom: 1px solid black;
+    padding: 1em;
+    font-size: 12pt;
+    background-color: rgb(247, 247, 247);
+    }
+
+  h2 {  }
+
+  h3 { border-bottom: 1px solid lightgrey;
+    padding: 1em;
+    font-size: 11pt;
+    }
+
+  h4 { border-bottom: 1px dashed lightgrey;
+    font-size: 10pt;
+    font-style: italic;
+    margin-left: 2em;
+    }
+
+  p { margin-left: 1em;
+    margin-right: 1em;
+    }
+
+  p.caption { margin-left: 1em;
+    margin-right: 1em;
+    font-style: italic;
+    }
+
+  div.inline { float: left;
+    }
+
+  div.sidebar { border: 1px solid rgb(255, 255, 0);
+    float: right;
+    background-color: rgb(255, 255, 185);
+    }
+
+  a.external {  }
+
+  a.mail {  }
+
+  img { border: 0pt none ;
+    }
+
+  span.pre { font-family: monospace;
+    }
+
+  span.title { font-weight: bold;
+    }
+
+  div.schema-space { border-left: 1px solid rgb(230, 206, 142);
+    padding: 0pt;
+    margin-left: 1em;
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    }
+
+  div.schema-templ { border-left: 1px solid rgb(98, 161, 143);
+    background-color: rgb(208, 242, 233);
+    }
+
+  div.schema-space-doc { margin: 1em 3em;
+    }
+
+  p.schema-space { border-top: 1px solid rgb(230, 206, 142);
+    margin: 0pt;
+    padding: 1em;
+    font-weight: bold;
+    font-size: 10pt;
+    background-color: rgb(242, 233, 208);
+    }
+
+  p.schema-reg { margin: 0pt;
+    padding-top: 0.4em;
+    padding-bottom: 0.4em;
+    background-color: rgb(247, 247, 247);
+    }
+
+  span.schema-label { display: block;
+    float: left;
+    margin-left: 2em;
+    width: 10em;
+    }
+
+  span.schema-value { width: 100%;
+    background-color: rgb(255, 255, 255);
+    padding-top: 0.3em;
+    padding-bottom: 0.3em;
+    }
+
+  div.schema-value { border: 1px solid rgb(153, 171, 94);
+    background-color: rgb(234, 242, 208);
+    margin-left: 1em;
+    margin-right: 1em;
+    margin-bottom: 1em;
+    }
+
+  p.schema-value-name { margin: 0.5em 1em;
+    padding: 0.5em 1em;
+    }
+
+  span.schema-value-name { font-size: 10pt;
+    font-weight: bold;
+    }
+
+  p.schema-value-type {  }
+
+  p.schema-value-def {  }
+
+  div.schema-value-doc { padding: 1em;
+    }
+
+
diff --git a/src/windows/identity/help/html/tb_standard.htm b/src/windows/identity/help/html/tb_standard.htm
index e0f041b8b..69df96a62 100644
--- a/src/windows/identity/help/html/tb_standard.htm
+++ b/src/windows/identity/help/html/tb_standard.htm
@@ -1,80 +1,80 @@
-<html>

-<head>

-  <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">

-  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Changing Passwords">

-<param name="Keyword" value="New Credentials">

-<param name="Keyword" value="Renew Credentials">

-<param name="Keyword" value="Import Credentials">

-<param name="Keyword" value="Destroy Credentials">

-<param name="Keyword" value="Change Password">

-<param name="Keyword" value="Refresh View">

-<param name="Keyword" value="Help">

-<param name="Keyword" value="Toolbar">

-</OBJECT>

-

-</head>

-<body>

-

-<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.png" />

-</p>

-

-<ol>

-

-  <li><span class="title">New credentials</span>: Equivalent to

-  selecting <span class="pre"><a href="menu_credential.htm#new">New

-  credentials...</a></span> from the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.

-  <p>

-  See <a href="act_new_creds.htm">New Credentials Action</a> for more

-  information.</p></li>

-

-  <li><span class="title">Renew credentials</span>: Equivalent to

-  selecting <span class="pre"><a

-  href="menu_credential.htm#renew">Renew Credentials</a></span> from

-  the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.

-  <p>

-  See <a href="act_renew_creds.htm">Renew Credentials Action</a> for

-  more information.</li>

-

-  <li><span class="title">Import credentials</span>: Equivalent to

-  selecting <span class="pre"><a

-  href="menu_credential.htm#import">Import Credentials</a></span> from

-  the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.

-  </li>

-

-  <li><span class="title">Destroy credentials</span>: Equivalent to

-  selecting <span class="pre"><a

-  href="menu_credential.htm#destroy">Destroy Credentials</a></span>

-  from the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.</li>

-

-  <li><span class="title">Change password</span>: Equivalent to

-  selecting <span class="pre"><a

-  href="menu_credential.htm#chpw">Change Password ...</a></span> from

-  the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.</li>

-

-  <li><span class="title">Refresh view</span>: Equivalent to selecting

-  <span class="pre"><a href="menu_credential.htm#refresh">Refresh

-  View</a></span> from the <span class="pre"><a

-  href="menu_credential.htm">Credential</a></span> menu.</li>

-

-  <li><span class="title">Help</span>: Displays documentation</li>

-

-</ol>

-

-</body>

+<html>
+<head>
+  <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">
+  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Changing Passwords">
+<param name="Keyword" value="New Credentials">
+<param name="Keyword" value="Renew Credentials">
+<param name="Keyword" value="Import Credentials">
+<param name="Keyword" value="Destroy Credentials">
+<param name="Keyword" value="Change Password">
+<param name="Keyword" value="Refresh View">
+<param name="Keyword" value="Help">
+<param name="Keyword" value="Toolbar">
+</OBJECT>
+
+</head>
+<body>
+
+<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.png" />
+</p>
+
+<ol>
+
+  <li><span class="title">New credentials</span>: Equivalent to
+  selecting <span class="pre"><a href="menu_credential.htm#new">New
+  credentials...</a></span> from the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.
+  <p>
+  See <a href="act_new_creds.htm">New Credentials Action</a> for more
+  information.</p></li>
+
+  <li><span class="title">Renew credentials</span>: Equivalent to
+  selecting <span class="pre"><a
+  href="menu_credential.htm#renew">Renew Credentials</a></span> from
+  the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.
+  <p>
+  See <a href="act_renew_creds.htm">Renew Credentials Action</a> for
+  more information.</li>
+
+  <li><span class="title">Import credentials</span>: Equivalent to
+  selecting <span class="pre"><a
+  href="menu_credential.htm#import">Import Credentials</a></span> from
+  the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.
+  </li>
+
+  <li><span class="title">Destroy credentials</span>: Equivalent to
+  selecting <span class="pre"><a
+  href="menu_credential.htm#destroy">Destroy Credentials</a></span>
+  from the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.</li>
+
+  <li><span class="title">Change password</span>: Equivalent to
+  selecting <span class="pre"><a
+  href="menu_credential.htm#chpw">Change Password ...</a></span> from
+  the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.</li>
+
+  <li><span class="title">Refresh view</span>: Equivalent to selecting
+  <span class="pre"><a href="menu_credential.htm#refresh">Refresh
+  View</a></span> from the <span class="pre"><a
+  href="menu_credential.htm">Credential</a></span> menu.</li>
+
+  <li><span class="title">Help</span>: Displays documentation</li>
+
+</ol>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/template.htm b/src/windows/identity/help/html/template.htm
index 3357741d7..4e33fab94 100644
--- a/src/windows/identity/help/html/template.htm
+++ b/src/windows/identity/help/html/template.htm
@@ -1,11 +1,11 @@
-<html>

-<head>

-  <title>Network Identity Manager - title</title>

-  <meta name="description" content="">

-  <meta name="keywords" content="">

-  <link rel="stylesheet" type="text/css" href="nidmgr.css">

-</head>

-<body>

-

-</body>

+<html>
+<head>
+  <title>Network Identity Manager - title</title>
+  <meta name="description" content="">
+  <meta name="keywords" content="">
+  <link rel="stylesheet" type="text/css" href="nidmgr.css">
+</head>
+<body>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/use_config.htm b/src/windows/identity/help/html/use_config.htm
index 9d718481a..76b498ac1 100644
--- a/src/windows/identity/help/html/use_config.htm
+++ b/src/windows/identity/help/html/use_config.htm
@@ -1,306 +1,306 @@
-<html>

-

-<head>

-<title>Network Identity Manager - Configuration</title>

-<meta name="description" content>

-<meta name="keywords" content="configuration">

-<link rel="stylesheet" type="text/css" href="nidmgr.css">

-<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Configuration">

-<param name="Keyword" value="General Options">

-<param name="Keyword" value="Appearance Options">

-<param name="Keyword" value="Notification Options">

-<param name="Keyword" value="Plug-in Management">

-<param name="Keyword" value="Kerberos v5 Configuration">

-<param name="Keyword" value="Kerberos v4 Configuration">

-<param name="Keyword" value="Identity Default Configuration">

-<param name="Keyword" value="Identity Configuration">

-</OBJECT>

-<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>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>

-<ul>

-	<li>

-	<p><span class="title">General</span>: General application options for NetIDMgr.</p>

-	</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">Kerberos v5</span>: Kerberos v5 Credential Provider Configuration</p>

-	</li>

-	<li>

-	<p><span class="title">Kerberos v4</span>: Kerberos v4 Credential Provider Configuration</p>

-	</li>

-</ul>

-<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>

-

-<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>

-<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>

-

-<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>

-

-<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>

-

-<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>

-

-

-<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>

-

-<h4>Per identity Kerberos v5 Configuration</h4>

-

-<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>

-

-<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>
+
+<head>
+<title>Network Identity Manager - Configuration</title>
+<meta name="description" content>
+<meta name="keywords" content="configuration">
+<link rel="stylesheet" type="text/css" href="nidmgr.css">
+<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Configuration">
+<param name="Keyword" value="General Options">
+<param name="Keyword" value="Appearance Options">
+<param name="Keyword" value="Notification Options">
+<param name="Keyword" value="Plug-in Management">
+<param name="Keyword" value="Kerberos v5 Configuration">
+<param name="Keyword" value="Kerberos v4 Configuration">
+<param name="Keyword" value="Identity Default Configuration">
+<param name="Keyword" value="Identity Configuration">
+</OBJECT>
+<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>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>
+<ul>
+	<li>
+	<p><span class="title">General</span>: General application options for NetIDMgr.</p>
+	</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">Kerberos v5</span>: Kerberos v5 Credential Provider Configuration</p>
+	</li>
+	<li>
+	<p><span class="title">Kerberos v4</span>: Kerberos v4 Credential Provider Configuration</p>
+	</li>
+</ul>
+<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>
+
+<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>
+<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>
+
+<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>
+
+<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>
+
+<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>
+
+
+<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>
+
+<h4>Per identity Kerberos v5 Configuration</h4>
+
+<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>
+
+<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>
\ 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 353443fab..85e05fdb3 100644
--- a/src/windows/identity/help/html/use_icon.htm
+++ b/src/windows/identity/help/html/use_icon.htm
@@ -1,73 +1,73 @@
-<html>

-<head>

-  <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>Network Identity Manager Notification Icon</h1>

-<h3>Visual Representation of Identity State Information</h3>

-

-<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>

-

-<table width="100%" border="1">

-

-<tr>

-<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.png" /></td>

-<td>There are valid credentials for all the identities.</td>

-</tr>

-

-<tr>

-<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.png" /></td>

-<td>At least one identity's credentials have expired.</td>

-</tr>

-

-<tr>

-<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>
+<head>
+  <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>Network Identity Manager Notification Icon</h1>
+<h3>Visual Representation of Identity State Information</h3>
+
+<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>
+
+<table width="100%" border="1">
+
+<tr>
+<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.png" /></td>
+<td>There are valid credentials for all the identities.</td>
+</tr>
+
+<tr>
+<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.png" /></td>
+<td>At least one identity's credentials have expired.</td>
+</tr>
+
+<tr>
+<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 425af0b99..351cafd5f 100644
--- a/src/windows/identity/help/html/use_layout.htm
+++ b/src/windows/identity/help/html/use_layout.htm
@@ -1,91 +1,91 @@
-<html>

-<head>

-  <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">

-  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-<param name="Keyword" value="Credential View Layouts">

-<param name="Keyword" value="Sorting credentials by a column">

-<param name="Keyword" value="Grouping credentials by a column">

-<param name="Keyword" value="Selecting Columns">

-</OBJECT>

-</head>

-<body>

-

-<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

-displayed in the window, the columns that are used for grouping and

-sorting the list of credentials can be customized. </p>

-

-<p>The following sections provide more details on the types of

-customizations that can be performed:</p>

-

-<ul>

-  <li><a href="#predef">Predefined layouts</a></li>

-  <li><a href="#addcol">Adding and removing columns.</a></li>

-  <li><a href="#sort">Sorting by a column.</a></li>

-  <li><a href="#group">Grouping by a column.</a></li>

-</ul>

-

-<a name="predef"></a>

-<h3>Pre-defined layouts</h3>

-

-<p>The predefined layouts in NetIDMgr are:</p>

-

-<ul>

-

-  <li><span class="title">By Identity</span>: Credentials grouped by

-  identity, credentials type and location, and finally sorted by

-  credential name.</li>

-

-  <li><span class="title">By Type</span>: Credentials grouped by

-  credentials type and then by identity.</li>

-

-  <li><span class="title">By Location</span>: Credentials grouped by

-  location, identity and then by credentials type.  The location is

-  reported by individual credentials providers that indicate where

-  each credential is stored. For Kerberos 5 and Kerberos 4, this is a

-  credentials cache name.</li>

-

-</ul>

-

-<a name="addcol"></a>

-<h3>Adding and removing columns</h3>

-

-<p>The <span class="pre">View Columns</span> menu lists all the

-columns that are available for display.  Each column that is already

-displayed will have a check mark next to it.  Selecting a column that

-is not currently being displayed will add that column to the display.

-Selecting a column that is is being displayed will remove it from the

-display.</p>

-

-<p>This menu can be reached either by right-clicking the column header

-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.png"/> </p>

-

-<a name="sort"></a>

-<h3>Sorting by a column</h3>

-

-<p>Clicking on a column header will change the sort order of the

-column if it is already being used as a sort key.  If the colunm is

-not currently being used as a sort key, clicking on the column header

-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>

-<h3>Grouping by a column</h3>

-

-<p>Double-clicking on a column header will start grouping by that

-column if the column is currently not being used as a sort key.  If

-the column is currently being used for grouping, then double-clicking

-will stop it from being used for grouping.</p>

-

-</body>

+<html>
+<head>
+  <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">
+  <Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+<param name="Keyword" value="Credential View Layouts">
+<param name="Keyword" value="Sorting credentials by a column">
+<param name="Keyword" value="Grouping credentials by a column">
+<param name="Keyword" value="Selecting Columns">
+</OBJECT>
+</head>
+<body>
+
+<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
+displayed in the window, the columns that are used for grouping and
+sorting the list of credentials can be customized. </p>
+
+<p>The following sections provide more details on the types of
+customizations that can be performed:</p>
+
+<ul>
+  <li><a href="#predef">Predefined layouts</a></li>
+  <li><a href="#addcol">Adding and removing columns.</a></li>
+  <li><a href="#sort">Sorting by a column.</a></li>
+  <li><a href="#group">Grouping by a column.</a></li>
+</ul>
+
+<a name="predef"></a>
+<h3>Pre-defined layouts</h3>
+
+<p>The predefined layouts in NetIDMgr are:</p>
+
+<ul>
+
+  <li><span class="title">By Identity</span>: Credentials grouped by
+  identity, credentials type and location, and finally sorted by
+  credential name.</li>
+
+  <li><span class="title">By Type</span>: Credentials grouped by
+  credentials type and then by identity.</li>
+
+  <li><span class="title">By Location</span>: Credentials grouped by
+  location, identity and then by credentials type.  The location is
+  reported by individual credentials providers that indicate where
+  each credential is stored. For Kerberos 5 and Kerberos 4, this is a
+  credentials cache name.</li>
+
+</ul>
+
+<a name="addcol"></a>
+<h3>Adding and removing columns</h3>
+
+<p>The <span class="pre">View Columns</span> menu lists all the
+columns that are available for display.  Each column that is already
+displayed will have a check mark next to it.  Selecting a column that
+is not currently being displayed will add that column to the display.
+Selecting a column that is is being displayed will remove it from the
+display.</p>
+
+<p>This menu can be reached either by right-clicking the column header
+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.png"/> </p>
+
+<a name="sort"></a>
+<h3>Sorting by a column</h3>
+
+<p>Clicking on a column header will change the sort order of the
+column if it is already being used as a sort key.  If the colunm is
+not currently being used as a sort key, clicking on the column header
+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>
+<h3>Grouping by a column</h3>
+
+<p>Double-clicking on a column header will start grouping by that
+column if the column is currently not being used as a sort key.  If
+the column is currently being used for grouping, then double-clicking
+will stop it from being used for grouping.</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/use_start.htm b/src/windows/identity/help/html/use_start.htm
index 4c1b7ab83..3e7b5fa82 100644
--- a/src/windows/identity/help/html/use_start.htm
+++ b/src/windows/identity/help/html/use_start.htm
@@ -1,70 +1,70 @@
-<html>

-<head>

-  <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>Network Identity Manager - Starting Network Identity Manager</h1>

-

-<h3>Opening the Network Identity Manager window from the notification icon</h3>

-

-<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.png"/>

-<p class="caption">Figure 1: NetIDMgr notification icon</p>

-</div>

-

-<p>When NetIDMgr is running, it places an icon in the system

-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>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 Network Identity Manager from the Start Menu or command line</h3>

-

-<div class="sidebar">

-<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

-login to Windows, then you need to start it either from the

-commandline or the start menu.  The start menu application icon is

-under "Kerberos for Windows" as shown in figure 2.</p>

-

-<p>Alternatively, you can type 'netidmgr' at a command shell to start

-NetIDMgr as well.  When starting this way, you may specify additional

-<a href="cmdline_netidmgr.htm">command line options</a>.</p>

-

-<h3>Configuring startup options</h3>

-

-<p>

-Note that you can configure options related to the startup of NetIDMgr

-by using the NetIDMgr configuration dialog box.  You can use the menu

-items under the <span class="pre">Options</span> menu to invoke the

-configuration dialog.

-</p>

-

-<p>

-Only one instance of NetIDMgr can be running at any one time.

-Attempting to start NetIDMgr while it is still running will not do

-anything, unless you provide any command line options that trigger

-some action in the running application instance.  If more than one

-version of NetIDMgr is installed on the system, and the older version

-is running at the time the newer version is started, the older version

-will exit allowing the newer version to take over.

-</p>

-

-</body>

+<html>
+<head>
+  <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>Network Identity Manager - Starting Network Identity Manager</h1>
+
+<h3>Opening the Network Identity Manager window from the notification icon</h3>
+
+<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.png"/>
+<p class="caption">Figure 1: NetIDMgr notification icon</p>
+</div>
+
+<p>When NetIDMgr is running, it places an icon in the system
+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>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 Network Identity Manager from the Start Menu or command line</h3>
+
+<div class="sidebar">
+<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
+login to Windows, then you need to start it either from the
+commandline or the start menu.  The start menu application icon is
+under "Kerberos for Windows" as shown in figure 2.</p>
+
+<p>Alternatively, you can type 'netidmgr' at a command shell to start
+NetIDMgr as well.  When starting this way, you may specify additional
+<a href="cmdline_netidmgr.htm">command line options</a>.</p>
+
+<h3>Configuring startup options</h3>
+
+<p>
+Note that you can configure options related to the startup of NetIDMgr
+by using the NetIDMgr configuration dialog box.  You can use the menu
+items under the <span class="pre">Options</span> menu to invoke the
+configuration dialog.
+</p>
+
+<p>
+Only one instance of NetIDMgr can be running at any one time.
+Attempting to start NetIDMgr while it is still running will not do
+anything, unless you provide any command line options that trigger
+some action in the running application instance.  If more than one
+version of NetIDMgr is installed on the system, and the older version
+is running at the time the newer version is started, the older version
+will exit allowing the newer version to take over.
+</p>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/html/using.htm b/src/windows/identity/help/html/using.htm
index 103ae5fdf..c9808effa 100644
--- a/src/windows/identity/help/html/using.htm
+++ b/src/windows/identity/help/html/using.htm
@@ -1,57 +1,57 @@
-<html>

-<head>

-  <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 Network Identity Manager</h1>

-

-<p>

-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 the NetIDMgr window is visible, you will be presented with a view

-of your existing identities, 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>

-

-<p>

-Brief overviews of how to perform common tasks are linked below:

-</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>

-  <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 

-<a href="howdoi.htm">How do I...</a> section.</p>

-

-</body>

+<html>
+<head>
+  <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 Network Identity Manager</h1>
+
+<p>
+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 the NetIDMgr window is visible, you will be presented with a view
+of your existing identities, 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>
+
+<p>
+Brief overviews of how to perform common tasks are linked below:
+</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>
+  <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 
+<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 263be8c47..a7b1f53b1 100644
--- a/src/windows/identity/help/html/welcome.htm
+++ b/src/windows/identity/help/html/welcome.htm
@@ -1,130 +1,130 @@
-<html>

-<head>

-  <title>Welcome to the Network Identity Manager</title>

-  <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>

-

-<div class="inline">

-<img src="images/logo.jpg" width="100" height="100"/>

-</div>

-

-<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>

-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>

-<li><a href="bugs.htm">Reporting problems</a></li>

-</ul>

-

-<h3>Getting started</h3>

-

-<ul>

-<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 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>

-Contact the <a

-href="mailto:netidmgr@secure-endpoints.com">netidmgr@secure-endpoints.com</a>

-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/kerberos</a>:

-

-MIT Kerberos distribution

-</li>

-<li><a class="external" href="http://www.openafs.org/windows.html">http://www.openafs.org/windows.html</a>:

-

-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>
+<head>
+  <title>Welcome to the Network Identity Manager</title>
+  <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>
+
+<div class="inline">
+<img src="images/logo.jpg" width="100" height="100"/>
+</div>
+
+<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>
+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>
+<li><a href="bugs.htm">Reporting problems</a></li>
+</ul>
+
+<h3>Getting started</h3>
+
+<ul>
+<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 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>
+Contact the <a
+href="mailto:netidmgr@secure-endpoints.com">netidmgr@secure-endpoints.com</a>
+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/kerberos</a>:
+
+MIT Kerberos distribution
+</li>
+<li><a class="external" href="http://www.openafs.org/windows.html">http://www.openafs.org/windows.html</a>:
+
+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 211120aa3..dd9885446 100644
--- a/src/windows/identity/help/html/wnd_main.htm
+++ b/src/windows/identity/help/html/wnd_main.htm
@@ -1,87 +1,87 @@
-<html>

-<head>

-  <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">

-  

-<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">

-  <param name="Keyword" value="Application Window Basic View">

-  <param name="Keyword" value="Application Windows Advanced View">

-  <param name="Keyword" value="Identity Views">

-</OBJECT>

-

-</head>

-<body>

-

-<h1>Network Identity Manager - Application Window</h1>

-

-<p>The application window of Network Identity Manager can be displayed in two modes: <b>basic</b> and <b>advanced</b>.</p>

-

-<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>

-  <li>Tool bar</li>

-  <li>Credentials list</li>

-

-</ol>

-

-<h3>Identity views</h3>

-

-<p>

-The default credentials view organizes them grouped by identity name

-and then by credential type.  Each credential is then shown under each

-group heading sorted by the credential name.  The default headings for

-the credential view provides you with a minimal amount of information

-to reduce clutter.  If you wish you can add columns to the display

-using the <span class="pre">Choose columns...</span> action on the

-<span class="pre"><a href="menu_view.htm">View</a></span> menu.

-</p>

-

-<p>

-The header backgrounds and the credential rows change color if the

-credentials are about to expire or are expired.  

-

-<ul> 

-

-<li> <span style="background-color:#fbc74d">Headers</span> mean that

-credentials at that level will expire unless renewed.  Credentials

-will have a warning icon next to them.<br/>

-

-The threshold for this can be set as the <span class="pre">Warn</span>

-parameter in the <span class="pre">Notifications</span> configuration

-panel.</li>

-

-<li> <span style="background-color:#f08575">Headers</span> mean that

-credentials at that level will expire in a few minutes.  Credentials

-will have a critical icon next to them.<br/>

-

-The threshold for this can be set as the <span class="pre">Warn

-again</span> parameter in the <span class="pre">Notifications</span>

-configuration panel.  </li>

-

-<li> <span style="background-color:#ff9090">Headers</span> mean that

-the credentials at that level have expired.  Credentials will have an

-expired icon next to them.<br/>

-

-The threshold for this is always zero.

-</li>

-

-</ul> 

-</p> 

-

-</body>

+<html>
+<head>
+  <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">
+  
+<Object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+  <param name="Keyword" value="Application Window Basic View">
+  <param name="Keyword" value="Application Windows Advanced View">
+  <param name="Keyword" value="Identity Views">
+</OBJECT>
+
+</head>
+<body>
+
+<h1>Network Identity Manager - Application Window</h1>
+
+<p>The application window of Network Identity Manager can be displayed in two modes: <b>basic</b> and <b>advanced</b>.</p>
+
+<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>
+  <li>Tool bar</li>
+  <li>Credentials list</li>
+
+</ol>
+
+<h3>Identity views</h3>
+
+<p>
+The default credentials view organizes them grouped by identity name
+and then by credential type.  Each credential is then shown under each
+group heading sorted by the credential name.  The default headings for
+the credential view provides you with a minimal amount of information
+to reduce clutter.  If you wish you can add columns to the display
+using the <span class="pre">Choose columns...</span> action on the
+<span class="pre"><a href="menu_view.htm">View</a></span> menu.
+</p>
+
+<p>
+The header backgrounds and the credential rows change color if the
+credentials are about to expire or are expired.  
+
+<ul> 
+
+<li> <span style="background-color:#fbc74d">Headers</span> mean that
+credentials at that level will expire unless renewed.  Credentials
+will have a warning icon next to them.<br/>
+
+The threshold for this can be set as the <span class="pre">Warn</span>
+parameter in the <span class="pre">Notifications</span> configuration
+panel.</li>
+
+<li> <span style="background-color:#f08575">Headers</span> mean that
+credentials at that level will expire in a few minutes.  Credentials
+will have a critical icon next to them.<br/>
+
+The threshold for this can be set as the <span class="pre">Warn
+again</span> parameter in the <span class="pre">Notifications</span>
+configuration panel.  </li>
+
+<li> <span style="background-color:#ff9090">Headers</span> mean that
+the credentials at that level have expired.  Credentials will have an
+expired icon next to them.<br/>
+
+The threshold for this is always zero.
+</li>
+
+</ul> 
+</p> 
+
+</body>
 </html>
\ No newline at end of file
diff --git a/src/windows/identity/help/netidmgr.hhp b/src/windows/identity/help/netidmgr.hhp
index 9f2ae7332..b22e07a0a 100644
--- a/src/windows/identity/help/netidmgr.hhp
+++ b/src/windows/identity/help/netidmgr.hhp
@@ -1,35 +1,35 @@
-[OPTIONS]

-Auto Index=Yes

-Compatibility=1.1 or later

-Compiled file=netidmgr.chm

-Contents file=toc.hhc

-Default Window=MainHelpWnd

-Default topic=html/welcome.htm

-Display compile progress=No

-Index file=Index.hhk

-Language=0x409 English (United States)

-Title=NetIDMgr

-

-[WINDOWS]

-MainHelpWnd="NetIDMgr Help","toc.hhc","Index.hhk","html/welcome.htm","html/welcome.htm",,,,,0x42120,,0x384e,[271,372,593,566],0x830000,,,,,,0

-

-

-[ALIAS]

-IDH_ACTION_NEW_ID=html\act_new_creds.htm

-IDH_ACTION_PASSWD_ID=html\act_chpw.htm

-IDH_WELCOME=html\welcome.htm

-

-[MAP]

-#include khhelp.h

-

-[TEXT POPUPS]

-khhelp.h

-popups_newcreds.txt

-popups_password.txt

-

-[INFOTYPES]

-Category:Concepts

-CategoryDesc:Authentication, authorization and related concepts.

-Category:Usage

-CategoryDesc:Usage instructions for NetIDMgr

-

+[OPTIONS]
+Auto Index=Yes
+Compatibility=1.1 or later
+Compiled file=netidmgr.chm
+Contents file=toc.hhc
+Default Window=MainHelpWnd
+Default topic=html/welcome.htm
+Display compile progress=No
+Index file=Index.hhk
+Language=0x409 English (United States)
+Title=NetIDMgr
+
+[WINDOWS]
+MainHelpWnd="NetIDMgr Help","toc.hhc","Index.hhk","html/welcome.htm","html/welcome.htm",,,,,0x42120,,0x384e,[271,372,593,566],0x830000,,,,,,0
+
+
+[ALIAS]
+IDH_ACTION_NEW_ID=html\act_new_creds.htm
+IDH_ACTION_PASSWD_ID=html\act_chpw.htm
+IDH_WELCOME=html\welcome.htm
+
+[MAP]
+#include khhelp.h
+
+[TEXT POPUPS]
+khhelp.h
+popups_newcreds.txt
+popups_password.txt
+
+[INFOTYPES]
+Category:Concepts
+CategoryDesc:Authentication, authorization and related concepts.
+Category:Usage
+CategoryDesc:Usage instructions for NetIDMgr
+
diff --git a/src/windows/identity/help/popups.txt b/src/windows/identity/help/popups.txt
index 7d58703b1..564d4ddac 100644
--- a/src/windows/identity/help/popups.txt
+++ b/src/windows/identity/help/popups.txt
@@ -1 +1 @@
-foo 

+foo 
diff --git a/src/windows/identity/help/popups_newcreds.txt b/src/windows/identity/help/popups_newcreds.txt
index 74a39360e..1ab97f378 100644
--- a/src/windows/identity/help/popups_newcreds.txt
+++ b/src/windows/identity/help/popups_newcreds.txt
@@ -1,30 +1,30 @@
-.topic IDH_NC_TABMAIN

-Opens the identity selection panel.

-

-.topic IDH_NC_TABBUTTON

-Opens the option panel for this credentials type.

-

-.topic IDH_NC_OK

-Obtains new credentials using the information that you provided.

-

-.topic IDH_NC_CANCEL

-Cancels the new credentials operation.

-

-.topic IDH_NC_HELP

-Provides help for this dialog box.

-

-.topic IDH_NC_ADVANCED

-Expands the dialog and allows you to set additional

-options for the credentials that will be obtained

-by this dialog.

-

-.topic IDH_NC_CREDWND

-Provides an overview of the credentials that will be obtained

-after the successful completion of the new credentials dialog.

-Clicking on the hyperlinks will take you to the corresponding

-credentials option panels where you will be able to set

-additional options for each type.

-

-.topic IDH_NC_SETDEF

-If checked, once the credentials acquisition operation completes, the

-identity will be set as the default.

+.topic IDH_NC_TABMAIN
+Opens the identity selection panel.
+
+.topic IDH_NC_TABBUTTON
+Opens the option panel for this credentials type.
+
+.topic IDH_NC_OK
+Obtains new credentials using the information that you provided.
+
+.topic IDH_NC_CANCEL
+Cancels the new credentials operation.
+
+.topic IDH_NC_HELP
+Provides help for this dialog box.
+
+.topic IDH_NC_ADVANCED
+Expands the dialog and allows you to set additional
+options for the credentials that will be obtained
+by this dialog.
+
+.topic IDH_NC_CREDWND
+Provides an overview of the credentials that will be obtained
+after the successful completion of the new credentials dialog.
+Clicking on the hyperlinks will take you to the corresponding
+credentials option panels where you will be able to set
+additional options for each type.
+
+.topic IDH_NC_SETDEF
+If checked, once the credentials acquisition operation completes, the
+identity will be set as the default.
diff --git a/src/windows/identity/help/popups_password.txt b/src/windows/identity/help/popups_password.txt
index e92b30e91..567236391 100644
--- a/src/windows/identity/help/popups_password.txt
+++ b/src/windows/identity/help/popups_password.txt
@@ -1,19 +1,19 @@
-.topic IDH_NC_TABMAIN

-Switches to the identity selection panel.

-

-.topic IDH_NC_TABBUTTON

-Switches to the options pangel for this credential type.

-

-.topic IDH_NC_OK

-Change the password for the selected identity.

-

-.topic IDH_NC_CANCEL

-Cancel the change password operation.

-

-.topic IDH_NC_ADVANCED

-Expand the dialog and make the option pages visible for the credential

-types for which you will be changing the password for.

-

-.topic IDH_NC_CREDWND

-A brief overview of the credential types and the identities for which

-the password will be changed.

+.topic IDH_NC_TABMAIN
+Switches to the identity selection panel.
+
+.topic IDH_NC_TABBUTTON
+Switches to the options pangel for this credential type.
+
+.topic IDH_NC_OK
+Change the password for the selected identity.
+
+.topic IDH_NC_CANCEL
+Cancel the change password operation.
+
+.topic IDH_NC_ADVANCED
+Expand the dialog and make the option pages visible for the credential
+types for which you will be changing the password for.
+
+.topic IDH_NC_CREDWND
+A brief overview of the credential types and the identities for which
+the password will be changed.
diff --git a/src/windows/identity/help/toc.hhc b/src/windows/identity/help/toc.hhc
index 6c3876ef1..34d0f0a4d 100644
--- a/src/windows/identity/help/toc.hhc
+++ b/src/windows/identity/help/toc.hhc
@@ -1,144 +1,144 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

-<HTML>

-<HEAD>

-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">

-<!-- Sitemap 1.0 -->

-</HEAD><BODY>

-<OBJECT type="text/site properties">

-	<param name="Category" value="Concepts">

-	<param name="CategoryDesc" value="Authentication, authorization and related concepts.">

-	<param name="Category" value="Usage">

-	<param name="CategoryDesc" value="Usage instructions for Network Identity Manager">

-	<param name="Window Styles" value="0x800025">

-</OBJECT>

-<UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Welcome to Network Identity Manager">

-		<param name="Local" value="html\welcome.htm">

-		</OBJECT>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="How do I ...">

-		<param name="Local" value="html\howdoi.htm">

-		</OBJECT>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="About NetIDMgr">

-		<param name="Local" value="html\about_netidmgr.htm">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Reporting bugs">

-			<param name="Local" value="html\bugs.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="License agreement">

-			<param name="Local" value="html\copyright.htm">

-			</OBJECT>

-	</UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Concepts">

-		<param name="Local" value="html\concepts.htm">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Identities">

-			<param name="Local" value="html\concept_identity.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Identity Provider">

-			<param name="Local" value="html\concept_ident_pro.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Credentials Provider">

-			<param name="Local" value="html\concept_cred_pro.htm">

-			</OBJECT>

-	</UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Using NetIDMgr">

-		<param name="Local" value="html\using.htm">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Starting">

-			<param name="Local" value="html\use_start.htm">

-			</OBJECT>

-                <LI> <OBJECT type="text/sitemap">

-                        <param name="Name" value="Notification icon">

-                        <param name="Local" value="html\use_icon.htm">

-                        </OBJECT>

-

-                <LI> <OBJECT type="text/sitemap">

-                        <param name="Name" value="Managing the credentials view layout">

-                        <param name="Local" value="html\use_layout.htm">

-                        </OBJECT>

-

-                <LI> <OBJECT type="text/sitemap">

-                        <param name="Name" value="Configuring NetIDMgr and identities">

-                        <param name="Local" value="html\use_config.htm">

-                        </OBJECT>

-	</UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Menus and Toolbars">

-		<param name="Local" value="html\menu_all.htm">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="File Menu">

-			<param name="Local" value="html\menu_file.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Credential menu">

-			<param name="Local" value="html\menu_credential.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="View Menu">

-			<param name="Local" value="html\menu_view.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Options Menu">

-			<param name="Local" value="html\menu_options.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Help Menu">

-			<param name="Local" value="html\menu_help.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Standard Toolbar">

-			<param name="Local" value="html\tb_standard.htm">

-			</OBJECT>

-	</UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Actions">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="New Credentials">

-			<param name="Local" value="html\act_new_creds.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Renew Credentials">

-			<param name="Local" value="html\act_renew_creds.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Destroy Credentials">

-			<param name="Local" value="html\act_destroy_creds.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Set As Default">

-			<param name="Local" value="html\act_set_default.htm">

-			</OBJECT>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Change Password">

-			<param name="Local" value="html\act_chpw.htm">

-			</OBJECT>

-	</UL>

-	<LI> <OBJECT type="text/sitemap">

-		<param name="Name" value="Windows and dialogs">

-		</OBJECT>

-	<UL>

-		<LI> <OBJECT type="text/sitemap">

-			<param name="Name" value="Main Window">

-			<param name="Local" value="html\wnd_main.htm">

-			</OBJECT>

-	</UL>

-</UL>

-</BODY></HTML>

+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<OBJECT type="text/site properties">
+	<param name="Category" value="Concepts">
+	<param name="CategoryDesc" value="Authentication, authorization and related concepts.">
+	<param name="Category" value="Usage">
+	<param name="CategoryDesc" value="Usage instructions for Network Identity Manager">
+	<param name="Window Styles" value="0x800025">
+</OBJECT>
+<UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Welcome to Network Identity Manager">
+		<param name="Local" value="html\welcome.htm">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="How do I ...">
+		<param name="Local" value="html\howdoi.htm">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="About NetIDMgr">
+		<param name="Local" value="html\about_netidmgr.htm">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Reporting bugs">
+			<param name="Local" value="html\bugs.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="License agreement">
+			<param name="Local" value="html\copyright.htm">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Concepts">
+		<param name="Local" value="html\concepts.htm">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Identities">
+			<param name="Local" value="html\concept_identity.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Identity Provider">
+			<param name="Local" value="html\concept_ident_pro.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Credentials Provider">
+			<param name="Local" value="html\concept_cred_pro.htm">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Using NetIDMgr">
+		<param name="Local" value="html\using.htm">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Starting">
+			<param name="Local" value="html\use_start.htm">
+			</OBJECT>
+                <LI> <OBJECT type="text/sitemap">
+                        <param name="Name" value="Notification icon">
+                        <param name="Local" value="html\use_icon.htm">
+                        </OBJECT>
+
+                <LI> <OBJECT type="text/sitemap">
+                        <param name="Name" value="Managing the credentials view layout">
+                        <param name="Local" value="html\use_layout.htm">
+                        </OBJECT>
+
+                <LI> <OBJECT type="text/sitemap">
+                        <param name="Name" value="Configuring NetIDMgr and identities">
+                        <param name="Local" value="html\use_config.htm">
+                        </OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Menus and Toolbars">
+		<param name="Local" value="html\menu_all.htm">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="File Menu">
+			<param name="Local" value="html\menu_file.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Credential menu">
+			<param name="Local" value="html\menu_credential.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="View Menu">
+			<param name="Local" value="html\menu_view.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Options Menu">
+			<param name="Local" value="html\menu_options.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Help Menu">
+			<param name="Local" value="html\menu_help.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Standard Toolbar">
+			<param name="Local" value="html\tb_standard.htm">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Actions">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="New Credentials">
+			<param name="Local" value="html\act_new_creds.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Renew Credentials">
+			<param name="Local" value="html\act_renew_creds.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Destroy Credentials">
+			<param name="Local" value="html\act_destroy_creds.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Set As Default">
+			<param name="Local" value="html\act_set_default.htm">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Change Password">
+			<param name="Local" value="html\act_chpw.htm">
+			</OBJECT>
+	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Windows and dialogs">
+		</OBJECT>
+	<UL>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Main Window">
+			<param name="Local" value="html\wnd_main.htm">
+			</OBJECT>
+	</UL>
+</UL>
+</BODY></HTML>
diff --git a/src/windows/identity/include/Makefile b/src/windows/identity/include/Makefile
index 21e5f7848..70fe8c408 100644
--- a/src/windows/identity/include/Makefile
+++ b/src/windows/identity/include/Makefile
@@ -1,38 +1,38 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=include

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\khdefs.h	\

-	$(INCDIR)\kherror.h	\

-	$(INCDIR)\khlist.h	\

-	$(INCDIR)\khmsgtypes.h	\

-	$(INCDIR)\netidmgr.h

-

-all: $(INCFILES)

-

-clean::

-	if exist "$(INCDIR)" $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=include
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\khdefs.h	\
+	$(INCDIR)\kherror.h	\
+	$(INCDIR)\khlist.h	\
+	$(INCDIR)\khmsgtypes.h	\
+	$(INCDIR)\netidmgr.h
+
+all: $(INCFILES)
+
+clean::
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
diff --git a/src/windows/identity/kconfig/Makefile b/src/windows/identity/kconfig/Makefile
index 2880787d8..bc4667954 100644
--- a/src/windows/identity/kconfig/Makefile
+++ b/src/windows/identity/kconfig/Makefile
@@ -1,51 +1,51 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=kconfig

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\kconfig.h

-

-OBJFILES= \

-	$(OBJ)\kconfigmain.obj \

-	$(OBJ)\api.obj

-

-all: mkdirs $(INCFILES) $(OBJFILES)

-

-clean::

-	if exist "$(INCDIR)" $(RM) $(INCFILES)

-

-# Tests

-

-test:: util_test

-

-util_test: $(OBJ)\utiltest.exe

-	$(OBJ)\utiltest.exe

-

-$(OBJ)\utiltest.exe: $(OBJ)\utiltest.obj

-	$(EXECONLINK) $(OBJFILES)

-

-$(OBJ)\utiltest.obj: test\utiltest.c

-	$(C2OBJ)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=kconfig
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\kconfig.h
+
+OBJFILES= \
+	$(OBJ)\kconfigmain.obj \
+	$(OBJ)\api.obj
+
+all: mkdirs $(INCFILES) $(OBJFILES)
+
+clean::
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
+
+# Tests
+
+test:: util_test
+
+util_test: $(OBJ)\utiltest.exe
+	$(OBJ)\utiltest.exe
+
+$(OBJ)\utiltest.exe: $(OBJ)\utiltest.obj
+	$(EXECONLINK) $(OBJFILES)
+
+$(OBJ)\utiltest.obj: test\utiltest.c
+	$(C2OBJ)
diff --git a/src/windows/identity/kcreddb/Makefile b/src/windows/identity/kcreddb/Makefile
index f48226015..abf5efa0a 100644
--- a/src/windows/identity/kcreddb/Makefile
+++ b/src/windows/identity/kcreddb/Makefile
@@ -1,53 +1,53 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=kcreddb

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\kcreddb.h

-

-OBJFILES= \

-	$(OBJ)\buf.obj \

-	$(OBJ)\attrib.obj \

-	$(OBJ)\credential.obj \

-	$(OBJ)\credset.obj \

-	$(OBJ)\credtype.obj \

-	$(OBJ)\identity.obj \

-	$(OBJ)\init.obj \

-	$(OBJ)\kcreddbmain.obj \

-	$(OBJ)\type.obj \

-	$(OBJ)\kcdbconfig.obj

-

-$(OBJ)\kcdbconfig.c: kcdbconfig.csv $(CONFDIR)\csvschema.cfg

-	$(CCSV) $** $@

-

-$(OBJ)\kcredres.res: lang\en_us\kcredres.rc

-	$(RC2RES)

-

-all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=kcreddb
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\kcreddb.h
+
+OBJFILES= \
+	$(OBJ)\buf.obj \
+	$(OBJ)\attrib.obj \
+	$(OBJ)\credential.obj \
+	$(OBJ)\credset.obj \
+	$(OBJ)\credtype.obj \
+	$(OBJ)\identity.obj \
+	$(OBJ)\init.obj \
+	$(OBJ)\kcreddbmain.obj \
+	$(OBJ)\type.obj \
+	$(OBJ)\kcdbconfig.obj
+
+$(OBJ)\kcdbconfig.c: kcdbconfig.csv $(CONFDIR)\csvschema.cfg
+	$(CCSV) $** $@
+
+$(OBJ)\kcredres.res: lang\en_us\kcredres.rc
+	$(RC2RES)
+
+all: mkdirs $(INCFILES) $(OBJ)\kcredres.res $(OBJFILES)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)
diff --git a/src/windows/identity/kcreddb/kcdbconfig.csv b/src/windows/identity/kcreddb/kcdbconfig.csv
index bd1fc6f33..f4b52eea2 100644
--- a/src/windows/identity/kcreddb/kcdbconfig.csv
+++ b/src/windows/identity/kcreddb/kcdbconfig.csv
@@ -1,15 +1,15 @@
-Name,Type,Value,Description

-KCDB,KC_SPACE,0,Khimaira Configuration DB

-  Identity,KC_SPACE,0,Configuration space for identities

-    _Schema,KC_SPACE,0,Schema for identities

-      Sticky,KC_INT32,0,Boolean. Is this a sticky identity?

-      Monitor,KC_INT32,1,Boolean. Enables monitoring the identity

-      WarnThreshold,KC_INT32,900,In seconds

-      AllowWarn,KC_INT32,1,Boolean. Allow warning.

-      CriticalThreshold,KC_INT32,60,In seconds

-      AllowCritical,KC_INT32,1,Boolean. Allow critical.

-      AutoRenewThreshold,KC_INT32,60,In seconds

-      AllowAutoRenew,KC_INT32,1,Boolean.

-    _Schema,KC_ENDSPACE,0,

-  Identity,KC_ENDSPACE,0,

-KCDB,KC_ENDSPACE,0,

+Name,Type,Value,Description
+KCDB,KC_SPACE,0,Khimaira Configuration DB
+  Identity,KC_SPACE,0,Configuration space for identities
+    _Schema,KC_SPACE,0,Schema for identities
+      Sticky,KC_INT32,0,Boolean. Is this a sticky identity?
+      Monitor,KC_INT32,1,Boolean. Enables monitoring the identity
+      WarnThreshold,KC_INT32,900,In seconds
+      AllowWarn,KC_INT32,1,Boolean. Allow warning.
+      CriticalThreshold,KC_INT32,60,In seconds
+      AllowCritical,KC_INT32,1,Boolean. Allow critical.
+      AutoRenewThreshold,KC_INT32,60,In seconds
+      AllowAutoRenew,KC_INT32,1,Boolean.
+    _Schema,KC_ENDSPACE,0,
+  Identity,KC_ENDSPACE,0,
+KCDB,KC_ENDSPACE,0,
diff --git a/src/windows/identity/kcreddb/lang/en_us/kcredres.rc b/src/windows/identity/kcreddb/lang/en_us/kcredres.rc
index 4c221eeeb..6dce39513 100644
--- a/src/windows/identity/kcreddb/lang/en_us/kcredres.rc
+++ b/src/windows/identity/kcreddb/lang/en_us/kcredres.rc
@@ -1,130 +1,130 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "..\..\langres.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\langres.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\langres.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_CREDDB              "Khimaira Credentials Database"

-    IDS_NAME                "Service Name"

-    IDS_IDENTITY            "Identity"

-    IDS_ISSUED              "Issued on"

-    IDS_EXPIRES             "Expires on"

-    IDS_TIMELEFT            "Time Remaining"

-    IDS_LOCATION            "Location"

-    IDS_PARENT              "Parent"

-    IDS_TYPE                "Type"

-    IDS_IVL_EXPIRED         "(Expired)"

-    IDS_IVL_D_H             "%I64u days %I64u hours"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_IVL_H_M             "%I64u hours %I64u mins"

-    IDS_IVL_M_S             "%I64u mins %I64u secs"

-    IDS_IVL_S               "%I64u seconds"

-    IDS_IVL_UNKNOWN         "(Unknown)"

-    IDS_LIFETIME            "Lifetime"

-    IDS_IVL_1D              "1 day"

-    IDS_IVL_1H              "1 hour"

-    IDS_IVL_1M              "1 minute"

-    IDS_IVL_1S              "1 second"

-    IDS_IVL_D               "%I64u days"

-    IDS_IVL_H               "%I64u hours"

-    IDS_IVL_M               "%I64u minutes"

-    IDS_IVL_S_SPEC          "s,sec,second,seconds,secs"

-    IDS_IVL_M_SPEC          "m,min,mins,minutes"

-    IDS_IVL_H_SPEC          "h,hrs,hours"

-    IDS_IVL_D_SPEC          "d,day,days,ds"

-END

-

-STRINGTABLE 

-BEGIN

-    128                     "w,wk,wks,weeks"

-    IDS_FLAGS               "Flags"

-    IDS_RENEW_TIMELEFT      "Renewable Time left"

-    IDS_RENEW_EXPIRES       "Renewable time expires"

-    IDS_RENEW_LIFETIME      "Renewable lifetime"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "..\..\langres.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\..\\langres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\..\\langres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_CREDDB              "Khimaira Credentials Database"
+    IDS_NAME                "Service Name"
+    IDS_IDENTITY            "Identity"
+    IDS_ISSUED              "Issued on"
+    IDS_EXPIRES             "Expires on"
+    IDS_TIMELEFT            "Time Remaining"
+    IDS_LOCATION            "Location"
+    IDS_PARENT              "Parent"
+    IDS_TYPE                "Type"
+    IDS_IVL_EXPIRED         "(Expired)"
+    IDS_IVL_D_H             "%I64u days %I64u hours"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_IVL_H_M             "%I64u hours %I64u mins"
+    IDS_IVL_M_S             "%I64u mins %I64u secs"
+    IDS_IVL_S               "%I64u seconds"
+    IDS_IVL_UNKNOWN         "(Unknown)"
+    IDS_LIFETIME            "Lifetime"
+    IDS_IVL_1D              "1 day"
+    IDS_IVL_1H              "1 hour"
+    IDS_IVL_1M              "1 minute"
+    IDS_IVL_1S              "1 second"
+    IDS_IVL_D               "%I64u days"
+    IDS_IVL_H               "%I64u hours"
+    IDS_IVL_M               "%I64u minutes"
+    IDS_IVL_S_SPEC          "s,sec,second,seconds,secs"
+    IDS_IVL_M_SPEC          "m,min,mins,minutes"
+    IDS_IVL_H_SPEC          "h,hrs,hours"
+    IDS_IVL_D_SPEC          "d,day,days,ds"
+END
+
+STRINGTABLE 
+BEGIN
+    128                     "w,wk,wks,weeks"
+    IDS_FLAGS               "Flags"
+    IDS_RENEW_TIMELEFT      "Renewable Time left"
+    IDS_RENEW_EXPIRES       "Renewable time expires"
+    IDS_RENEW_LIFETIME      "Renewable lifetime"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/src/windows/identity/kherr/Makefile b/src/windows/identity/kherr/Makefile
index 0320768b1..3972235b3 100644
--- a/src/windows/identity/kherr/Makefile
+++ b/src/windows/identity/kherr/Makefile
@@ -1,44 +1,44 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=kherr

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\kherr.h

-

-OBJFILES= \

-	$(OBJ)\kherrmain.obj \

-	$(OBJ)\kherr.obj

-

-LIBFILES=

-

-SDKLIBFILES= \

-	strsafe.lib

-

-all: mkdirs $(INCFILES) $(OBJFILES)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=kherr
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\kherr.h
+
+OBJFILES= \
+	$(OBJ)\kherrmain.obj \
+	$(OBJ)\kherr.obj
+
+LIBFILES=
+
+SDKLIBFILES= \
+	strsafe.lib
+
+all: mkdirs $(INCFILES) $(OBJFILES)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)
diff --git a/src/windows/identity/kmm/Makefile b/src/windows/identity/kmm/Makefile
index 7daf5174b..6fd85ad80 100644
--- a/src/windows/identity/kmm/Makefile
+++ b/src/windows/identity/kmm/Makefile
@@ -1,55 +1,55 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=kmm

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\kmm.h \

-	$(INCDIR)\kplugin.h

-

-OBJFILES= \

-	$(OBJ)\kmmmain.obj \

-	$(OBJ)\kmm.obj \

-	$(OBJ)\kmm_plugin.obj \

-	$(OBJ)\kmm_module.obj \

-	$(OBJ)\kmm_reg.obj \

-	$(OBJ)\kmm_registrar.obj \

-	$(OBJ)\kmmconfig.obj

-

-MSGRESFILE=$(OBJ)\kmm_msgs.res

-

-$(OBJ)\kmmconfig.c: kmmconfig.csv $(CONFDIR)\csvschema.cfg

-	$(CCSV) $** $@

-

-$(MSGRESFILE): $(OBJ)\kmm_msgs.rc

-

-$(OBJ)\kmm_msgs.rc: lang\kmm_msgs.mc

-	$(MC2RC)

-

-all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=kmm
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\kmm.h \
+	$(INCDIR)\kplugin.h
+
+OBJFILES= \
+	$(OBJ)\kmmmain.obj \
+	$(OBJ)\kmm.obj \
+	$(OBJ)\kmm_plugin.obj \
+	$(OBJ)\kmm_module.obj \
+	$(OBJ)\kmm_reg.obj \
+	$(OBJ)\kmm_registrar.obj \
+	$(OBJ)\kmmconfig.obj
+
+MSGRESFILE=$(OBJ)\kmm_msgs.res
+
+$(OBJ)\kmmconfig.c: kmmconfig.csv $(CONFDIR)\csvschema.cfg
+	$(CCSV) $** $@
+
+$(MSGRESFILE): $(OBJ)\kmm_msgs.rc
+
+$(OBJ)\kmm_msgs.rc: lang\kmm_msgs.mc
+	$(MC2RC)
+
+all: mkdirs $(INCFILES) $(MSGRESFILE) $(OBJFILES)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)
diff --git a/src/windows/identity/kmm/kmmconfig.csv b/src/windows/identity/kmm/kmmconfig.csv
index 43bb48cdc..dc812565e 100644
--- a/src/windows/identity/kmm/kmmconfig.csv
+++ b/src/windows/identity/kmm/kmmconfig.csv
@@ -1,47 +1,47 @@
-Name,Type,Value,Description

-PluginManager,KC_SPACE,0,Plugin Manager Configuration

-  Plugins,KC_SPACE,0,Plugin Specific configuration

-    PluginMaxFailureCount,KC_INT32,3,Maximum number of failure counts before plugin is disabled

-    PluginFailureCountResetTime,KC_INT64,36000,Time after first failure at which the failure count is reset

-    _Schema,KC_SPACE,0,Plugin schema

-      Module,KC_STRING,<module name>,The name of the module that registered this plugin

-      Description,KC_STRING,<Description>,Description of the plugin

-      Dependencies,KC_STRING,<Dependencies>,Multi string of plugin names of plugins that this plugin depends on

-      Type,KC_INT32,0,The type of the plugin

-#      Flags,KC_INT32,0,Flags (Deprecated)

-      Disabled,KC_INT32,0,Plug-in is disabled (Boolean)

-      NoUnload,KC_INT32,0,Do not unload the plugin (Boolean)

-      FailureCount,KC_INT32,0,Number of failed loads

-      FailureTime,KC_INT64,0,FILETIME of first failure

-      FailureReason,KC_INT32,0,Reason for first failure.  One of the plugin status values.

-      Parameters,KC_SPACE,0,Plugin parameters.  The schema beyond this is plugin dependent.

-      Parameters,KC_ENDSPACE,0,

-    _Schema,KC_ENDSPACE,0,

-  Plugins,KC_ENDSPACE,0,

-  Modules,KC_SPACE,0,Module Specific configuration

-    ModuleMaxFailureCount,KC_INT32,3,Maximum number of failure counts before module is disabled

-    ModuleFailureCountResetTime,KC_INT64,72000,Time after first failure at which the failure count is reset

-    _Schema,KC_SPACE,0,Module schema

-      ImagePath,KC_STRING,<Path to the library binary>,Path to the DLL (including DLL name)

-#      Flags,KC_INT32,0,Flags (Deprecated)

-      Disabled,KC_INT32,0,Module is disabled (Boolean)

-      FailureCount,KC_INT32,0,Number of failed loads

-      FailureTime,KC_INT64,0,FILETIME of first failure

-      FailureReason,KC_INT32,0,Reason for last failure.  One of the module status values.

-      PluginList,KC_STRING,<plugins>,List of plugins implemented in the module

-    _Schema,KC_ENDSPACE,0,

-# The OpenAFS plug-in is installed separately.

-#    OpenAFS,KC_SPACE,0,OpenAFS Module

-#      ImagePath,KC_STRING,afscred.dll,

-#      PluginList,KC_STRING,AfsCred,

-#    OpenAFS,KC_ENDSPACE,0,

-    MITKrb5,KC_SPACE,0,MIT Kerberos V

-      ImagePath,KC_STRING,krb5cred.dll,

-      PluginList,KC_STRING,Krb5Cred,

-    MITKrb5,KC_ENDSPACE,0,

-    MITKrb4,KC_SPACE,0,MIT Kerberos IV

-      ImagePath,KC_STRING,krb4cred.dll,

-      PluginList,KC_STRING,Krb4Cred,

-    MITKrb4,KC_ENDSPACE,0,

-  Modules,KC_ENDSPACE,0,

-PluginManager,KC_ENDSPACE,0,

+Name,Type,Value,Description
+PluginManager,KC_SPACE,0,Plugin Manager Configuration
+  Plugins,KC_SPACE,0,Plugin Specific configuration
+    PluginMaxFailureCount,KC_INT32,3,Maximum number of failure counts before plugin is disabled
+    PluginFailureCountResetTime,KC_INT64,36000,Time after first failure at which the failure count is reset
+    _Schema,KC_SPACE,0,Plugin schema
+      Module,KC_STRING,<module name>,The name of the module that registered this plugin
+      Description,KC_STRING,<Description>,Description of the plugin
+      Dependencies,KC_STRING,<Dependencies>,Multi string of plugin names of plugins that this plugin depends on
+      Type,KC_INT32,0,The type of the plugin
+#      Flags,KC_INT32,0,Flags (Deprecated)
+      Disabled,KC_INT32,0,Plug-in is disabled (Boolean)
+      NoUnload,KC_INT32,0,Do not unload the plugin (Boolean)
+      FailureCount,KC_INT32,0,Number of failed loads
+      FailureTime,KC_INT64,0,FILETIME of first failure
+      FailureReason,KC_INT32,0,Reason for first failure.  One of the plugin status values.
+      Parameters,KC_SPACE,0,Plugin parameters.  The schema beyond this is plugin dependent.
+      Parameters,KC_ENDSPACE,0,
+    _Schema,KC_ENDSPACE,0,
+  Plugins,KC_ENDSPACE,0,
+  Modules,KC_SPACE,0,Module Specific configuration
+    ModuleMaxFailureCount,KC_INT32,3,Maximum number of failure counts before module is disabled
+    ModuleFailureCountResetTime,KC_INT64,72000,Time after first failure at which the failure count is reset
+    _Schema,KC_SPACE,0,Module schema
+      ImagePath,KC_STRING,<Path to the library binary>,Path to the DLL (including DLL name)
+#      Flags,KC_INT32,0,Flags (Deprecated)
+      Disabled,KC_INT32,0,Module is disabled (Boolean)
+      FailureCount,KC_INT32,0,Number of failed loads
+      FailureTime,KC_INT64,0,FILETIME of first failure
+      FailureReason,KC_INT32,0,Reason for last failure.  One of the module status values.
+      PluginList,KC_STRING,<plugins>,List of plugins implemented in the module
+    _Schema,KC_ENDSPACE,0,
+# The OpenAFS plug-in is installed separately.
+#    OpenAFS,KC_SPACE,0,OpenAFS Module
+#      ImagePath,KC_STRING,afscred.dll,
+#      PluginList,KC_STRING,AfsCred,
+#    OpenAFS,KC_ENDSPACE,0,
+    MITKrb5,KC_SPACE,0,MIT Kerberos V
+      ImagePath,KC_STRING,krb5cred.dll,
+      PluginList,KC_STRING,Krb5Cred,
+    MITKrb5,KC_ENDSPACE,0,
+    MITKrb4,KC_SPACE,0,MIT Kerberos IV
+      ImagePath,KC_STRING,krb4cred.dll,
+      PluginList,KC_STRING,Krb4Cred,
+    MITKrb4,KC_ENDSPACE,0,
+  Modules,KC_ENDSPACE,0,
+PluginManager,KC_ENDSPACE,0,
diff --git a/src/windows/identity/kmm/lang/kmm_msgs.mc b/src/windows/identity/kmm/lang/kmm_msgs.mc
index a33c523ac..7d7b545c1 100644
--- a/src/windows/identity/kmm/lang/kmm_msgs.mc
+++ b/src/windows/identity/kmm/lang/kmm_msgs.mc
@@ -1,259 +1,259 @@
-; // ** kmm_msgs.mc 

-

-; /* Since .mc files can contain strings from any language, we define

-; all our messages in one file in the /lang/ directory instead of

-; language specific subdirectories. */

-

-; /* The type is set to (wchar_t *) because that's what we will be

-; feeding kherr_report() function. */

-

-MessageIdTypedef=LPWSTR

-

-; /* Severity values as defined in the message definition file are

-; currently ignored. */

-

-SeverityNames=(

-        Success=0x0

-)

-

-LanguageNames=(

-        English=0x409:MSG_ENU

-)

-

-OutputBase=16

-

-; /* Actual messages start here */

-

-MessageId=1

-Severity=Success

-SymbolicName=MSG_INITIAL

-Language=English

-Initial placeholder message

-.

-

-MessageId=

-SymbolicName=MSG_LOAD_DEFAULT

-Language=English

-Load default modules

-.

-

-MessageId=

-SymbolicName=MSG_INIT_MODULE

-Language=English

-Initializing module [%1]

-.

-

-MessageId=

-SymbolicName=MSG_IM_GET_CONFIG

-Language=English

-Can't get configuration for modules

-.

-

-MessageId=

-SymbolicName=MSG_IM_NOT_PREINIT

-Language=English

-Module is not in PREINIT state.  Current state=[%1!d!]

-.

-

-MessageId=

-SymbolicName=MSG_IM_NOT_REGISTERED

-Language=English

-Module is not registered

-.

-

-MessageId=

-SymbolicName=MSG_IM_DISABLED

-Language=English

-Module is disabled

-.

-

-MessageId=

-SymbolicName=MSG_IM_MAX_FAIL

-Language=English

-Module has failed too many times

-.

-

-MessageId=

-SymbolicName=MSG_IM_INVALID_MODULE

-Language=English

-The DLL containing the module was not of the correct format.

-.

-

-MessageId=

-SymbolicName=MSG_IM_INCOMPATIBLE

-Language=English 

-The DLL containing the module was not compatible with this version of NetIDMgr.

-.

-

-Messageid=

-SymbolicName=MSG_IM_NOT_FOUND

-Language=English

-Module binary was not found.  Checked path [%1]

-.

-

-MessageId=

-SymbolicName=MSG_IM_NO_ENTRY

-Language=English

-Entry point not found.  Checked entry point [%1]

-.

-

-MessageId=

-SymbolicName=MSG_IM_INIT_FAIL

-Language=English

-Module initialization entry point returned failure code [%1!d!]

-.

-

-MessageId=

-SymbolicName=MSG_IM_NO_PLUGINS

-Language=English

-No plugins were registerd by the module

-.

-

-MessageId=

-SymbolicName=MSG_IM_MOD_STATE

-Language=English

-Module [%1] is in state [%2!d!]

-.

-

-MessageId=

-SymbolicName=MSG_IMERR_TITLE

-Language=English

-Failed to load module %1!s!

-.

-

-MessageId=

-SymbolicName=MSG_IMERR_SUGGEST

-Language=English

-The following information may help resolve this issue:

-

-%2!s!

-.

-

-MessageId=

-SymbolicName=MSG_IP_TASK_DESC

-Language=English

-Initializing plugin [%1]

-.

-

-MessageId=

-SymbolicName=MSG_IP_GET_CONFIG

-Language=English

-Can't get configuration for plugins

-.

-

-MessageId=

-SymbolicName=MSG_IP_NOT_REGISTERED

-Language=English

-The plugin is not registered

-.

-

-MessageId=

-SymbolicName=MSG_IP_DISABLED

-Language=English

-The plugin is disabled

-.

-

-MessageId=

-SymbolicName=MSG_IP_HOLD

-Language=English

-Placing plugin [%1] on hold

-.

-

-MessageId=

-SymbolicName=MSG_IP_STATE

-Language=English

-Leaving plugin [%1] in state [%2!d!]

-.

-

-MessageId=

-SymbolicName=MSG_IP_EXITING

-Language=English

-The plugin [%1] is in error state [%2!d!].  Exiting plugin.

-.

-

-MessageId=

-SymbolicName=MSG_RMI_NOT_FOUND

-Language=English

-Can't get file version information for path [%1!s!]

-.

-

-MessageId=

-SymbolicName=MSG_RMI_NO_TRANS

-Language=English

-Can't get version resource tranlations list for path [%1!s!]

-.

-

-MessageId=

-SymbolicName=MSG_RMI_NO_LOCAL

-Language=English

-The list of version translations were empty or did not contain a resource for the current user or system locale.

-.

-

-MessageId=

-SymbolicName=MSG_RMI_RES_MISSING

-Language=English

-Required resource %1!s! missing

-.

-

-MessageId=

-SymbolicName=MSG_RMI_MOD_MISMATCH

-Language=English

-The module name specified in the resource is [%1!s!] while the module name as registered is [%2!s!]

-.

-

-MessageId=

-SymbolicName=MSG_RMI_RES_TOO_LONG

-Language=English

-The resource %1!s! is malformed or too long

-.

-

-MessageId=

-SymbolicName=MSG_RMI_API_MISMATCH

-Language=English

-The module was compile for API version %1!d!.  However the current API version is %2!d!.

-.

-

-MessageId=

-SymbolicName=MSG_PB_START

-Language=English

-Starting plugin [%1!s!]

-.

-

-MessageId=

-SymbolicName=MSG_PB_INVALID_CODE_PTR

-Language=English

-The plugin is no longer valid.  This maybe because the module containing the plugin was unloaded.

-.

-

-MessageId=

-SymbolicName=MSG_PB_INIT_RV

-Language=English

-Initialization of the plugin returned code %1!d!.

-.

-

-MessageId=

-SymbolicName=MSG_PB_INIT_FAIL

-Language=English

-Initialization of the %1!s! plugin failed.  The plugin will be unloaded and any functionality provided will not be available.

-.

-

-MessageId=

-SymbolicName=MSG_PB_INIT_FAIL_S

-Language=English

-Plugin %1!s! failed to initialize

-.

-

-MessageId=

-SymbolicName=MSG_PB_INIT_FAIL_G

-Language=English

-Details for plugin:

-Description: %2!s!

-Module: %3!s!

-Support: %4!s!

-.

-

-MessageId=

-SymbolicName=MSG_PB_INIT_DONE

-Language=English

-Plugin running

-.

+; // ** kmm_msgs.mc 
+
+; /* Since .mc files can contain strings from any language, we define
+; all our messages in one file in the /lang/ directory instead of
+; language specific subdirectories. */
+
+; /* The type is set to (wchar_t *) because that's what we will be
+; feeding kherr_report() function. */
+
+MessageIdTypedef=LPWSTR
+
+; /* Severity values as defined in the message definition file are
+; currently ignored. */
+
+SeverityNames=(
+        Success=0x0
+)
+
+LanguageNames=(
+        English=0x409:MSG_ENU
+)
+
+OutputBase=16
+
+; /* Actual messages start here */
+
+MessageId=1
+Severity=Success
+SymbolicName=MSG_INITIAL
+Language=English
+Initial placeholder message
+.
+
+MessageId=
+SymbolicName=MSG_LOAD_DEFAULT
+Language=English
+Load default modules
+.
+
+MessageId=
+SymbolicName=MSG_INIT_MODULE
+Language=English
+Initializing module [%1]
+.
+
+MessageId=
+SymbolicName=MSG_IM_GET_CONFIG
+Language=English
+Can't get configuration for modules
+.
+
+MessageId=
+SymbolicName=MSG_IM_NOT_PREINIT
+Language=English
+Module is not in PREINIT state.  Current state=[%1!d!]
+.
+
+MessageId=
+SymbolicName=MSG_IM_NOT_REGISTERED
+Language=English
+Module is not registered
+.
+
+MessageId=
+SymbolicName=MSG_IM_DISABLED
+Language=English
+Module is disabled
+.
+
+MessageId=
+SymbolicName=MSG_IM_MAX_FAIL
+Language=English
+Module has failed too many times
+.
+
+MessageId=
+SymbolicName=MSG_IM_INVALID_MODULE
+Language=English
+The DLL containing the module was not of the correct format.
+.
+
+MessageId=
+SymbolicName=MSG_IM_INCOMPATIBLE
+Language=English 
+The DLL containing the module was not compatible with this version of NetIDMgr.
+.
+
+Messageid=
+SymbolicName=MSG_IM_NOT_FOUND
+Language=English
+Module binary was not found.  Checked path [%1]
+.
+
+MessageId=
+SymbolicName=MSG_IM_NO_ENTRY
+Language=English
+Entry point not found.  Checked entry point [%1]
+.
+
+MessageId=
+SymbolicName=MSG_IM_INIT_FAIL
+Language=English
+Module initialization entry point returned failure code [%1!d!]
+.
+
+MessageId=
+SymbolicName=MSG_IM_NO_PLUGINS
+Language=English
+No plugins were registerd by the module
+.
+
+MessageId=
+SymbolicName=MSG_IM_MOD_STATE
+Language=English
+Module [%1] is in state [%2!d!]
+.
+
+MessageId=
+SymbolicName=MSG_IMERR_TITLE
+Language=English
+Failed to load module %1!s!
+.
+
+MessageId=
+SymbolicName=MSG_IMERR_SUGGEST
+Language=English
+The following information may help resolve this issue:
+
+%2!s!
+.
+
+MessageId=
+SymbolicName=MSG_IP_TASK_DESC
+Language=English
+Initializing plugin [%1]
+.
+
+MessageId=
+SymbolicName=MSG_IP_GET_CONFIG
+Language=English
+Can't get configuration for plugins
+.
+
+MessageId=
+SymbolicName=MSG_IP_NOT_REGISTERED
+Language=English
+The plugin is not registered
+.
+
+MessageId=
+SymbolicName=MSG_IP_DISABLED
+Language=English
+The plugin is disabled
+.
+
+MessageId=
+SymbolicName=MSG_IP_HOLD
+Language=English
+Placing plugin [%1] on hold
+.
+
+MessageId=
+SymbolicName=MSG_IP_STATE
+Language=English
+Leaving plugin [%1] in state [%2!d!]
+.
+
+MessageId=
+SymbolicName=MSG_IP_EXITING
+Language=English
+The plugin [%1] is in error state [%2!d!].  Exiting plugin.
+.
+
+MessageId=
+SymbolicName=MSG_RMI_NOT_FOUND
+Language=English
+Can't get file version information for path [%1!s!]
+.
+
+MessageId=
+SymbolicName=MSG_RMI_NO_TRANS
+Language=English
+Can't get version resource tranlations list for path [%1!s!]
+.
+
+MessageId=
+SymbolicName=MSG_RMI_NO_LOCAL
+Language=English
+The list of version translations were empty or did not contain a resource for the current user or system locale.
+.
+
+MessageId=
+SymbolicName=MSG_RMI_RES_MISSING
+Language=English
+Required resource %1!s! missing
+.
+
+MessageId=
+SymbolicName=MSG_RMI_MOD_MISMATCH
+Language=English
+The module name specified in the resource is [%1!s!] while the module name as registered is [%2!s!]
+.
+
+MessageId=
+SymbolicName=MSG_RMI_RES_TOO_LONG
+Language=English
+The resource %1!s! is malformed or too long
+.
+
+MessageId=
+SymbolicName=MSG_RMI_API_MISMATCH
+Language=English
+The module was compile for API version %1!d!.  However the current API version is %2!d!.
+.
+
+MessageId=
+SymbolicName=MSG_PB_START
+Language=English
+Starting plugin [%1!s!]
+.
+
+MessageId=
+SymbolicName=MSG_PB_INVALID_CODE_PTR
+Language=English
+The plugin is no longer valid.  This maybe because the module containing the plugin was unloaded.
+.
+
+MessageId=
+SymbolicName=MSG_PB_INIT_RV
+Language=English
+Initialization of the plugin returned code %1!d!.
+.
+
+MessageId=
+SymbolicName=MSG_PB_INIT_FAIL
+Language=English
+Initialization of the %1!s! plugin failed.  The plugin will be unloaded and any functionality provided will not be available.
+.
+
+MessageId=
+SymbolicName=MSG_PB_INIT_FAIL_S
+Language=English
+Plugin %1!s! failed to initialize
+.
+
+MessageId=
+SymbolicName=MSG_PB_INIT_FAIL_G
+Language=English
+Details for plugin:
+Description: %2!s!
+Module: %3!s!
+Support: %4!s!
+.
+
+MessageId=
+SymbolicName=MSG_PB_INIT_DONE
+Language=English
+Plugin running
+.
diff --git a/src/windows/identity/kmq/Makefile b/src/windows/identity/kmq/Makefile
index 22e605516..8dcdca405 100644
--- a/src/windows/identity/kmq/Makefile
+++ b/src/windows/identity/kmq/Makefile
@@ -1,49 +1,49 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=kmq

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\kmq.h

-

-OBJFILES= \

-	$(OBJ)\kmqmain.obj \

-	$(OBJ)\init.obj \

-	$(OBJ)\msgtype.obj \

-	$(OBJ)\consumer.obj \

-	$(OBJ)\publisher.obj \

-	$(OBJ)\kmqconfig.obj

-

-SDKLIBFILES=\

-	strsafe.lib

-

-$(OBJ)\kmqconfig.c: kmqconfig.csv $(CONFDIR)\csvschema.cfg

-	$(CCSV) $** $@

-

-all: mkdirs $(INCFILES) $(OBJFILES)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=kmq
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\kmq.h
+
+OBJFILES= \
+	$(OBJ)\kmqmain.obj \
+	$(OBJ)\init.obj \
+	$(OBJ)\msgtype.obj \
+	$(OBJ)\consumer.obj \
+	$(OBJ)\publisher.obj \
+	$(OBJ)\kmqconfig.obj
+
+SDKLIBFILES=\
+	strsafe.lib
+
+$(OBJ)\kmqconfig.c: kmqconfig.csv $(CONFDIR)\csvschema.cfg
+	$(CCSV) $** $@
+
+all: mkdirs $(INCFILES) $(OBJFILES)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)
diff --git a/src/windows/identity/kmq/kmqconfig.csv b/src/windows/identity/kmq/kmqconfig.csv
index c6d5ca451..317baa60e 100644
--- a/src/windows/identity/kmq/kmqconfig.csv
+++ b/src/windows/identity/kmq/kmqconfig.csv
@@ -1,5 +1,5 @@
-Name,Type,Value,Description

-KMQ,KC_SPACE,0,Options for the credentials window

-  QueueDeadTimeout,KC_INT32,12000,

-  CallDeadTimeout,KC_INT32,8000,

-KMQ,KC_ENDSPACE,0,

+Name,Type,Value,Description
+KMQ,KC_SPACE,0,Options for the credentials window
+  QueueDeadTimeout,KC_INT32,12000,
+  CallDeadTimeout,KC_INT32,8000,
+KMQ,KC_ENDSPACE,0,
diff --git a/src/windows/identity/nidmgrdll/nidmgrdll.rc b/src/windows/identity/nidmgrdll/nidmgrdll.rc
index 1f600b6b3..b4e0a9e72 100644
--- a/src/windows/identity/nidmgrdll/nidmgrdll.rc
+++ b/src/windows/identity/nidmgrdll/nidmgrdll.rc
@@ -1,74 +1,74 @@
-/*

- * Copyright (c) 2004 Massachusetts Institute of Technology

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use, copy,

- * modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- */

-

-/* $Id$ */

-

-#include<afxres.h>

-#include<netidmgr_intver.h>

-

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif

-

-1 VERSIONINFO

- FILEVERSION KH_VERSION_LIST

- PRODUCTVERSION KH_VERSION_LIST

- FILEFLAGSMASK 0x17L

- FILEFLAGS KH_VER_FILEFLAGS

- FILEOS KH_VER_FILEOS

- FILETYPE KH_VER_FILETYPEDLL

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "CompanyName", KH_VERSTR_COMPANY_1033

-            VALUE "FileDescription", "Network Identity Manager API"

-            VALUE "FileVersion", KH_VERSTR_VERSION_1033

-            VALUE "InternalName", "nidmgr32"

-            VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033

-            VALUE "OriginalFilename", "nidmgr32.dll"

-            VALUE "ProductName", "Network Identity Manager"

-            VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033

-#ifdef KH_VERSTR_COMMENT_1033

-            VALUE "Comments",     KH_VERSTR_COMMENT_1033

-#endif

-#ifdef KH_VERSTR_PRIVATE_1033

-            VALUE "PrivateBuild", KH_VERSTR_PRIVATE_1033

-#endif

-#ifdef KH_VERSTR_SPECIAL_1033

-            VALUE "SpecialBuild", KH_VERSTR_SPECIAL_1033

-#endif

-        END

-    END

-

-/* Language independent */

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-

-END

+/*
+ * Copyright (c) 2004 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/* $Id$ */
+
+#include<afxres.h>
+#include<netidmgr_intver.h>
+
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif
+
+1 VERSIONINFO
+ FILEVERSION KH_VERSION_LIST
+ PRODUCTVERSION KH_VERSION_LIST
+ FILEFLAGSMASK 0x17L
+ FILEFLAGS KH_VER_FILEFLAGS
+ FILEOS KH_VER_FILEOS
+ FILETYPE KH_VER_FILETYPEDLL
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", KH_VERSTR_COMPANY_1033
+            VALUE "FileDescription", "Network Identity Manager API"
+            VALUE "FileVersion", KH_VERSTR_VERSION_1033
+            VALUE "InternalName", "nidmgr32"
+            VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033
+            VALUE "OriginalFilename", "nidmgr32.dll"
+            VALUE "ProductName", "Network Identity Manager"
+            VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033
+#ifdef KH_VERSTR_COMMENT_1033
+            VALUE "Comments",     KH_VERSTR_COMMENT_1033
+#endif
+#ifdef KH_VERSTR_PRIVATE_1033
+            VALUE "PrivateBuild", KH_VERSTR_PRIVATE_1033
+#endif
+#ifdef KH_VERSTR_SPECIAL_1033
+            VALUE "SpecialBuild", KH_VERSTR_SPECIAL_1033
+#endif
+        END
+    END
+
+/* Language independent */
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+
+END
diff --git a/src/windows/identity/plugins/common/Makefile b/src/windows/identity/plugins/common/Makefile
index 05f28532f..6b827dc3e 100644
--- a/src/windows/identity/plugins/common/Makefile
+++ b/src/windows/identity/plugins/common/Makefile
@@ -1,44 +1,44 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=plugins\common

-!include <../../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\krb5common.h \

-	$(INCDIR)\dynimport.h

-

-OBJFILES= \

-	$(LIBDIR)\krb5common.obj \

-	$(LIBDIR)\dynimport.obj

-

-all: mkdirs $(INCFILES) $(OBJFILES)

-

-clean::

-	if exist "$(INCDIR)" $(RM) $(INCFILES)

-	if exist "$(LIBDIR)" $(RM) $(OBJFILES)

-

-{}.c{$(LIBDIR)}.obj:

-	$(C2OBJ)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=plugins\common
+!include <../../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\krb5common.h \
+	$(INCDIR)\dynimport.h
+
+OBJFILES= \
+	$(LIBDIR)\krb5common.obj \
+	$(LIBDIR)\dynimport.obj
+
+all: mkdirs $(INCFILES) $(OBJFILES)
+
+clean::
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
+	if exist "$(LIBDIR)" $(RM) $(OBJFILES)
+
+{}.c{$(LIBDIR)}.obj:
+	$(C2OBJ)
diff --git a/src/windows/identity/plugins/krb4/krbconfig.csv b/src/windows/identity/plugins/krb4/krbconfig.csv
index 3d95b40b3..3d791214b 100644
--- a/src/windows/identity/plugins/krb4/krbconfig.csv
+++ b/src/windows/identity/plugins/krb4/krbconfig.csv
@@ -1,17 +1,17 @@
-Name,Type,Value,Description

-Krb4Cred,KC_SPACE,0,"Kerberos IV Credentials Provider"

-  Module,KC_STRING,"MITKrb4",

-  Description,KC_STRING,"Kerberos IV Credentials Provider",

-  Dependencies,KC_STRING,Krb5Cred,

-  Type,KC_INT32,1,

-  Flags,KC_INT32,0,

-  Parameters,KC_SPACE,0,Parameters for KrbCred

-    Krb4NewCreds,KC_INT32,1,Obtain Kerberos 4 tickets (Boolean)

-    Krb4Method,KC_INT32,0,Method for acquiring K4 tix. 0-Auto;1-Password;2-K524

-    CreateMissingConfig,KC_INT32,0,Create missing configuration files

-    DefaultLifetime,KC_INT32,36000,Default ticket lifetime

-    MaxLifetime,KC_INT32,86400,Maximum lifetime

-    MinLifetime,KC_INT32,60,Minimum lifetime

-    TktString,KC_STRING,,Ticket string.  Use default if NULL

-  Parameters,KC_ENDSPACE,0,

-Krb4Cred,KC_ENDSPACE,0,

+Name,Type,Value,Description
+Krb4Cred,KC_SPACE,0,"Kerberos IV Credentials Provider"
+  Module,KC_STRING,"MITKrb4",
+  Description,KC_STRING,"Kerberos IV Credentials Provider",
+  Dependencies,KC_STRING,Krb5Cred,
+  Type,KC_INT32,1,
+  Flags,KC_INT32,0,
+  Parameters,KC_SPACE,0,Parameters for KrbCred
+    Krb4NewCreds,KC_INT32,1,Obtain Kerberos 4 tickets (Boolean)
+    Krb4Method,KC_INT32,0,Method for acquiring K4 tix. 0-Auto;1-Password;2-K524
+    CreateMissingConfig,KC_INT32,0,Create missing configuration files
+    DefaultLifetime,KC_INT32,36000,Default ticket lifetime
+    MaxLifetime,KC_INT32,86400,Maximum lifetime
+    MinLifetime,KC_INT32,60,Minimum lifetime
+    TktString,KC_STRING,,Ticket string.  Use default if NULL
+  Parameters,KC_ENDSPACE,0,
+Krb4Cred,KC_ENDSPACE,0,
diff --git a/src/windows/identity/plugins/krb4/lang/en_us/langres.rc b/src/windows/identity/plugins/krb4/lang/en_us/langres.rc
index 12c3903f5..1c011ab9c 100644
--- a/src/windows/identity/plugins/krb4/lang/en_us/langres.rc
+++ b/src/windows/identity/plugins/krb4/lang/en_us/langres.rc
@@ -1,205 +1,205 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "..\..\langres.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\langres.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_NC_KRB4 DIALOGEX 0, 0, 300, 166

-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "Kerberos v4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11

-    CONTROL         "Obtain Kerberos v4 credentials",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,26,128,10

-    GROUPBOX        "Obtain Kerberos v4 credentials using",IDC_STATIC,7,43,286,72,WS_GROUP

-    CONTROL         "Automatically determine method",IDC_NCK4_AUTO,"Button",BS_AUTORADIOBUTTON,22,59,119,10

-    CONTROL         "Kerberos v5 to v4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,22,76,109,10

-    CONTROL         "Password",IDC_NCK4_PWD,"Button",BS_AUTORADIOBUTTON,22,93,47,10

-END

-

-IDD_CFG_KRB4 DIALOGEX 0, 0, 255, 182

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    LTEXT           "Credential cache location",IDC_CFG_LBL_CACHE,7,10,67,8

-    EDITTEXT        IDC_CFG_CACHE,83,7,165,14,ES_AUTOHSCROLL

-    LTEXT           "Config file path",IDC_CFG_LBL_CFGFILE,7,30,50,8

-    EDITTEXT        IDC_CFG_CFGPATH,83,27,165,14,ES_AUTOHSCROLL | ES_READONLY

-    PUSHBUTTON      "Browse...",IDC_CFG_CFGBROW,200,95,48,14,NOT WS_VISIBLE

-    LTEXT           "Realm file path",IDC_CFG_LBL_RLMPATH,7,50,48,8

-    EDITTEXT        IDC_CFG_RLMPATH,83,47,165,14,ES_AUTOHSCROLL | ES_READONLY

-    PUSHBUTTON      "Browse...",IDC_CFG_RLMBROW,200,127,48,14,NOT WS_VISIBLE

-END

-

-IDD_CFG_IDS_KRB4 DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "Obtain Kerberos v4 credentials",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17

-    LTEXT           "Note that, if enabled, Kerberos v4 credentials will be acquired during initial credential acquisition and during credential renewals.\n\nHowever, currently Kerberos v4 credentials can only be obtained for the default identity.",IDC_STATIC,7,91,221,53,SS_SUNKEN

-END

-

-IDD_CFG_ID_KRB4 DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "Obtain Kerberos v4 credentials for this identity",IDC_CFG_GETTIX,

-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,7,165,10

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_NC_KRB4, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 293

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 159

-    END

-

-    IDD_CFG_KRB4, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 248

-        VERTGUIDE, 83

-        VERTGUIDE, 196

-        VERTGUIDE, 200

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 175

-    END

-

-    IDD_CFG_IDS_KRB4, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-

-    IDD_CFG_ID_KRB4, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_PLUGIN              ICON                    "..\\..\\images\\plugin.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_PLUGIN_DESC         "Kerberos v4 Credentials Provider"

-    IDS_NC_K4_SHORT         "Kerberos v4"

-    IDS_ERR_REALM           "Could not resolve Kerberos v4 realm"

-    IDS_ERR_PRINCIPAL       "Invalid principal"

-    IDS_ERR_INVINST         "Invalid instance"

-    IDS_ERR_PWINTKT         "Could not obtain Kerberos v4 credentials"

-    IDS_CT_DISABLED         "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Disabled  (click <a id=""Krb4Cred:Enable"">here</a> to enable)</p>"

-    IDS_CT_TGTFOR           "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Credentials for realm %s</p>"

-    IDS_METHOD_AUTO         "Automatically determined method"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_KRB4_SHORT_DESC     "Kerberos v4"

-    IDS_KRB4_LONG_DESC      "Kerberos v4"

-    IDS_CFG_KRB4_LONG       "Kerberos v4 Configuration"

-    IDS_CFG_KRB4_SHORT      "Kerberos v4"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_METHOD_PWD          "Password"

-    IDS_METHOD_K524         "Kerberos v5 to v4 translation"

-    IDS_CFG_IDS_KRB4_SHORT  "Kerberos v4"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "..\..\langres.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\..\\langres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_NC_KRB4 DIALOGEX 0, 0, 300, 166
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Kerberos v4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11
+    CONTROL         "Obtain Kerberos v4 credentials",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,26,128,10
+    GROUPBOX        "Obtain Kerberos v4 credentials using",IDC_STATIC,7,43,286,72,WS_GROUP
+    CONTROL         "Automatically determine method",IDC_NCK4_AUTO,"Button",BS_AUTORADIOBUTTON,22,59,119,10
+    CONTROL         "Kerberos v5 to v4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,22,76,109,10
+    CONTROL         "Password",IDC_NCK4_PWD,"Button",BS_AUTORADIOBUTTON,22,93,47,10
+END
+
+IDD_CFG_KRB4 DIALOGEX 0, 0, 255, 182
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Credential cache location",IDC_CFG_LBL_CACHE,7,10,67,8
+    EDITTEXT        IDC_CFG_CACHE,83,7,165,14,ES_AUTOHSCROLL
+    LTEXT           "Config file path",IDC_CFG_LBL_CFGFILE,7,30,50,8
+    EDITTEXT        IDC_CFG_CFGPATH,83,27,165,14,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "Browse...",IDC_CFG_CFGBROW,200,95,48,14,NOT WS_VISIBLE
+    LTEXT           "Realm file path",IDC_CFG_LBL_RLMPATH,7,50,48,8
+    EDITTEXT        IDC_CFG_RLMPATH,83,47,165,14,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "Browse...",IDC_CFG_RLMBROW,200,127,48,14,NOT WS_VISIBLE
+END
+
+IDD_CFG_IDS_KRB4 DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Obtain Kerberos v4 credentials",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17
+    LTEXT           "Note that, if enabled, Kerberos v4 credentials will be acquired during initial credential acquisition and during credential renewals.\n\nHowever, currently Kerberos v4 credentials can only be obtained for the default identity.",IDC_STATIC,7,91,221,53,SS_SUNKEN
+END
+
+IDD_CFG_ID_KRB4 DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Obtain Kerberos v4 credentials for this identity",IDC_CFG_GETTIX,
+                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,7,165,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_NC_KRB4, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 293
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 159
+    END
+
+    IDD_CFG_KRB4, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 248
+        VERTGUIDE, 83
+        VERTGUIDE, 196
+        VERTGUIDE, 200
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 175
+    END
+
+    IDD_CFG_IDS_KRB4, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+
+    IDD_CFG_ID_KRB4, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_PLUGIN              ICON                    "..\\..\\images\\plugin.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_PLUGIN_DESC         "Kerberos v4 Credentials Provider"
+    IDS_NC_K4_SHORT         "Kerberos v4"
+    IDS_ERR_REALM           "Could not resolve Kerberos v4 realm"
+    IDS_ERR_PRINCIPAL       "Invalid principal"
+    IDS_ERR_INVINST         "Invalid instance"
+    IDS_ERR_PWINTKT         "Could not obtain Kerberos v4 credentials"
+    IDS_CT_DISABLED         "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Disabled  (click <a id=""Krb4Cred:Enable"">here</a> to enable)</p>"
+    IDS_CT_TGTFOR           "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Credentials for realm %s</p>"
+    IDS_METHOD_AUTO         "Automatically determined method"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_KRB4_SHORT_DESC     "Kerberos v4"
+    IDS_KRB4_LONG_DESC      "Kerberos v4"
+    IDS_CFG_KRB4_LONG       "Kerberos v4 Configuration"
+    IDS_CFG_KRB4_SHORT      "Kerberos v4"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_METHOD_PWD          "Password"
+    IDS_METHOD_K524         "Kerberos v5 to v4 translation"
+    IDS_CFG_IDS_KRB4_SHORT  "Kerberos v4"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
+
diff --git a/src/windows/identity/plugins/krb4/lang/krb4_msgs.mc b/src/windows/identity/plugins/krb4/lang/krb4_msgs.mc
index 9fa410f2f..74fe50905 100644
--- a/src/windows/identity/plugins/krb4/lang/krb4_msgs.mc
+++ b/src/windows/identity/plugins/krb4/lang/krb4_msgs.mc
@@ -1,57 +1,57 @@
-; // ** krb5_msgs.mc

-

-; /* Since .mc files can contain strings from any language, we define

-; all our messages in one file in the /lang/ directory instead of

-; language specific subdirectories. */

-

-; /* The type is set to (wchar_t *) because that's what we will be

-; feeding kherr_report() function. */

-

-; // MessageIdTypedef=LPWSTR

-

-; /* Severity values as defined in the message definition file are

-; currently ignored. */

-

-SeverityNames=(

-        Success=0x0

-)

-

-LanguageNames=(

-        English=0x409:MSG_ENU

-)

-

-OutputBase=16

-

-; /* Actual messages start here */

-

-MessageId=1

-Severity=Success

-SymbolicName=MSG_INITIAL

-Language=English

-Initial placeholder message

-.

-

-MessageId=

-SymbolicName=MSG_K4_NEW_CREDS

-Language=English

-Getting new Krb4 credentials for [%1!s!] using method [%2!d!]

-.

-

-MessageId=

-SymbolicName=MSG_K4_RENEW_CREDS

-Language=English

-Renewing Krb4 credentials for [%1!s!] using method [%2!d!]

-.

-

-MessageId=

-SymbolicName=MSG_K4_TRY_K524

-Language=English

-Trying Krb524 ...

-.

-

-MessageId=

-SymbolicName=MSG_K4_TRY_PASSWORD

-Language=English

-Trying Password ...

-.

-

+; // ** krb5_msgs.mc
+
+; /* Since .mc files can contain strings from any language, we define
+; all our messages in one file in the /lang/ directory instead of
+; language specific subdirectories. */
+
+; /* The type is set to (wchar_t *) because that's what we will be
+; feeding kherr_report() function. */
+
+; // MessageIdTypedef=LPWSTR
+
+; /* Severity values as defined in the message definition file are
+; currently ignored. */
+
+SeverityNames=(
+        Success=0x0
+)
+
+LanguageNames=(
+        English=0x409:MSG_ENU
+)
+
+OutputBase=16
+
+; /* Actual messages start here */
+
+MessageId=1
+Severity=Success
+SymbolicName=MSG_INITIAL
+Language=English
+Initial placeholder message
+.
+
+MessageId=
+SymbolicName=MSG_K4_NEW_CREDS
+Language=English
+Getting new Krb4 credentials for [%1!s!] using method [%2!d!]
+.
+
+MessageId=
+SymbolicName=MSG_K4_RENEW_CREDS
+Language=English
+Renewing Krb4 credentials for [%1!s!] using method [%2!d!]
+.
+
+MessageId=
+SymbolicName=MSG_K4_TRY_K524
+Language=English
+Trying Krb524 ...
+.
+
+MessageId=
+SymbolicName=MSG_K4_TRY_PASSWORD
+Language=English
+Trying Password ...
+.
+
diff --git a/src/windows/identity/plugins/krb4/version.rc b/src/windows/identity/plugins/krb4/version.rc
index 929e0d09d..d0e074f86 100644
--- a/src/windows/identity/plugins/krb4/version.rc
+++ b/src/windows/identity/plugins/krb4/version.rc
@@ -1,89 +1,89 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use, copy,

- * modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- */

-

-/* $Id$ */

-

-#include<netidmgr_intver.h>

-

-#ifndef LANGVER

-

-#define STR_FILEDESC "Kerberos v4 Plugin for Network Identity Manager"

-#define STR_INTNAME  "krb4cred"

-#define STR_ORIGNAME "krb4cred.dll"

-

-#else

-

-#ifdef LANG_en_us

-

-#define STR_FILEDESC "English(US) language resources for the Keberos 4 plugin"

-#define STR_INTNAME  "krb4cred_en_us"

-#define STR_ORIGNAME "krb4cred_en_us.dll"

-

-#else

-

-#error Unknown langugae

-

-#endif

-

-#endif

-

-1 VERSIONINFO 

-        FILEVERSION     KH_VERSION_LIST

-        PRODUCTVERSION  KH_VERSION_LIST

-        FILEFLAGSMASK   KH_VER_FILEFLAGMASK

-        FILEFLAGS       KH_VER_FILEFLAGS

-        FILEOS          KH_VER_FILEOS

-        FILETYPE        KH_VER_FILETYPEDLL

-        FILESUBTYPE     0

-  {

-

-    BLOCK "StringFileInfo"

-    {

-      BLOCK "040904b0"

-      {

-        VALUE "CompanyName",     KH_VERSTR_COMPANY_1033

-        VALUE "FileDescription", STR_FILEDESC

-        VALUE "FileVersion",     KH_VERSTR_VERSION_1033

-        VALUE "InternalName",    STR_INTNAME

-        VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033

-        VALUE "OriginalFilename", STR_ORIGNAME

-        VALUE "ProductName",     "Network Identity Manager"

-        VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033

-#ifdef KH_VERSTR_COMMENT_1033

-        VALUE "Comment", KH_VERSTR_COMMENT_1033

-#endif

-#ifndef LANGVER

-        VALUE NIMV_MODULE,       "MITKrb4"

-        VALUE NIMV_PLUGINS,      "Krb4Cred"

-        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI

-        VALUE NIMV_SUPPORT,      "http://web.mit.edu/kerberos"

-#endif

-      }

-    }

-

-    BLOCK "VarFileInfo"

-    {

-        VALUE "Translation", 0x409, 1200

-    }

-  }

+/* Copyright (c) 2004 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+/* $Id$ */
+
+#include<netidmgr_intver.h>
+
+#ifndef LANGVER
+
+#define STR_FILEDESC "Kerberos v4 Plugin for Network Identity Manager"
+#define STR_INTNAME  "krb4cred"
+#define STR_ORIGNAME "krb4cred.dll"
+
+#else
+
+#ifdef LANG_en_us
+
+#define STR_FILEDESC "English(US) language resources for the Keberos 4 plugin"
+#define STR_INTNAME  "krb4cred_en_us"
+#define STR_ORIGNAME "krb4cred_en_us.dll"
+
+#else
+
+#error Unknown langugae
+
+#endif
+
+#endif
+
+1 VERSIONINFO 
+        FILEVERSION     KH_VERSION_LIST
+        PRODUCTVERSION  KH_VERSION_LIST
+        FILEFLAGSMASK   KH_VER_FILEFLAGMASK
+        FILEFLAGS       KH_VER_FILEFLAGS
+        FILEOS          KH_VER_FILEOS
+        FILETYPE        KH_VER_FILETYPEDLL
+        FILESUBTYPE     0
+  {
+
+    BLOCK "StringFileInfo"
+    {
+      BLOCK "040904b0"
+      {
+        VALUE "CompanyName",     KH_VERSTR_COMPANY_1033
+        VALUE "FileDescription", STR_FILEDESC
+        VALUE "FileVersion",     KH_VERSTR_VERSION_1033
+        VALUE "InternalName",    STR_INTNAME
+        VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033
+        VALUE "OriginalFilename", STR_ORIGNAME
+        VALUE "ProductName",     "Network Identity Manager"
+        VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033
+#ifdef KH_VERSTR_COMMENT_1033
+        VALUE "Comment", KH_VERSTR_COMMENT_1033
+#endif
+#ifndef LANGVER
+        VALUE NIMV_MODULE,       "MITKrb4"
+        VALUE NIMV_PLUGINS,      "Krb4Cred"
+        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI
+        VALUE NIMV_SUPPORT,      "http://web.mit.edu/kerberos"
+#endif
+      }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x409, 1200
+    }
+  }
diff --git a/src/windows/identity/plugins/krb5/krbconfig.csv b/src/windows/identity/plugins/krb5/krbconfig.csv
index cb4a860d9..3bb30ea77 100644
--- a/src/windows/identity/plugins/krb5/krbconfig.csv
+++ b/src/windows/identity/plugins/krb5/krbconfig.csv
@@ -1,45 +1,45 @@
-Name,Type,Value,Description

-Krb5Cred,KC_SPACE,0,Kerberos V Credentials Provider

-  Module,KC_STRING,MITKrb5,

-  Description,KC_STRING,Kerberos V Credentials Provider,

-  Type,KC_INT32,1,

-  Flags,KC_INT32,0,

-  Parameters,KC_SPACE,0,Parameters for KrbCred

-    CreateMissingConfig,KC_INT32,0,Create missing configuration files

-    MsLsaImport,KC_INT32,1,Automatically import MSLSA credentials: 0-never 1-always 2-if principle matches

-    MsLsaList,KC_INT32,1,Include MSLSA in the credentials list

-    FileCCList,KC_STRING,,List of file CCaches to include in listing

-    AutoRenewTickets,KC_INT32,1,Automatically renew expiring tickets

-    DefaultLifetime,KC_INT32,36000,Default ticket lifetime

-    MaxLifetime,KC_INT32,86400,Maximum lifetime

-    MinLifetime,KC_INT32,60,Minimum lifetime

-    Forwardable,KC_INT32,1,Obtain forwardable tickets (boolean)

-    Proxiable,KC_INT32,0,Obtain proxiable tickets (boolean)

-    Addressless,KC_INT32,1,Obtain addressless tickets (boolean)

-    PublicIP,KC_INT32,0,Additional public IP address to use (int32)

-    Renewable,KC_INT32,1,Obtain renewable tickets (boolean)

-    DefaultRenewLifetime,KC_INT32,604800,Default renewable lifetime

-    MaxRenewLifetime,KC_INT32,2592000,Maximum renewable lifetime

-    MinRenewLifetime,KC_INT32,60,Maximum renewable lifetime

-    UseFullRealmList,KC_INT32,0,Use the full list of realms in the New Creds dialog

-    LRURealms,KC_STRING,,

-    LRUPrincipals,KC_STRING,,

-    LastDefaultIdent,KC_STRING,,Last known default identity

-    PromptCacheLifetime,KC_INT32,172800,Lifetime of the prompt cache in seconds

-    DefaultCCName,KC_STRING,,Default CC name (only per identity)

-    DefaultToFileCache,KC_INT32,0,"If no DefaultCCName is specified for an identity, use a generated FILE: cache instead of an API: cache"

-    PromptCache,KC_SPACE,0,Cache of prompts (only per identity)

-      Name,KC_STRING,,

-      Banner,KC_STRING,,

-      PromptCount,KC_INT32,0,

-      ExpiresOn,KC_INT64,0,FILETIME of when the prompt cache is set to expire

-      (n),KC_SPACE,0,Parameters for each prompt

-        Prompt,KC_STRING,,

-        Type,KC_INT32,0,

-        Flags,KC_INT32,0,

-      (n),KC_ENDSPACE,0,

-    PromptCache,KC_ENDSPACE,0,

-    Realms,KC_SPACE,0,Realm specific configuration (same schema as per identity config)

-    Realms,KC_ENDSPACE,0,

-  Parameters,KC_ENDSPACE,0,

-Krb5Cred,KC_ENDSPACE,0,

+Name,Type,Value,Description
+Krb5Cred,KC_SPACE,0,Kerberos V Credentials Provider
+  Module,KC_STRING,MITKrb5,
+  Description,KC_STRING,Kerberos V Credentials Provider,
+  Type,KC_INT32,1,
+  Flags,KC_INT32,0,
+  Parameters,KC_SPACE,0,Parameters for KrbCred
+    CreateMissingConfig,KC_INT32,0,Create missing configuration files
+    MsLsaImport,KC_INT32,1,Automatically import MSLSA credentials: 0-never 1-always 2-if principle matches
+    MsLsaList,KC_INT32,1,Include MSLSA in the credentials list
+    FileCCList,KC_STRING,,List of file CCaches to include in listing
+    AutoRenewTickets,KC_INT32,1,Automatically renew expiring tickets
+    DefaultLifetime,KC_INT32,36000,Default ticket lifetime
+    MaxLifetime,KC_INT32,86400,Maximum lifetime
+    MinLifetime,KC_INT32,60,Minimum lifetime
+    Forwardable,KC_INT32,1,Obtain forwardable tickets (boolean)
+    Proxiable,KC_INT32,0,Obtain proxiable tickets (boolean)
+    Addressless,KC_INT32,1,Obtain addressless tickets (boolean)
+    PublicIP,KC_INT32,0,Additional public IP address to use (int32)
+    Renewable,KC_INT32,1,Obtain renewable tickets (boolean)
+    DefaultRenewLifetime,KC_INT32,604800,Default renewable lifetime
+    MaxRenewLifetime,KC_INT32,2592000,Maximum renewable lifetime
+    MinRenewLifetime,KC_INT32,60,Maximum renewable lifetime
+    UseFullRealmList,KC_INT32,0,Use the full list of realms in the New Creds dialog
+    LRURealms,KC_STRING,,
+    LRUPrincipals,KC_STRING,,
+    LastDefaultIdent,KC_STRING,,Last known default identity
+    PromptCacheLifetime,KC_INT32,172800,Lifetime of the prompt cache in seconds
+    DefaultCCName,KC_STRING,,Default CC name (only per identity)
+    DefaultToFileCache,KC_INT32,0,"If no DefaultCCName is specified for an identity, use a generated FILE: cache instead of an API: cache"
+    PromptCache,KC_SPACE,0,Cache of prompts (only per identity)
+      Name,KC_STRING,,
+      Banner,KC_STRING,,
+      PromptCount,KC_INT32,0,
+      ExpiresOn,KC_INT64,0,FILETIME of when the prompt cache is set to expire
+      (n),KC_SPACE,0,Parameters for each prompt
+        Prompt,KC_STRING,,
+        Type,KC_INT32,0,
+        Flags,KC_INT32,0,
+      (n),KC_ENDSPACE,0,
+    PromptCache,KC_ENDSPACE,0,
+    Realms,KC_SPACE,0,Realm specific configuration (same schema as per identity config)
+    Realms,KC_ENDSPACE,0,
+  Parameters,KC_ENDSPACE,0,
+Krb5Cred,KC_ENDSPACE,0,
diff --git a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc
index 67492dadf..bcf837587 100644
--- a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc
+++ b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc
@@ -1,507 +1,507 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "..\..\langres.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\langres.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_NC_KRB5 DIALOGEX 0, 0, 300, 166

-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "Kerberos v5 Credential Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11

-    LTEXT           "Realm",IDC_STATIC,7,25,52,13

-    COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | NOT WS_VISIBLE | WS_DISABLED

-    LTEXT           "&Lifetime",IDC_STATIC,7,67,61,12

-    EDITTEXT        IDC_NCK5_LIFETIME_EDIT,85,67,107,12,ES_AUTOHSCROLL

-    CONTROL         "&Renewable for",IDC_NCK5_RENEWABLE,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,87,64,12

-    EDITTEXT        IDC_NCK5_RENEW_EDIT,85,87,108,12,ES_AUTOHSCROLL

-    CONTROL         "Can be &forwarded to other machines",IDC_NCK5_FORWARDABLE,

-                    "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,107,132,12

-    CONTROL         "Addressless",IDC_NCK5_ADDRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,128,54,10

-    LTEXT           "Additional IP address",IDC_STATIC,118,129,68,8,NOT WS_VISIBLE

-    CONTROL         "",IDC_NCK5_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,193,125,100,15

-END

-

-IDD_PP_KRB5C DIALOGEX 0, 0, 235, 156

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Kerberos v5"

-FONT 8, "MS Shell Dlg", 0, 0, 0x0

-BEGIN

-    LTEXT           "Name",IDC_STATIC,7,7,19,8

-    LTEXT           "Valid till",IDC_STATIC,7,39,24,8

-    LTEXT           "Renewable till",IDC_STATIC,7,55,45,12

-    LTEXT           "Issued on",IDC_STATIC,7,23,32,8

-    LTEXT           "Credential flags",IDC_STATIC,7,75,51,8

-    EDITTEXT        IDC_PPK5_NAME,72,7,156,12,ES_AUTOHSCROLL | ES_READONLY

-    EDITTEXT        IDC_PPK5_ISSUE,72,23,156,12,ES_AUTOHSCROLL | ES_READONLY

-    EDITTEXT        IDC_PPK5_VALID,72,39,156,12,ES_AUTOHSCROLL | ES_READONLY

-    EDITTEXT        IDC_PPK5_RENEW,72,55,156,12,ES_AUTOHSCROLL | ES_READONLY

-    LISTBOX         IDC_PPK5_FLAGS,72,74,156,75,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

-END

-

-IDD_PP_KRB5 DIALOGEX 0, 0, 235, 156

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Kerberos v5"

-FONT 8, "MS Shell Dlg", 0, 0, 0x0

-BEGIN

-    LTEXT           "Default realm",IDC_STATIC,7,7,44,8

-    LTEXT           "Default lifetime",IDC_STATIC,7,22,49,8

-    LTEXT           "Minimum lifetime",IDC_STATIC,7,37,52,8

-    LTEXT           "Maximum lifetime",IDC_STATIC,7,52,55,8

-    LTEXT           "Renewable lifetime",IDC_STATIC,7,67,61,8

-    LTEXT           "Min. Renewable lifetime",IDC_STATIC,7,82,76,8

-    LTEXT           "Max. Renewable lifetime",IDC_STATIC,7,97,79,8

-    GROUPBOX        "Default credential flags",IDC_STATIC,7,113,221,36

-    CONTROL         "Proxiable",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,129,45,10

-    CONTROL         "Renewable",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,129,51,10

-    CONTROL         "Forwardable",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,129,56,10

-    LTEXT           "ATHENA.MIT.EDU",IDC_STATIC,95,7,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "10 hours",IDC_STATIC,95,22,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "1 minute",IDC_STATIC,95,37,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "7 days",IDC_STATIC,95,52,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "7 days",IDC_STATIC,95,67,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "1 minute",IDC_STATIC,95,82,133,11,0,WS_EX_CLIENTEDGE

-    LTEXT           "21 days",IDC_STATIC,95,97,133,11,0,WS_EX_CLIENTEDGE

-END

-

-IDD_CONFIG DIALOGEX 0, 0, 255, 182

-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    LTEXT           "Default Realm",IDC_CFG_LBL_REALM,13,9,46,8

-    COMBOBOX        IDC_CFG_DEFREALM,76,7,166,51,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Include all configured realms in New Credentials realm list",IDC_CFG_INCREALMS,

-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,26,166,22

-    PUSHBUTTON      "Configure Realms ...",IDC_CFG_CFGREALMS,76,46,84,14,NOT WS_VISIBLE | WS_DISABLED

-    GROUPBOX        "Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47

-    LTEXT           "Location",IDC_CFG_LBL_CFGFILE,13,74,28,8

-    EDITTEXT        IDC_CFG_CFGFILE,76,71,166,14,ES_AUTOHSCROLL | ES_READONLY

-    PUSHBUTTON      "Browse...",IDC_CFG_BROWSE,145,89,44,14,NOT WS_VISIBLE

-    CONTROL         "Create file if missing",IDC_CFG_CREATECONFIG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,76,93,80,10

-    PUSHBUTTON      "Load into realm editor ...",IDC_CFG_BROWSE2,26,89,100,14,NOT WS_VISIBLE

-    GROUPBOX        "Microsoft Windows® Options",IDC_CFG_WINGRP,7,110,241,65

-    LTEXT           "Hostname",IDC_CFG_LBL_HOSTNAME,13,123,33,8

-    EDITTEXT        IDC_CFG_HOSTNAME,76,120,166,14,ES_AUTOHSCROLL | ES_READONLY

-    LTEXT           "Domain",IDC_CFG_LBL_DOMAIN,13,141,24,8

-    EDITTEXT        IDC_CFG_DOMAIN,76,138,166,14,ES_AUTOHSCROLL | ES_READONLY

-    LTEXT           "Import credentials",IDC_LBL_IMPORT,13,158,45,8

-    COMBOBOX        IDC_CFG_IMPORT,76,156,166,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-END

-

-IDD_CFG_REALMS DIALOGEX 0, 0, 255, 182

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_CFG_REALMS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,7,19,81,148

-    GROUPBOX        "Kerberos v5 Servers",IDC_CFG_SERVERSGRP,93,7,155,91

-    GROUPBOX        "Domain to Realm mappings",IDC_CFG_DOMAINGRP,93,101,155,74

-    CONTROL         "",IDC_CFG_KDC,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,19,143,72

-    CONTROL         "",IDC_CFG_DMAP,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,111,143,56

-END

-

-IDD_CFG_IDS_TAB DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    LTEXT           "Ticket &lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8

-    EDITTEXT        IDC_CFG_DEFLIFE,94,7,134,14,ES_AUTOHSCROLL

-    LTEXT           "Ticket re&newable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8

-    EDITTEXT        IDC_CFG_DEFRLIFE,94,26,134,14,ES_AUTOHSCROLL

-    CONTROL         "&Renewable",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,51,10

-    CONTROL         "&Forwardable",IDC_CFG_FORWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,47,56,10

-    CONTROL         "&Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,63,54,10

-    GROUPBOX        "Credential lifetime range",IDC_CFG_LIFEGRP,7,79,221,31

-    LTEXT           "From",IDC_STATIC,13,93,17,8

-    EDITTEXT        IDC_CFG_LRNG_MIN,38,90,79,14,ES_AUTOHSCROLL

-    LTEXT           "To",IDC_STATIC,125,93,9,8

-    EDITTEXT        IDC_CFG_LRNG_MAX,143,90,79,14,ES_AUTOHSCROLL

-    GROUPBOX        "Credential renewable lifetime range",IDC_STATIC,7,113,221,31

-    LTEXT           "From",IDC_STATIC,13,128,17,8

-    EDITTEXT        IDC_CFG_RLRNG_MIN,38,125,79,14,ES_AUTOHSCROLL

-    LTEXT           "To",IDC_STATIC,125,128,9,8

-    EDITTEXT        IDC_CFG_RLRNG_MAX,143,125,79,14,ES_AUTOHSCROLL

-END

-

-IDD_CFG_ID_TAB DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    LTEXT           "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,58,8

-    EDITTEXT        IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL

-    CONTROL         "Renewable for",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,63,10

-    EDITTEXT        IDC_CFG_DEFRLIFE,91,39,137,14,ES_AUTOHSCROLL

-    CONTROL         "Can be forwarded to other machines",IDC_CFG_FORWARD,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,133,10

-    CONTROL         "Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,54,10

-    LTEXT           "Additional IP address",IDC_STATIC,91,78,68,8,NOT WS_VISIBLE

-    CONTROL         "",IDC_CFG_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,128,89,100,15

-    LTEXT           "Credential cache",IDC_STATIC,7,132,58,8

-    EDITTEXT        IDC_CFG_CCACHE,91,130,137,14,ES_AUTOHSCROLL

-END

-

-IDD_NC_KRB5_PASSWORD DIALOGEX 0, 0, 300, 166

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "Kerberos v5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11

-    LTEXT           "Realm",IDC_STATIC,7,25,52,13

-    COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | WS_DISABLED

-END

-

-IDD_CFG_CACHES DIALOGEX 0, 0, 255, 182

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    GROUPBOX        "File-based Credential Caches",IDC_CFG_FCGRP,7,26,241,149

-    CONTROL         "",IDC_CFG_FCLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,13,37,229,97

-    EDITTEXT        IDC_CFG_FCNAME,13,139,173,14,ES_AUTOHSCROLL

-    PUSHBUTTON      "&Browse ...",IDC_CFG_BROWSE,192,139,50,14

-    PUSHBUTTON      "Add",IDC_CFG_ADD,13,156,50,14

-    PUSHBUTTON      "Remove Selected",IDC_CFG_REMOVE,88,156,80,14

-    CONTROL         "Include all API: credentials caches",IDC_CFG_INCAPI,

-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,123,7,125,10

-    CONTROL         "Include Windows LSA cache (MSLSA:)",IDC_CFG_INCMSLSA,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,7,136,10

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_NC_KRB5, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 293

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 159

-    END

-

-    IDD_PP_KRB5C, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 149

-    END

-

-    IDD_PP_KRB5, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 149

-    END

-

-    IDD_CONFIG, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 248

-        VERTGUIDE, 13

-        VERTGUIDE, 76

-        VERTGUIDE, 242

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 175

-    END

-

-    IDD_CFG_REALMS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 248

-        VERTGUIDE, 93

-        VERTGUIDE, 99

-        VERTGUIDE, 242

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 175

-        HORZGUIDE, 19

-        HORZGUIDE, 167

-    END

-

-    IDD_CFG_IDS_TAB, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        VERTGUIDE, 13

-        VERTGUIDE, 94

-        VERTGUIDE, 222

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-

-    IDD_CFG_ID_TAB, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        VERTGUIDE, 91

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-

-    IDD_NC_KRB5_PASSWORD, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 293

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 159

-    END

-

-    IDD_CFG_CACHES, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 248

-        VERTGUIDE, 7

-        VERTGUIDE, 13

-        VERTGUIDE, 242

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 175

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_PLUGIN              ICON                    "..\\..\\images\\krb5plugin.ico"

-IDI_DELETED             ICON                    "..\\..\\images\\deleted.ico"

-IDI_NEW                 ICON                    "..\\..\\images\\new.ico"

-IDI_NORMAL              ICON                    "..\\..\\images\\normal.ico"

-IDI_MODIFIED            ICON                    "..\\..\\images\\modified.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_UNK_ADDR_FMT        "Unknown address type %d"

-    IDS_KRB5_CREDTEXT_0     "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Tickets for realm %s</p>"

-    IDS_KRB5_CCNAME_SHORT_DESC "Kerberos v5 CCache"

-    IDS_KEY_ENCTYPE_SHORT_DESC "Session EncType"

-    IDS_TKT_ENCTYPE_SHORT_DESC "Service EncType"

-    IDS_KEY_ENCTYPE_LONG_DESC "Session Key Encryption Type"

-    IDS_TKT_ENCTYPE_LONG_DESC "Service Encryption Type"

-    IDS_ADDR_LIST_SHORT_DESC "Addresses"

-    IDS_ADDR_LIST_LONG_DESC "Address List"

-    IDS_ETYPE_NULL          "NULL"

-    IDS_ETYPE_DES_CBC_CRC   "DES-CBC-CRC"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_ETYPE_DES_CBC_MD4   "DES-CBC-MD4"

-    IDS_ETYPE_DES_CBC_MD5   "DES-CBC-MD5"

-    IDS_ETYPE_DES_CBC_RAW   "DES-CBC-RAW"

-    IDS_ETYPE_DES3_CBC_SHA  "DES3-CBC-SHA"

-    IDS_ETYPE_DES3_CBC_RAW  "DES3-CBC-RAW"

-    IDS_ETYPE_DES_HMAC_SHA1 "DES-HMAC-SHA1"

-    IDS_ETYPE_DES3_CBC_SHA1 "DES3-CBC-SHA1"

-    IDS_ETYPE_AES128_CTS_HMAC_SHA1_96 "AES128_CTS-HMAC-SHA1_96"

-    IDS_ETYPE_AES256_CTS_HMAC_SHA1_96 "AES256_CTS-HMAC-SHA1_96"

-    IDS_ETYPE_ARCFOUR_HMAC  "RC4-HMAC-NT"

-    IDS_ETYPE_ARCFOUR_HMAC_EXP "RC4-HMAC-NT-EXP"

-    IDS_ETYPE_UNKNOWN       "(Unknown)"

-    IDS_ETYPE_LOCAL_DES3_HMAC_SHA1 "LOCAL-DES3-HMAC-SHA1"

-    IDS_ETYPE_LOCAL_RC4_MD4 "LOCAL-RC4-MD4"

-    IDS_KRB5_SHORT_DESC     "Kerberos v5 credentials"

-    IDS_KRB5_LONG_DESC      "Kerberos v5 credentials"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_KRB4_SHORT_DESC     "Kerberos v4"

-    IDS_KRB4_LONG_DESC      "Kerberos v4 credentials"

-    IDS_KRB5_FLAGS_SHORT_DESC "Kerberos v5 Flags"

-    IDS_RENEW_TILL_SHORT_DESC "Renew Till"

-    IDS_RENEW_TILL_LONG_DESC "Renewable Till"

-    IDS_RENEW_FOR_SHORT_DESC "Renew for"

-    IDS_RENEW_FOR_LONG_DESC "Renewable for"

-    IDS_KRB5_CCNAME_LONG_DESC "Kerberos v5 Primary Credentials Cache"

-    IDS_NC_USERNAME         "Username"

-    IDS_NC_REALM            "Realm"

-    IDS_KRB5_WARNING        "Kerberos v5 Warning"

-    IDS_K5ERR_NAME_EXPIRED  "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The selected principal name has expired.</p><p><tab>  Please contact your system administrator.</p>"

-    IDS_K5ERR_KEY_EXPIRED   "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The password for the selected identity has expired.</p><p><tab>  Click <a id=""Krb5Cred:!Passwd"">here</a> to change the password</p>"

-    IDS_KRB5_WARN_FMT       "Kerberos v5: %s\n\n%s"

-    IDS_K5ERR_FMT           "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tag>: %s</p>"

-    IDS_K5CFG_SHORT_DESC    "Kerberos v5"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_K5CFG_LONG_DESC     "Kerberos v5 Configuration"

-    IDS_K5RLM_SHORT_DESC    "Realms"

-    IDS_K5RLM_LONG_DESC     "Kerberos Realm Configuration"

-    IDS_K5CFG_IDS_SHORT_DESC "Kerberos v5"

-    IDS_K5CFG_IDS_LONG_DESC "Kerberos v5 options for all identities"

-    IDS_K5CFG_ID_SHORT_DESC "Kerberos v5"

-    IDS_K5CFG_ID_LONG_DESC  "Kerberos v5 options for this identity"

-    IDS_PLUGIN_DESC         "Kerberos v5 Credentials Provider"

-    IDS_NC_PWD_BANNER       "Changing Kerberos v5 Password"

-    IDS_NC_PWD_PWD          "Current Password"

-    IDS_NC_PWD_NPWD         "New Password"

-    IDS_NC_PWD_NPWD_AGAIN   "New Password again"

-    IDS_KRB5_CREDTEXT_P0    "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Changing password for %s</p>"

-    IDS_K5CFG_IMPORT_OPTIONS "Never,Always,Only when the principal matches"

-    IDS_IDENTPRO_DESC       "Kerberos v5 Identity Provider"

-    IDS_K5CCC_SHORT_DESC    "Credential Caches"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_K5CCC_LONG_DESC     "Kerberos v5 Credential Caches"

-    IDS_CFG_FCTITLE         "File based Credential Caches"

-    IDS_CFG_FCN_WARNING     "Warning:"

-    IDS_CFG_FCN_W_NOTFOUND  "The credentials cache you specified does not exist."

-    IDS_CFG_FCN_W_RELATIVE  "The path you specified not an absolute path."

-    IDS_CFG_FCOPENTITLE     "Select a credential cache to add"

-    IDS_UNAVAILABLE         "(Not available)"

-    IDS_FLG_FORWARDABLE     "Forwardable"

-    IDS_FLG_FORWARDED       "Forwarded"

-    IDS_FLG_PROXIABLE       "Proxiable"

-    IDS_FLG_PROXY           "Proxy"

-    IDS_FLG_MAY_POSTDATE    "May postdate"

-    IDS_FLG_POSTDATED       "Postdated"

-    IDS_FLG_INVALID         "Invalid"

-    IDS_FLG_RENEWABLE       "Renewable"

-    IDS_FLG_INITIAL         "Initial"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_FLG_PRE_AUTH        "Pre-authenticated"

-    IDS_FLG_HW_AUTH         "Hardware authentication"

-    IDS_FLG_TRANSIT_POL     "Transit policy checked"

-    IDS_FLG_OK_DELEGATE     "Approved for delegation"

-    IDS_FLG_ANONYMOUS       "Anonymous"

-    IDS_K5ERR_CANTWRITEPROFILE 

-                            "The Kerberos v5 profile file could not be written"

-    IDS_K5ERR_PROFNOWRITE   "The file %s could not be opened as a profile file for writing."

-    IDS_K5ERR_PROFUSETEMP   "The file %s could not be opened for writing.  The current changes will be saved to %s temporarily."

-    IDS_K5ERR_PROFSUGGEST   "This may be due to not having privileges to modify the configuration file.  Please contact your system administrator to resolve the issue."

-    IDS_CFG_RE_REALMS       "Kerberos Realms"

-    IDS_CFG_RE_KDCS         "Kerberos Servers"

-    IDS_CFG_RE_DMAPS        "Domain mappings"

-    IDS_CFG_RE_KDCS_R       "Kerberos Servers for %s"

-    IDS_CFG_RE_DMAPS_R      "Domains that map to %s"

-    IDS_CFG_RE_HEAD_SVR     "Server"

-    IDS_CFG_RE_HEAD_ADMIN   "Admin"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_CFG_RE_HEAD_MASTER  "Master"

-    IDS_CFG_RE_HEAD_DOMAIN  "Domain"

-    IDS_CFG_RE_NEWREALM     "<New realm...>"

-    IDS_YES                 "Yes"

-    IDS_NO                  "No"

-    IDS_CFG_RE_NEWSERVER    "<New server...>"

-    IDS_CFG_RE_NEWDMAP      "<New domain mapping...>"

-    IDS_KRB5_NC_NAME        "Kerberos v5"

-    IDS_NCERR_IDENT_TOO_LONG "The identity name is too long."

-    IDS_NCERR_IDENT_INVALID "The identity name is invalid."

-    IDS_NCERR_IDENT_UNKNOWN "An unknown error occurred while validating the identity name."

-    IDS_CFG_RE_ARNUT        "Can't add new realm %s"

-    IDS_CFG_RE_ARNUM        "The new realm name %s can't be added because there is already a realm with the same name listed.  Please type another name."

-    IDS_CFG_RE_ASNUT        "Can't add new server %s for realm %s"

-    IDS_CFG_RE_ASNUM        "There already is a server named %s for realm %s. The new server can not be added."

-    IDS_CFG_RE_DMNUT        "Can't add new domain map %s for realm %s"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_CFG_RE_DMNUM        "There already is a domain named %s mapping to realm %s.  The new domain map could not be added."

-    IDS_CFG_RE_MNR          "&Add new realm"

-    IDS_CFG_RE_MDR          "&Remove realm"

-    IDS_CFG_RE_MNK          "&Add new server"

-    IDS_CFG_RE_MDK          "&Remove server"

-    IDS_CFG_RE_MAK          "Toggle a&dmin server"

-    IDS_CFG_RE_MMK          "Toggle &master KDC"

-    IDS_CFG_RE_MND          "&Add new domain mapping"

-    IDS_CFG_RE_MDD          "&Remove domain mapping"

-    IDS_KVNO_SHORT_DESC     "Kvno"

-    IDS_KVNO_LONG_DESC      "Key version number"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "..\..\langres.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\..\\langres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_NC_KRB5 DIALOGEX 0, 0, 300, 166
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Kerberos v5 Credential Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11
+    LTEXT           "Realm",IDC_STATIC,7,25,52,13
+    COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | NOT WS_VISIBLE | WS_DISABLED
+    LTEXT           "&Lifetime",IDC_STATIC,7,67,61,12
+    EDITTEXT        IDC_NCK5_LIFETIME_EDIT,85,67,107,12,ES_AUTOHSCROLL
+    CONTROL         "&Renewable for",IDC_NCK5_RENEWABLE,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,87,64,12
+    EDITTEXT        IDC_NCK5_RENEW_EDIT,85,87,108,12,ES_AUTOHSCROLL
+    CONTROL         "Can be &forwarded to other machines",IDC_NCK5_FORWARDABLE,
+                    "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,107,132,12
+    CONTROL         "Addressless",IDC_NCK5_ADDRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,128,54,10
+    LTEXT           "Additional IP address",IDC_STATIC,118,129,68,8,NOT WS_VISIBLE
+    CONTROL         "",IDC_NCK5_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,193,125,100,15
+END
+
+IDD_PP_KRB5C DIALOGEX 0, 0, 235, 156
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Kerberos v5"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "Name",IDC_STATIC,7,7,19,8
+    LTEXT           "Valid till",IDC_STATIC,7,39,24,8
+    LTEXT           "Renewable till",IDC_STATIC,7,55,45,12
+    LTEXT           "Issued on",IDC_STATIC,7,23,32,8
+    LTEXT           "Credential flags",IDC_STATIC,7,75,51,8
+    EDITTEXT        IDC_PPK5_NAME,72,7,156,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_PPK5_ISSUE,72,23,156,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_PPK5_VALID,72,39,156,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_PPK5_RENEW,72,55,156,12,ES_AUTOHSCROLL | ES_READONLY
+    LISTBOX         IDC_PPK5_FLAGS,72,74,156,75,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_PP_KRB5 DIALOGEX 0, 0, 235, 156
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Kerberos v5"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "Default realm",IDC_STATIC,7,7,44,8
+    LTEXT           "Default lifetime",IDC_STATIC,7,22,49,8
+    LTEXT           "Minimum lifetime",IDC_STATIC,7,37,52,8
+    LTEXT           "Maximum lifetime",IDC_STATIC,7,52,55,8
+    LTEXT           "Renewable lifetime",IDC_STATIC,7,67,61,8
+    LTEXT           "Min. Renewable lifetime",IDC_STATIC,7,82,76,8
+    LTEXT           "Max. Renewable lifetime",IDC_STATIC,7,97,79,8
+    GROUPBOX        "Default credential flags",IDC_STATIC,7,113,221,36
+    CONTROL         "Proxiable",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,129,45,10
+    CONTROL         "Renewable",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,129,51,10
+    CONTROL         "Forwardable",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,129,56,10
+    LTEXT           "ATHENA.MIT.EDU",IDC_STATIC,95,7,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "10 hours",IDC_STATIC,95,22,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "1 minute",IDC_STATIC,95,37,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "7 days",IDC_STATIC,95,52,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "7 days",IDC_STATIC,95,67,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "1 minute",IDC_STATIC,95,82,133,11,0,WS_EX_CLIENTEDGE
+    LTEXT           "21 days",IDC_STATIC,95,97,133,11,0,WS_EX_CLIENTEDGE
+END
+
+IDD_CONFIG DIALOGEX 0, 0, 255, 182
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Default Realm",IDC_CFG_LBL_REALM,13,9,46,8
+    COMBOBOX        IDC_CFG_DEFREALM,76,7,166,51,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Include all configured realms in New Credentials realm list",IDC_CFG_INCREALMS,
+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,26,166,22
+    PUSHBUTTON      "Configure Realms ...",IDC_CFG_CFGREALMS,76,46,84,14,NOT WS_VISIBLE | WS_DISABLED
+    GROUPBOX        "Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47
+    LTEXT           "Location",IDC_CFG_LBL_CFGFILE,13,74,28,8
+    EDITTEXT        IDC_CFG_CFGFILE,76,71,166,14,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "Browse...",IDC_CFG_BROWSE,145,89,44,14,NOT WS_VISIBLE
+    CONTROL         "Create file if missing",IDC_CFG_CREATECONFIG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,76,93,80,10
+    PUSHBUTTON      "Load into realm editor ...",IDC_CFG_BROWSE2,26,89,100,14,NOT WS_VISIBLE
+    GROUPBOX        "Microsoft Windows® Options",IDC_CFG_WINGRP,7,110,241,65
+    LTEXT           "Hostname",IDC_CFG_LBL_HOSTNAME,13,123,33,8
+    EDITTEXT        IDC_CFG_HOSTNAME,76,120,166,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Domain",IDC_CFG_LBL_DOMAIN,13,141,24,8
+    EDITTEXT        IDC_CFG_DOMAIN,76,138,166,14,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Import credentials",IDC_LBL_IMPORT,13,158,45,8
+    COMBOBOX        IDC_CFG_IMPORT,76,156,166,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_CFG_REALMS DIALOGEX 0, 0, 255, 182
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "",IDC_CFG_REALMS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,7,19,81,148
+    GROUPBOX        "Kerberos v5 Servers",IDC_CFG_SERVERSGRP,93,7,155,91
+    GROUPBOX        "Domain to Realm mappings",IDC_CFG_DOMAINGRP,93,101,155,74
+    CONTROL         "",IDC_CFG_KDC,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,19,143,72
+    CONTROL         "",IDC_CFG_DMAP,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,111,143,56
+END
+
+IDD_CFG_IDS_TAB DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Ticket &lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8
+    EDITTEXT        IDC_CFG_DEFLIFE,94,7,134,14,ES_AUTOHSCROLL
+    LTEXT           "Ticket re&newable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8
+    EDITTEXT        IDC_CFG_DEFRLIFE,94,26,134,14,ES_AUTOHSCROLL
+    CONTROL         "&Renewable",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,51,10
+    CONTROL         "&Forwardable",IDC_CFG_FORWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,47,56,10
+    CONTROL         "&Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,63,54,10
+    GROUPBOX        "Credential lifetime range",IDC_CFG_LIFEGRP,7,79,221,31
+    LTEXT           "From",IDC_STATIC,13,93,17,8
+    EDITTEXT        IDC_CFG_LRNG_MIN,38,90,79,14,ES_AUTOHSCROLL
+    LTEXT           "To",IDC_STATIC,125,93,9,8
+    EDITTEXT        IDC_CFG_LRNG_MAX,143,90,79,14,ES_AUTOHSCROLL
+    GROUPBOX        "Credential renewable lifetime range",IDC_STATIC,7,113,221,31
+    LTEXT           "From",IDC_STATIC,13,128,17,8
+    EDITTEXT        IDC_CFG_RLRNG_MIN,38,125,79,14,ES_AUTOHSCROLL
+    LTEXT           "To",IDC_STATIC,125,128,9,8
+    EDITTEXT        IDC_CFG_RLRNG_MAX,143,125,79,14,ES_AUTOHSCROLL
+END
+
+IDD_CFG_ID_TAB DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,58,8
+    EDITTEXT        IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL
+    CONTROL         "Renewable for",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,63,10
+    EDITTEXT        IDC_CFG_DEFRLIFE,91,39,137,14,ES_AUTOHSCROLL
+    CONTROL         "Can be forwarded to other machines",IDC_CFG_FORWARD,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,133,10
+    CONTROL         "Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,54,10
+    LTEXT           "Additional IP address",IDC_STATIC,91,78,68,8,NOT WS_VISIBLE
+    CONTROL         "",IDC_CFG_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,128,89,100,15
+    LTEXT           "Credential cache",IDC_STATIC,7,132,58,8
+    EDITTEXT        IDC_CFG_CCACHE,91,130,137,14,ES_AUTOHSCROLL
+END
+
+IDD_NC_KRB5_PASSWORD DIALOGEX 0, 0, 300, 166
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "Kerberos v5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11
+    LTEXT           "Realm",IDC_STATIC,7,25,52,13
+    COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | WS_DISABLED
+END
+
+IDD_CFG_CACHES DIALOGEX 0, 0, 255, 182
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    GROUPBOX        "File-based Credential Caches",IDC_CFG_FCGRP,7,26,241,149
+    CONTROL         "",IDC_CFG_FCLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,13,37,229,97
+    EDITTEXT        IDC_CFG_FCNAME,13,139,173,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Browse ...",IDC_CFG_BROWSE,192,139,50,14
+    PUSHBUTTON      "Add",IDC_CFG_ADD,13,156,50,14
+    PUSHBUTTON      "Remove Selected",IDC_CFG_REMOVE,88,156,80,14
+    CONTROL         "Include all API: credentials caches",IDC_CFG_INCAPI,
+                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,123,7,125,10
+    CONTROL         "Include Windows LSA cache (MSLSA:)",IDC_CFG_INCMSLSA,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,7,136,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_NC_KRB5, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 293
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 159
+    END
+
+    IDD_PP_KRB5C, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_PP_KRB5, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 248
+        VERTGUIDE, 13
+        VERTGUIDE, 76
+        VERTGUIDE, 242
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 175
+    END
+
+    IDD_CFG_REALMS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 248
+        VERTGUIDE, 93
+        VERTGUIDE, 99
+        VERTGUIDE, 242
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 175
+        HORZGUIDE, 19
+        HORZGUIDE, 167
+    END
+
+    IDD_CFG_IDS_TAB, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        VERTGUIDE, 13
+        VERTGUIDE, 94
+        VERTGUIDE, 222
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+
+    IDD_CFG_ID_TAB, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        VERTGUIDE, 91
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+
+    IDD_NC_KRB5_PASSWORD, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 293
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 159
+    END
+
+    IDD_CFG_CACHES, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 248
+        VERTGUIDE, 7
+        VERTGUIDE, 13
+        VERTGUIDE, 242
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 175
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_PLUGIN              ICON                    "..\\..\\images\\krb5plugin.ico"
+IDI_DELETED             ICON                    "..\\..\\images\\deleted.ico"
+IDI_NEW                 ICON                    "..\\..\\images\\new.ico"
+IDI_NORMAL              ICON                    "..\\..\\images\\normal.ico"
+IDI_MODIFIED            ICON                    "..\\..\\images\\modified.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_UNK_ADDR_FMT        "Unknown address type %d"
+    IDS_KRB5_CREDTEXT_0     "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Tickets for realm %s</p>"
+    IDS_KRB5_CCNAME_SHORT_DESC "Kerberos v5 CCache"
+    IDS_KEY_ENCTYPE_SHORT_DESC "Session EncType"
+    IDS_TKT_ENCTYPE_SHORT_DESC "Service EncType"
+    IDS_KEY_ENCTYPE_LONG_DESC "Session Key Encryption Type"
+    IDS_TKT_ENCTYPE_LONG_DESC "Service Encryption Type"
+    IDS_ADDR_LIST_SHORT_DESC "Addresses"
+    IDS_ADDR_LIST_LONG_DESC "Address List"
+    IDS_ETYPE_NULL          "NULL"
+    IDS_ETYPE_DES_CBC_CRC   "DES-CBC-CRC"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_ETYPE_DES_CBC_MD4   "DES-CBC-MD4"
+    IDS_ETYPE_DES_CBC_MD5   "DES-CBC-MD5"
+    IDS_ETYPE_DES_CBC_RAW   "DES-CBC-RAW"
+    IDS_ETYPE_DES3_CBC_SHA  "DES3-CBC-SHA"
+    IDS_ETYPE_DES3_CBC_RAW  "DES3-CBC-RAW"
+    IDS_ETYPE_DES_HMAC_SHA1 "DES-HMAC-SHA1"
+    IDS_ETYPE_DES3_CBC_SHA1 "DES3-CBC-SHA1"
+    IDS_ETYPE_AES128_CTS_HMAC_SHA1_96 "AES128_CTS-HMAC-SHA1_96"
+    IDS_ETYPE_AES256_CTS_HMAC_SHA1_96 "AES256_CTS-HMAC-SHA1_96"
+    IDS_ETYPE_ARCFOUR_HMAC  "RC4-HMAC-NT"
+    IDS_ETYPE_ARCFOUR_HMAC_EXP "RC4-HMAC-NT-EXP"
+    IDS_ETYPE_UNKNOWN       "(Unknown)"
+    IDS_ETYPE_LOCAL_DES3_HMAC_SHA1 "LOCAL-DES3-HMAC-SHA1"
+    IDS_ETYPE_LOCAL_RC4_MD4 "LOCAL-RC4-MD4"
+    IDS_KRB5_SHORT_DESC     "Kerberos v5 credentials"
+    IDS_KRB5_LONG_DESC      "Kerberos v5 credentials"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_KRB4_SHORT_DESC     "Kerberos v4"
+    IDS_KRB4_LONG_DESC      "Kerberos v4 credentials"
+    IDS_KRB5_FLAGS_SHORT_DESC "Kerberos v5 Flags"
+    IDS_RENEW_TILL_SHORT_DESC "Renew Till"
+    IDS_RENEW_TILL_LONG_DESC "Renewable Till"
+    IDS_RENEW_FOR_SHORT_DESC "Renew for"
+    IDS_RENEW_FOR_LONG_DESC "Renewable for"
+    IDS_KRB5_CCNAME_LONG_DESC "Kerberos v5 Primary Credentials Cache"
+    IDS_NC_USERNAME         "Username"
+    IDS_NC_REALM            "Realm"
+    IDS_KRB5_WARNING        "Kerberos v5 Warning"
+    IDS_K5ERR_NAME_EXPIRED  "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The selected principal name has expired.</p><p><tab>  Please contact your system administrator.</p>"
+    IDS_K5ERR_KEY_EXPIRED   "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The password for the selected identity has expired.</p><p><tab>  Click <a id=""Krb5Cred:!Passwd"">here</a> to change the password</p>"
+    IDS_KRB5_WARN_FMT       "Kerberos v5: %s\n\n%s"
+    IDS_K5ERR_FMT           "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tag>: %s</p>"
+    IDS_K5CFG_SHORT_DESC    "Kerberos v5"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_K5CFG_LONG_DESC     "Kerberos v5 Configuration"
+    IDS_K5RLM_SHORT_DESC    "Realms"
+    IDS_K5RLM_LONG_DESC     "Kerberos Realm Configuration"
+    IDS_K5CFG_IDS_SHORT_DESC "Kerberos v5"
+    IDS_K5CFG_IDS_LONG_DESC "Kerberos v5 options for all identities"
+    IDS_K5CFG_ID_SHORT_DESC "Kerberos v5"
+    IDS_K5CFG_ID_LONG_DESC  "Kerberos v5 options for this identity"
+    IDS_PLUGIN_DESC         "Kerberos v5 Credentials Provider"
+    IDS_NC_PWD_BANNER       "Changing Kerberos v5 Password"
+    IDS_NC_PWD_PWD          "Current Password"
+    IDS_NC_PWD_NPWD         "New Password"
+    IDS_NC_PWD_NPWD_AGAIN   "New Password again"
+    IDS_KRB5_CREDTEXT_P0    "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Changing password for %s</p>"
+    IDS_K5CFG_IMPORT_OPTIONS "Never,Always,Only when the principal matches"
+    IDS_IDENTPRO_DESC       "Kerberos v5 Identity Provider"
+    IDS_K5CCC_SHORT_DESC    "Credential Caches"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_K5CCC_LONG_DESC     "Kerberos v5 Credential Caches"
+    IDS_CFG_FCTITLE         "File based Credential Caches"
+    IDS_CFG_FCN_WARNING     "Warning:"
+    IDS_CFG_FCN_W_NOTFOUND  "The credentials cache you specified does not exist."
+    IDS_CFG_FCN_W_RELATIVE  "The path you specified not an absolute path."
+    IDS_CFG_FCOPENTITLE     "Select a credential cache to add"
+    IDS_UNAVAILABLE         "(Not available)"
+    IDS_FLG_FORWARDABLE     "Forwardable"
+    IDS_FLG_FORWARDED       "Forwarded"
+    IDS_FLG_PROXIABLE       "Proxiable"
+    IDS_FLG_PROXY           "Proxy"
+    IDS_FLG_MAY_POSTDATE    "May postdate"
+    IDS_FLG_POSTDATED       "Postdated"
+    IDS_FLG_INVALID         "Invalid"
+    IDS_FLG_RENEWABLE       "Renewable"
+    IDS_FLG_INITIAL         "Initial"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_FLG_PRE_AUTH        "Pre-authenticated"
+    IDS_FLG_HW_AUTH         "Hardware authentication"
+    IDS_FLG_TRANSIT_POL     "Transit policy checked"
+    IDS_FLG_OK_DELEGATE     "Approved for delegation"
+    IDS_FLG_ANONYMOUS       "Anonymous"
+    IDS_K5ERR_CANTWRITEPROFILE 
+                            "The Kerberos v5 profile file could not be written"
+    IDS_K5ERR_PROFNOWRITE   "The file %s could not be opened as a profile file for writing."
+    IDS_K5ERR_PROFUSETEMP   "The file %s could not be opened for writing.  The current changes will be saved to %s temporarily."
+    IDS_K5ERR_PROFSUGGEST   "This may be due to not having privileges to modify the configuration file.  Please contact your system administrator to resolve the issue."
+    IDS_CFG_RE_REALMS       "Kerberos Realms"
+    IDS_CFG_RE_KDCS         "Kerberos Servers"
+    IDS_CFG_RE_DMAPS        "Domain mappings"
+    IDS_CFG_RE_KDCS_R       "Kerberos Servers for %s"
+    IDS_CFG_RE_DMAPS_R      "Domains that map to %s"
+    IDS_CFG_RE_HEAD_SVR     "Server"
+    IDS_CFG_RE_HEAD_ADMIN   "Admin"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_CFG_RE_HEAD_MASTER  "Master"
+    IDS_CFG_RE_HEAD_DOMAIN  "Domain"
+    IDS_CFG_RE_NEWREALM     "<New realm...>"
+    IDS_YES                 "Yes"
+    IDS_NO                  "No"
+    IDS_CFG_RE_NEWSERVER    "<New server...>"
+    IDS_CFG_RE_NEWDMAP      "<New domain mapping...>"
+    IDS_KRB5_NC_NAME        "Kerberos v5"
+    IDS_NCERR_IDENT_TOO_LONG "The identity name is too long."
+    IDS_NCERR_IDENT_INVALID "The identity name is invalid."
+    IDS_NCERR_IDENT_UNKNOWN "An unknown error occurred while validating the identity name."
+    IDS_CFG_RE_ARNUT        "Can't add new realm %s"
+    IDS_CFG_RE_ARNUM        "The new realm name %s can't be added because there is already a realm with the same name listed.  Please type another name."
+    IDS_CFG_RE_ASNUT        "Can't add new server %s for realm %s"
+    IDS_CFG_RE_ASNUM        "There already is a server named %s for realm %s. The new server can not be added."
+    IDS_CFG_RE_DMNUT        "Can't add new domain map %s for realm %s"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_CFG_RE_DMNUM        "There already is a domain named %s mapping to realm %s.  The new domain map could not be added."
+    IDS_CFG_RE_MNR          "&Add new realm"
+    IDS_CFG_RE_MDR          "&Remove realm"
+    IDS_CFG_RE_MNK          "&Add new server"
+    IDS_CFG_RE_MDK          "&Remove server"
+    IDS_CFG_RE_MAK          "Toggle a&dmin server"
+    IDS_CFG_RE_MMK          "Toggle &master KDC"
+    IDS_CFG_RE_MND          "&Add new domain mapping"
+    IDS_CFG_RE_MDD          "&Remove domain mapping"
+    IDS_KVNO_SHORT_DESC     "Kvno"
+    IDS_KVNO_LONG_DESC      "Key version number"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
+
diff --git a/src/windows/identity/plugins/krb5/lang/krb5_msgs.mc b/src/windows/identity/plugins/krb5/lang/krb5_msgs.mc
index cadc66626..1e9869972 100644
--- a/src/windows/identity/plugins/krb5/lang/krb5_msgs.mc
+++ b/src/windows/identity/plugins/krb5/lang/krb5_msgs.mc
@@ -1,199 +1,199 @@
-; // ** krb5_msgs.mc 

-

-; /* Since .mc files can contain strings from any language, we define

-; all our messages in one file in the /lang/ directory instead of

-; language specific subdirectories. */

-

-; /* The type is set to (wchar_t *) because that's what we will be

-; feeding kherr_report() function. */

-

-; // MessageIdTypedef=LPWSTR

-

-; /* Severity values as defined in the message definition file are

-; currently ignored. */

-

-SeverityNames=(

-        Success=0x0

-)

-

-LanguageNames=(

-        English=0x409:MSG_ENU

-)

-

-OutputBase=16

-

-; /* Actual messages start here */

-

-MessageId=1

-Severity=Success

-SymbolicName=MSG_INITIAL

-Language=English

-Initial placeholder message

-.

-

-MessageId=

-SymbolicName=MSG_CTX_INITAL_CREDS

-Language=English

-Obtaining initial Krb5 credentials

-.

-

-MessageId=

-SymbolicName=MSG_CTX_RENEW_CREDS

-Language=English

-Renewing Krb5 credentials

-.

-

-MessageId=

-SymbolicName=MSG_ERR_UNKNOWN

-Language=English

-An unknown error has occurred.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_PR_UNKNOWN

-Language=English

-You have entered an unknown username/instance/realm combination.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_TKFIL

-Language=English

-The tickets could not be accessed from the memory location where they were stored.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_TKFIL

-Language=English

-This may be due to a problem with the memory where your tickets are stored.  Restarting your computer might be worth a try.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_CLOCKSKEW

-Language=English

-Your computer's clock is out of sync with the Kerberos server.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_CLOCKSKEW

-Language=English

-Synchronize your clock withe the Kerberos server.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_KDC_CONTACT

-Language=English

-Cannot contact the Kerberos server for the requested realm.

-.

- 

-MessageId=

-SymbolicName=MSG_ERR_INSECURE_PW

-Language=English

-You have entered an insecure or weak password.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_NO_IDENTITY

-Language=English

-There were no identities for which to renew credentials.

-.

-

-MessageId=

-SymbolicName=MSG_CTX_PASSWD

-Language=English

-Changing Kerberos 5 Password

-.

-

-MessageId=

-SymbolicName=MSG_PWD_UNKNOWN

-Language=English

-Unknown error

-.

-

-MessageId=

-SymbolicName=MSG_PWD_NOT_SAME

-Language=English

-The new passwords are not the same.

-.

-

-MessageId=

-SymbolicName=MSG_PWD_S_NOT_SAME

-Language=English

-The new password is asked for twice to protect against a mistake when setting the new password.  Both instances of the new password must be the same.  Please correct this and try again.

-.

-

-MessageId=

-SymbolicName=MSG_PWD_SAME

-Language=English

-The new and the old passwords are the same.

-.

-

-MessageId=

-SymbolicName=MSG_PWD_S_SAME

-Language=English

-Please type a new password to continue.

-.

-

-MessageId=

-SymbolicName=MSG_PWD_NO_IDENTITY

-Language=English

-There are no identities selected.

-.

-

-MessageId=

-SymbolicName=MSG_PWD_S_NO_IDENTITY

-Language=English

-Please select an identity to change the password.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_INTEGRITY

-Language=English

-This is commonly caused by an incorrect password.  Please verify that the password is correct and note that passwords are case sensitive.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_CTX_DESTROY_CREDS

-Language=English

-Destroying Krb5 tickets

-.

-

-MessageId=

-SymbolicName=MSG_ERR_NETDOWN

-Language=English

-A network connection is unavailable

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_NETRETRY

-Language=English

-Please check your network connection or contact your network administrator for assistance.

-.

-

-MessageId=

-SymbolicName=MSG_ERR_TEMPDOWN

-Language=English

-A temporary network error caused the operation to fail

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_TEMPDOWN

-Language=English

-Please try again in a few minutes

-.

-

-MessageId=

-SymbolicName=MSG_ERR_NOHOST

-Language=English

-A server could not be reached

-.

-

-MessageId=

-SymbolicName=MSG_ERR_S_NOHOST

-Language=English

-This can be caused by the server being unavailable, network errors, or improper configuration.  Please try again or contact your administrator for assistance.

-.

-

-MessageId=

-SymbolicName=MSG_

-Language=English

-.

+; // ** krb5_msgs.mc 
+
+; /* Since .mc files can contain strings from any language, we define
+; all our messages in one file in the /lang/ directory instead of
+; language specific subdirectories. */
+
+; /* The type is set to (wchar_t *) because that's what we will be
+; feeding kherr_report() function. */
+
+; // MessageIdTypedef=LPWSTR
+
+; /* Severity values as defined in the message definition file are
+; currently ignored. */
+
+SeverityNames=(
+        Success=0x0
+)
+
+LanguageNames=(
+        English=0x409:MSG_ENU
+)
+
+OutputBase=16
+
+; /* Actual messages start here */
+
+MessageId=1
+Severity=Success
+SymbolicName=MSG_INITIAL
+Language=English
+Initial placeholder message
+.
+
+MessageId=
+SymbolicName=MSG_CTX_INITAL_CREDS
+Language=English
+Obtaining initial Krb5 credentials
+.
+
+MessageId=
+SymbolicName=MSG_CTX_RENEW_CREDS
+Language=English
+Renewing Krb5 credentials
+.
+
+MessageId=
+SymbolicName=MSG_ERR_UNKNOWN
+Language=English
+An unknown error has occurred.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_PR_UNKNOWN
+Language=English
+You have entered an unknown username/instance/realm combination.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_TKFIL
+Language=English
+The tickets could not be accessed from the memory location where they were stored.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_TKFIL
+Language=English
+This may be due to a problem with the memory where your tickets are stored.  Restarting your computer might be worth a try.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_CLOCKSKEW
+Language=English
+Your computer's clock is out of sync with the Kerberos server.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_CLOCKSKEW
+Language=English
+Synchronize your clock withe the Kerberos server.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_KDC_CONTACT
+Language=English
+Cannot contact the Kerberos server for the requested realm.
+.
+ 
+MessageId=
+SymbolicName=MSG_ERR_INSECURE_PW
+Language=English
+You have entered an insecure or weak password.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_NO_IDENTITY
+Language=English
+There were no identities for which to renew credentials.
+.
+
+MessageId=
+SymbolicName=MSG_CTX_PASSWD
+Language=English
+Changing Kerberos 5 Password
+.
+
+MessageId=
+SymbolicName=MSG_PWD_UNKNOWN
+Language=English
+Unknown error
+.
+
+MessageId=
+SymbolicName=MSG_PWD_NOT_SAME
+Language=English
+The new passwords are not the same.
+.
+
+MessageId=
+SymbolicName=MSG_PWD_S_NOT_SAME
+Language=English
+The new password is asked for twice to protect against a mistake when setting the new password.  Both instances of the new password must be the same.  Please correct this and try again.
+.
+
+MessageId=
+SymbolicName=MSG_PWD_SAME
+Language=English
+The new and the old passwords are the same.
+.
+
+MessageId=
+SymbolicName=MSG_PWD_S_SAME
+Language=English
+Please type a new password to continue.
+.
+
+MessageId=
+SymbolicName=MSG_PWD_NO_IDENTITY
+Language=English
+There are no identities selected.
+.
+
+MessageId=
+SymbolicName=MSG_PWD_S_NO_IDENTITY
+Language=English
+Please select an identity to change the password.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_INTEGRITY
+Language=English
+This is commonly caused by an incorrect password.  Please verify that the password is correct and note that passwords are case sensitive.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_CTX_DESTROY_CREDS
+Language=English
+Destroying Krb5 tickets
+.
+
+MessageId=
+SymbolicName=MSG_ERR_NETDOWN
+Language=English
+A network connection is unavailable
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_NETRETRY
+Language=English
+Please check your network connection or contact your network administrator for assistance.
+.
+
+MessageId=
+SymbolicName=MSG_ERR_TEMPDOWN
+Language=English
+A temporary network error caused the operation to fail
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_TEMPDOWN
+Language=English
+Please try again in a few minutes
+.
+
+MessageId=
+SymbolicName=MSG_ERR_NOHOST
+Language=English
+A server could not be reached
+.
+
+MessageId=
+SymbolicName=MSG_ERR_S_NOHOST
+Language=English
+This can be caused by the server being unavailable, network errors, or improper configuration.  Please try again or contact your administrator for assistance.
+.
+
+MessageId=
+SymbolicName=MSG_
+Language=English
+.
diff --git a/src/windows/identity/plugins/krb5/version.rc b/src/windows/identity/plugins/krb5/version.rc
index 135b08e25..c894dff63 100644
--- a/src/windows/identity/plugins/krb5/version.rc
+++ b/src/windows/identity/plugins/krb5/version.rc
@@ -1,88 +1,88 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use, copy,

- * modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- */

-

-/* $Id$ */

-

-#include<netidmgr_intver.h>

-

-#ifndef LANGVER

-

-#define STR_FILEDESC "Kerberos v5 Plugin for Network Identity Manager"

-#define STR_INTNAME  "krb5cred"

-#define STR_ORIGNAME "krb5cred.dll"

-

-#else

-

-#ifdef LANG_en_us

-

-#define STR_FILEDESC "English(US) language resources for the Keberos 5 plugin"

-#define STR_INTNAME  "krb5cred_en_us"

-#define STR_ORIGNAME "krb5cred_en_us.dll"

-

-#else

-

-#error Unknown langugae

-

-#endif

-

-#endif

-

-1 VERSIONINFO 

-        FILEVERSION     KH_VERSION_LIST

-        PRODUCTVERSION  KH_VERSION_LIST

-        FILEFLAGSMASK   KH_VER_FILEFLAGMASK

-        FILEFLAGS       KH_VER_FILEFLAGS

-        FILEOS          KH_VER_FILEOS

-        FILETYPE        KH_VER_FILETYPEDLL

-        FILESUBTYPE     0

-  {

-    BLOCK "StringFileInfo"

-    {

-      BLOCK "040904b0"

-      {

-        VALUE "CompanyName",     KH_VERSTR_COMPANY_1033

-        VALUE "FileDescription", STR_FILEDESC

-        VALUE "FileVersion",     KH_VERSTR_VERSION_1033

-        VALUE "InternalName",    STR_INTNAME

-        VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033

-        VALUE "OriginalFilename", STR_ORIGNAME

-        VALUE "ProductName",     "Network Identity Manager"

-        VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033

-#ifdef KH_VERSTR_COMMENT_1033

-        VALUE "Comment", KH_VERSTR_COMMENT_1033

-#endif

-#ifndef LANGVER

-        VALUE NIMV_MODULE,       "MITKrb5"

-        VALUE NIMV_PLUGINS,      "Krb5Cred,Krb5Ident"

-        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI

-        VALUE NIMV_SUPPORT,      "http://web.mit.edu/kerberos"

-#endif

-      }

-    }

-

-    BLOCK "VarFileInfo"

-    {

-        VALUE "Translation", 0x409, 0x4b0

-    }

-  }

+/* Copyright (c) 2004 Massachusetts Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+/* $Id$ */
+
+#include<netidmgr_intver.h>
+
+#ifndef LANGVER
+
+#define STR_FILEDESC "Kerberos v5 Plugin for Network Identity Manager"
+#define STR_INTNAME  "krb5cred"
+#define STR_ORIGNAME "krb5cred.dll"
+
+#else
+
+#ifdef LANG_en_us
+
+#define STR_FILEDESC "English(US) language resources for the Keberos 5 plugin"
+#define STR_INTNAME  "krb5cred_en_us"
+#define STR_ORIGNAME "krb5cred_en_us.dll"
+
+#else
+
+#error Unknown langugae
+
+#endif
+
+#endif
+
+1 VERSIONINFO 
+        FILEVERSION     KH_VERSION_LIST
+        PRODUCTVERSION  KH_VERSION_LIST
+        FILEFLAGSMASK   KH_VER_FILEFLAGMASK
+        FILEFLAGS       KH_VER_FILEFLAGS
+        FILEOS          KH_VER_FILEOS
+        FILETYPE        KH_VER_FILETYPEDLL
+        FILESUBTYPE     0
+  {
+    BLOCK "StringFileInfo"
+    {
+      BLOCK "040904b0"
+      {
+        VALUE "CompanyName",     KH_VERSTR_COMPANY_1033
+        VALUE "FileDescription", STR_FILEDESC
+        VALUE "FileVersion",     KH_VERSTR_VERSION_1033
+        VALUE "InternalName",    STR_INTNAME
+        VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033
+        VALUE "OriginalFilename", STR_ORIGNAME
+        VALUE "ProductName",     "Network Identity Manager"
+        VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033
+#ifdef KH_VERSTR_COMMENT_1033
+        VALUE "Comment", KH_VERSTR_COMMENT_1033
+#endif
+#ifndef LANGVER
+        VALUE NIMV_MODULE,       "MITKrb5"
+        VALUE NIMV_PLUGINS,      "Krb5Cred,Krb5Ident"
+        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI
+        VALUE NIMV_SUPPORT,      "http://web.mit.edu/kerberos"
+#endif
+      }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x409, 0x4b0
+    }
+  }
diff --git a/src/windows/identity/sample/templates/credprov/Makefile b/src/windows/identity/sample/templates/credprov/Makefile
index b9400105a..898c614ca 100644
--- a/src/windows/identity/sample/templates/credprov/Makefile
+++ b/src/windows/identity/sample/templates/credprov/Makefile
@@ -1,278 +1,278 @@
-#

-# Copyright (c) 2006 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-# Environment variables

-# ---------------------

-#

-# Before running the makefile, set the environment variable KFWSDKDIR

-# to the directory containing the Kerberos for Windows SDK version 3.1

-# or later.  The path should not end in a backslash.

-

-# Configuration settings

-# ----------------------

-

-# Declare a few things about our plug-in.

-

-# TODO: Change the plug-in name

-PLUGINNAME=MyPlugin

-

-# TODO: Change the module name

-MODULENAME=MyModule

-

-# TODO: Change the credtype name

-CREDTYPENAME=MyCred

-

-# TODO: Change this as appropriate

-DLLBASENAME=myplugin

-

-# Version info

-

-# TODO: Change the version numbers

-VERMAJOR=0

-VERMINOR=1

-VERAUX  =0

-VERPATCH=0

-

-# Leave these as-is

-VERLIST=$(VERMAJOR).$(VERMINOR).$(VERAUX).$(VERPATCH)

-VERLISTC=$(VERMAJOR),$(VERMINOR),$(VERAUX),$(VERPATCH)

-

-# Various checks

-

-!ifndef MSSDK

-! error Platform SDK environment variables not set.

-!endif

-

-!ifndef KFWSDKDIR

-! error KFWSDKDIR environment variable not set.

-!endif

-

-# Directories

-

-BUILDROOT=.

-

-!ifdef NODEBUG

-BUILDTYPE=release

-!else

-BUILDTYPE=debug

-!endif

-

-!ifndef CPU

-!error Environment variable 'CPU' is not defined.

-!endif

-

-DEST=$(BUILDROOT)\dest\$(CPU)_$(BUILDTYPE)

-OBJ=$(BUILDROOT)\obj\$(CPU)_$(BUILDTYPE)

-

-!ifndef NIDMRAWDIRS

-KFWINCDIR=$(KFWSDKDIR)\inc

-NIDMINCDIR=$(KFWINCDIR)\netidmgr

-NIDMLIBDIR=$(KFWSDKDIR)\lib\$(CPU)

-!else

-NIDMINCDIR=$(KFWSDKDIR)\inc

-NIDMLIBDIR=$(KFWSDKDIR)

-!endif

-

-# Win32.mak

-

-!include <Win32.Mak>

-

-# Program macros

-

-CD=cd

-RM=del /q

-MKDIR=mkdir

-RMDIR=rmdir

-ECHO=echo

-CP=copy /y

-LINK=link

-MC=mc

-

-# Lots more macros

-

-incflags = -I"$(NIDMINCDIR)" -I"$(OBJ)" -I.

-rincflags = /i "$(NIDMINCDIR)" /i "$(OBJ)" /i .

-

-ldebug = $(ldebug) /DEBUG

-cdebug = $(cdebug) -Os -Zi

-

-cdefines = $(cdefines) -DUNICODE -D_UNICODE

-

-C2OBJ=$(CC) $(cdebug) $(cflags) $(incflags) $(cdefines) /Fo"$@" /c $**

-

-DLLGUILINK=$(LINK) /NOLOGO $(ldebug) $(dlllflags) $(guilibsmt) /OUT:"$@" /IMPLIB:$(DEST)\$(@B).lib $**

-

-DLLRESLINK=$(LINK) /NOLOGO /DLL /NOENTRY /MACHINE:$(PROCESSOR_ARCHITECTURE) /OUT:"$@" $**

-

-RC2RES=$(RC) $(RFLAGS) $(rincflags) /fo "$@" $**

-

-MC2RC=$(MC) $(MCFLAGS) -h "$(OBJ)\" -m 1024 -r "$(OBJ)\" -x "$(OBJ)\" $**

-

-{}.c{$(OBJ)}.obj:

-	$(C2OBJ)

-

-{$(OBJ)}.c{$(OBJ)}.obj:

-	$(C2OBJ)

-

-{}.rc{$(OBJ)}.res:

-	$(RC2RES)

-

-mkdirs::

-!if !exist($(DEST))

-	$(MKDIR) "$(DEST)"

-!endif

-!if !exist($(OBJ))

-	$(MKDIR) "$(OBJ)"

-!endif

-

-clean::

-	$(RM) "$(OBJ)\*.*"

-	$(RM) "$(DEST)\*.*"

-

-.SUFFIXES: .h

-

-#

-# Manifest handling

-#

-# Starting with Visual Studio 8, the C compiler and the linker

-# generate manifests so that the applications will link with the

-# correct side-by-side DLLs at run-time.  These are required for

-# correct operation under Windows XP.  We also have custom manifests

-# which need to be merged with the manifests that VS creates.

-#

-# The syntax for invoking the _VC_MANIFEST_EMBED_foo macro is:

-# $(_VC_MANIFEST_EMBED_???) <any additional manifests that need to be merged in>

-#

-

-!ifndef MT

-MT=mt.exe -nologo

-!endif

-

-_VC_MANIFEST_EMBED_EXE= \

-if exist "$@.manifest" $(MT) -outputresource:"$@";1 -manifest "$@.manifest"

-

-_VC_MANIFEST_EMBED_DLL=$(_VC_MANIFEST_EMBED_EXE)

-

-# Note that if you are merging manifests, then the VS generated

-# manifest should be cleaned up after calling _VC_MANIFEST_EMBED_???.

-# This ensures that even if the DLL or EXE is executed in-place, the

-# embedded manifest will be used.  Otherwise the $@.manifest file will

-# be used.

-_VC_MANIFEST_CLEAN= \

-if exist "$@.manifest" $(RM) "$@.manifest"

-

-# End of manifest handling

-

-

-# Now for the actual build stuff

-

-DLL=$(DEST)\$(DLLBASENAME).dll

-

-LIBFILES= \

-	"$(NIDMLIBDIR)\nidmgr32.lib"

-

-OBJFILES= \

-	$(OBJ)\credacq.obj	\

-	$(OBJ)\credtype.obj	\

-	$(OBJ)\main.obj		\

-	$(OBJ)\plugin.obj	\

-	$(OBJ)\proppage.obj	\

-	$(OBJ)\config_main.obj	\

-	$(OBJ)\config_id.obj	\

-	$(OBJ)\config_ids.obj

-

-DLLRESFILE=$(OBJ)\version.res

-

-CONFIGHEADER=$(OBJ)\credacq_config.h

-

-all: mkdirs $(CONFIGHEADER) $(DLL) lang

-

-$(CONFIGHEADER): Makefile

-	$(CP) << "$@"

-/* This is a generated file.  Do not modify directly. */

-

-#pragma once

-

-#define MYPLUGIN_DLLBASE "$(DLLBASENAME)"

-

-#define MYPLUGIN_NAME "$(PLUGINNAME)"

-

-#define MYMODULE_NAME "$(MODULENAME)"

-

-#define MYCREDTYPE_NAME "$(CREDTYPENAME)"

-

-#define VERSION_MAJOR $(VERMAJOR)

-#define VERSION_MINOR $(VERMINOR)

-#define VERSION_AUX   $(VERAUX)

-#define VERSION_PATCH $(VERPATCH)

-

-#define VERSION_LIST  $(VERLIST)

-#define VERSION_LISTC $(VERLISTC)

-#define VERSION_STRING "$(VERLIST)"

-

-<<

-

-clean::

-	$(RM) $(CONFIGHEADER)

-

-$(DLL): $(OBJFILES) $(DLLRESFILE)

-	$(DLLGUILINK) $(LIBFILES)

-	$(_VC_MANIFEST_EMBED_DLL)

-	$(_VC_MANIFEST_CLEAN)

-

-clean::

-	$(RM) $(DLL)

-

-# Language specific resources

-

-# (repeat the following block as needed, redefining LANG for each

-# supported language)

-

-# English-US

-LANG=en_us

-

-LANGDLL=$(DEST)\$(DLLBASENAME)_$(LANG).dll

-

-lang:: $(LANGDLL)

-

-$(LANGDLL): $(OBJ)\langres_$(LANG).res $(OBJ)\version_$(LANG).res

-	$(DLLRESLINK)

-	$(_VC_MANIFEST_EMBED_DLL)

-	$(_VC_MANIFEST_CLEAN)

-

-clean::

-	$(RM) $(LANGDLL)

-

-$(OBJ)\version_$(LANG).res: version.rc

-	$(RC) $(RFLAGS) $(rincflags) /d LANGRES /d LANG_$(LANG) /fo $@ $**

-

-clean::

-	$(RM) $(OBJ)\version_$(LANG).res

-

-$(OBJ)\langres_$(LANG).res: lang\$(LANG)\langres.rc

-	$(RC2RES)

-

-clean::

-	$(RM) $(OBJ)\langres_$(LANG).res

-

-# /English-US

+#
+# Copyright (c) 2006 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# Environment variables
+# ---------------------
+#
+# Before running the makefile, set the environment variable KFWSDKDIR
+# to the directory containing the Kerberos for Windows SDK version 3.1
+# or later.  The path should not end in a backslash.
+
+# Configuration settings
+# ----------------------
+
+# Declare a few things about our plug-in.
+
+# TODO: Change the plug-in name
+PLUGINNAME=MyPlugin
+
+# TODO: Change the module name
+MODULENAME=MyModule
+
+# TODO: Change the credtype name
+CREDTYPENAME=MyCred
+
+# TODO: Change this as appropriate
+DLLBASENAME=myplugin
+
+# Version info
+
+# TODO: Change the version numbers
+VERMAJOR=0
+VERMINOR=1
+VERAUX  =0
+VERPATCH=0
+
+# Leave these as-is
+VERLIST=$(VERMAJOR).$(VERMINOR).$(VERAUX).$(VERPATCH)
+VERLISTC=$(VERMAJOR),$(VERMINOR),$(VERAUX),$(VERPATCH)
+
+# Various checks
+
+!ifndef MSSDK
+! error Platform SDK environment variables not set.
+!endif
+
+!ifndef KFWSDKDIR
+! error KFWSDKDIR environment variable not set.
+!endif
+
+# Directories
+
+BUILDROOT=.
+
+!ifdef NODEBUG
+BUILDTYPE=release
+!else
+BUILDTYPE=debug
+!endif
+
+!ifndef CPU
+!error Environment variable 'CPU' is not defined.
+!endif
+
+DEST=$(BUILDROOT)\dest\$(CPU)_$(BUILDTYPE)
+OBJ=$(BUILDROOT)\obj\$(CPU)_$(BUILDTYPE)
+
+!ifndef NIDMRAWDIRS
+KFWINCDIR=$(KFWSDKDIR)\inc
+NIDMINCDIR=$(KFWINCDIR)\netidmgr
+NIDMLIBDIR=$(KFWSDKDIR)\lib\$(CPU)
+!else
+NIDMINCDIR=$(KFWSDKDIR)\inc
+NIDMLIBDIR=$(KFWSDKDIR)
+!endif
+
+# Win32.mak
+
+!include <Win32.Mak>
+
+# Program macros
+
+CD=cd
+RM=del /q
+MKDIR=mkdir
+RMDIR=rmdir
+ECHO=echo
+CP=copy /y
+LINK=link
+MC=mc
+
+# Lots more macros
+
+incflags = -I"$(NIDMINCDIR)" -I"$(OBJ)" -I.
+rincflags = /i "$(NIDMINCDIR)" /i "$(OBJ)" /i .
+
+ldebug = $(ldebug) /DEBUG
+cdebug = $(cdebug) -Os -Zi
+
+cdefines = $(cdefines) -DUNICODE -D_UNICODE
+
+C2OBJ=$(CC) $(cdebug) $(cflags) $(incflags) $(cdefines) /Fo"$@" /c $**
+
+DLLGUILINK=$(LINK) /NOLOGO $(ldebug) $(dlllflags) $(guilibsmt) /OUT:"$@" /IMPLIB:$(DEST)\$(@B).lib $**
+
+DLLRESLINK=$(LINK) /NOLOGO /DLL /NOENTRY /MACHINE:$(PROCESSOR_ARCHITECTURE) /OUT:"$@" $**
+
+RC2RES=$(RC) $(RFLAGS) $(rincflags) /fo "$@" $**
+
+MC2RC=$(MC) $(MCFLAGS) -h "$(OBJ)\" -m 1024 -r "$(OBJ)\" -x "$(OBJ)\" $**
+
+{}.c{$(OBJ)}.obj:
+	$(C2OBJ)
+
+{$(OBJ)}.c{$(OBJ)}.obj:
+	$(C2OBJ)
+
+{}.rc{$(OBJ)}.res:
+	$(RC2RES)
+
+mkdirs::
+!if !exist($(DEST))
+	$(MKDIR) "$(DEST)"
+!endif
+!if !exist($(OBJ))
+	$(MKDIR) "$(OBJ)"
+!endif
+
+clean::
+	$(RM) "$(OBJ)\*.*"
+	$(RM) "$(DEST)\*.*"
+
+.SUFFIXES: .h
+
+#
+# Manifest handling
+#
+# Starting with Visual Studio 8, the C compiler and the linker
+# generate manifests so that the applications will link with the
+# correct side-by-side DLLs at run-time.  These are required for
+# correct operation under Windows XP.  We also have custom manifests
+# which need to be merged with the manifests that VS creates.
+#
+# The syntax for invoking the _VC_MANIFEST_EMBED_foo macro is:
+# $(_VC_MANIFEST_EMBED_???) <any additional manifests that need to be merged in>
+#
+
+!ifndef MT
+MT=mt.exe -nologo
+!endif
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist "$@.manifest" $(MT) -outputresource:"$@";1 -manifest "$@.manifest"
+
+_VC_MANIFEST_EMBED_DLL=$(_VC_MANIFEST_EMBED_EXE)
+
+# Note that if you are merging manifests, then the VS generated
+# manifest should be cleaned up after calling _VC_MANIFEST_EMBED_???.
+# This ensures that even if the DLL or EXE is executed in-place, the
+# embedded manifest will be used.  Otherwise the $@.manifest file will
+# be used.
+_VC_MANIFEST_CLEAN= \
+if exist "$@.manifest" $(RM) "$@.manifest"
+
+# End of manifest handling
+
+
+# Now for the actual build stuff
+
+DLL=$(DEST)\$(DLLBASENAME).dll
+
+LIBFILES= \
+	"$(NIDMLIBDIR)\nidmgr32.lib"
+
+OBJFILES= \
+	$(OBJ)\credacq.obj	\
+	$(OBJ)\credtype.obj	\
+	$(OBJ)\main.obj		\
+	$(OBJ)\plugin.obj	\
+	$(OBJ)\proppage.obj	\
+	$(OBJ)\config_main.obj	\
+	$(OBJ)\config_id.obj	\
+	$(OBJ)\config_ids.obj
+
+DLLRESFILE=$(OBJ)\version.res
+
+CONFIGHEADER=$(OBJ)\credacq_config.h
+
+all: mkdirs $(CONFIGHEADER) $(DLL) lang
+
+$(CONFIGHEADER): Makefile
+	$(CP) << "$@"
+/* This is a generated file.  Do not modify directly. */
+
+#pragma once
+
+#define MYPLUGIN_DLLBASE "$(DLLBASENAME)"
+
+#define MYPLUGIN_NAME "$(PLUGINNAME)"
+
+#define MYMODULE_NAME "$(MODULENAME)"
+
+#define MYCREDTYPE_NAME "$(CREDTYPENAME)"
+
+#define VERSION_MAJOR $(VERMAJOR)
+#define VERSION_MINOR $(VERMINOR)
+#define VERSION_AUX   $(VERAUX)
+#define VERSION_PATCH $(VERPATCH)
+
+#define VERSION_LIST  $(VERLIST)
+#define VERSION_LISTC $(VERLISTC)
+#define VERSION_STRING "$(VERLIST)"
+
+<<
+
+clean::
+	$(RM) $(CONFIGHEADER)
+
+$(DLL): $(OBJFILES) $(DLLRESFILE)
+	$(DLLGUILINK) $(LIBFILES)
+	$(_VC_MANIFEST_EMBED_DLL)
+	$(_VC_MANIFEST_CLEAN)
+
+clean::
+	$(RM) $(DLL)
+
+# Language specific resources
+
+# (repeat the following block as needed, redefining LANG for each
+# supported language)
+
+# English-US
+LANG=en_us
+
+LANGDLL=$(DEST)\$(DLLBASENAME)_$(LANG).dll
+
+lang:: $(LANGDLL)
+
+$(LANGDLL): $(OBJ)\langres_$(LANG).res $(OBJ)\version_$(LANG).res
+	$(DLLRESLINK)
+	$(_VC_MANIFEST_EMBED_DLL)
+	$(_VC_MANIFEST_CLEAN)
+
+clean::
+	$(RM) $(LANGDLL)
+
+$(OBJ)\version_$(LANG).res: version.rc
+	$(RC) $(RFLAGS) $(rincflags) /d LANGRES /d LANG_$(LANG) /fo $@ $**
+
+clean::
+	$(RM) $(OBJ)\version_$(LANG).res
+
+$(OBJ)\langres_$(LANG).res: lang\$(LANG)\langres.rc
+	$(RC2RES)
+
+clean::
+	$(RM) $(OBJ)\langres_$(LANG).res
+
+# /English-US
diff --git a/src/windows/identity/sample/templates/credprov/README b/src/windows/identity/sample/templates/credprov/README
index f091143c8..2ecf88188 100644
--- a/src/windows/identity/sample/templates/credprov/README
+++ b/src/windows/identity/sample/templates/credprov/README
@@ -1,250 +1,250 @@
-

-  Network Identity Manager

-

-        Credentials Provider Plug-in Template

-

-------------------------------------------------------------------

-

-        CONTENTS

-

-        1.  INTRODUCTION

-        2.  COPYRIGHT AND LICENSE

-        3.  ROADMAP OF THE TEMPLATE

-        4.  BUILD REQUIREMENTS

-        5.  BUILDING

-        6.  RUNNING THE PLUG-IN

-        7.  KNOWN ISSUES

-        8.  SUPPORT / BUG REPORTS

-

-------------------------------------------------------------------

-

-1.      INTRODUCTION

-

-    This directory and subdirectories contain a plug-in template for

-    creating a credentials provider plug-in for Network Identity

-    Manager.  A credentials manager plug-in provides knowledge of a

-    specifc credentials type to the NetIDMgr application and manages

-    those credentials on behalf of NetIDMgr.

-

-    This version of the template adheres to the following version

-    constraints:

-

-        Network Identity Manager API version : 5

-

-    (This API version corresponds to the MIT Kerberos for Windows

-    version 3.1).

-

-    The source files in this template can be used to build the plug-in

-    DLL and the US English resource DLL for the plug-in.  In its

-    current form, the plug-in doesn't do any credentials management.

-    However, it implements a number of stub functions that can be

-    filled in to perform the necessary credentials management

-    operations.

-

-------------------------------------------------------------------

-

-2.      COPYRIGHT AND LICENSE

-

-    Copyright (c) 2006 Secure Endpoints Inc.

-

-    Permission is hereby granted, free of charge, to any person

-    obtaining a copy of this software and associated documentation

-    files (the "Software"), to deal in the Software without

-    restriction, including without limitation the rights to use, copy,

-    modify, merge, publish, distribute, sublicense, and/or sell copies

-    of the Software, and to permit persons to whom the Software is

-    furnished to do so, subject to the following conditions:

-

-    The above copyright notice and this permission notice shall be

-    included in all copies or substantial portions of the Software.

-

-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-    DEALINGS IN THE SOFTWARE.

-

-------------------------------------------------------------------

-

-3.      ROADMAP OF THE TEMPLATE

-

-    The template consists of the following files and directories:

-

-    .\README

-

-        This file.

-

-    .\Makefile

-

-        The primary (and only) Makefile used by 'nmake' to build the

-        plug-in.  In addition to providing build directives, it also

-        contains a set of macros which defines the names and version

-        information that is used throughout the plug-in code.

-

-        Look for the 'Configuration Settings' section of the Makefile

-        for the macros.  If you are basing a plug-in on this template,

-        you will want to change these macros.  These macros will be

-        used to generate 'credacq_config.h', a header file included by

-        'credprov.h' so that the values of the macros can be used in C

-        code.

-

-    .\credprov.h

-

-        The main header file for all the C source files in the

-        plug-in.

-

-    .\main.c

-

-        Provides the entry points for the module.

-

-    .\plugin.c

-

-        Provides the message processing functions and support routines

-        for implementing the plug-in.  Note that some of the message

-        processing routines have been moved to other sources files

-        based on their use.

-

-    .\credtype.c

-

-        Functions for handling our credentials type.

-

-    .\credacq.c

-

-        Handlers for the credentials acquisition messages including

-        handling the user interface for the new credentials dialogs.

-

-    .\proppage.c

-

-        Dialog procedures and support code for displaying property

-        sheets for credentials that belong to our credentials type.

-

-    .\config_main.c

-

-        Dialog procedures and support code for providing the general

-        configuration panel for this plug-in.

-

-    .\config_id.c

-

-        Dialog procedures and support code for providing per-identity

-        configuration for this plug-in.

-

-    .\config_ids.c

-

-        Dialog procedures and support code for providing configuration

-        for defaults across all identities.

-

-    .\version.rc

-

-        Version information for the plug-in as well as all the

-        language resource DLLs.

-

-    .\langres.h

-

-        Declarations for the language resources (see below).  In its

-        current form, it was generated via Visual Studio while editing

-        the language resouces file.

-

-    .\images\plugin.ico

-

-        A generic plug-in icon.

-

-    .\lang\en_us\langres.rc

-

-        US-English language resources.  This will be used to create

-        the language resource DLL.

-

-------------------------------------------------------------------

-

-4.      BUILD REQUIREMENTS

-

-    Microsoft(R) Platform SDK (Windows Server 2003 or later)

-

-        (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/)

-

-    Microsoft(R) Visual C++ (Visual Studio 2003 or later)

-

-        Although not tested, the template should build using the

-        Microsoft Visual C++ toolkit.

-

-    MIT Kerberos for Windows (version 3.1 or later) SDK

-

-        At the current time, version 3.1 is still in beta.  However,

-        the template will not work with the 3.0 SDK due to a number of

-        changes that were made to the NetIDMgr API between 3.0 and

-        3.1.

-

-------------------------------------------------------------------

-

-5.      BUILDING

-

-    The build process is fairly starightforward.  The source is set up

-    to build using 'nmake', a build tool distributed with the Platform

-    SDK as well as with Visual Studio.

-

-    1.  Open a command prompt with a suitable build environment.

-

-        From a plain command prompt, you can set up a debug build

-        environment targetting Windows XP (32-bit) with:

-

-        > "%PROGRAMFILES%\Microsoft Platform SDK\SetEnv.Cmd" /XP32 /DEBUG

-

-    2.  Set the environment variable KFWSDKDIR to point to the root of

-        the Kerberos for Windows 3.1 SDK.  (i.e. %KFWSDKDIR%\inc

-        should be the include directory of the SDK)

-

-        > SET KFWSDKDIR=%PROGRAMFILES%\MIT\Kerberos

-

-    3.  Start the build:

-

-        > NMAKE all

-

-        The build target 'all' builds the plug-in and the language

-        resources.  There is an additional build target 'clean' which

-        removes the temporary files and the binaries generated during

-        the build.

-

-        Assuming everything goes well, the plug-in binaries should be

-        created under a subdirectory under 'dest'.  The name of the

-        subdirectory reflects the target architecture and the build

-        type ('debug' or 'release').

-

-------------------------------------------------------------------

-

-6.      RUNNING THE PLUG-IN

-

-    Once the binaries for the plug-in have been built, you need to

-    register the plug-in with NetIDMgr by adding a registry value as

-    follows:

-

-    [HKEY_CURRENT_USER\Software\MIT\NetIDMgr\PluginManager\Modules\<Module name>]

-       "ImagePath"="<path>"

-

-    The <path> should be the full path to the plug-in DLL.

-

-    <Module name> is the name of the module that you built.  The

-    default value specified in the template is 'MyModule'.  This is

-    the value of the macro 'MODULENAME' defined in the 'Makefile'.

-

-    Once this is done, you need to restart NetIDMgr so that it will

-    pick up the new plug-in.

-

-------------------------------------------------------------------

-

-7.      KNOWN ISSUES

-

-    1.  With the current MIT Kerberos for Windows 3.1 beta, NetIDMgr

-        will fail to load the plug-in when tries to load the plug-in

-        for the first time.  Restarting NetIDMgr will fix the problem.

-        This will be fixed in a future beta and the final release of

-        KfW 3.1

-

-------------------------------------------------------------------

-

-8.      SUPPORT / BUG REPORTS

-

-    Problems should be sent to netidmgr@secure-endpoints.com

-

-------------------------------------------------------------------

+
+  Network Identity Manager
+
+        Credentials Provider Plug-in Template
+
+------------------------------------------------------------------
+
+        CONTENTS
+
+        1.  INTRODUCTION
+        2.  COPYRIGHT AND LICENSE
+        3.  ROADMAP OF THE TEMPLATE
+        4.  BUILD REQUIREMENTS
+        5.  BUILDING
+        6.  RUNNING THE PLUG-IN
+        7.  KNOWN ISSUES
+        8.  SUPPORT / BUG REPORTS
+
+------------------------------------------------------------------
+
+1.      INTRODUCTION
+
+    This directory and subdirectories contain a plug-in template for
+    creating a credentials provider plug-in for Network Identity
+    Manager.  A credentials manager plug-in provides knowledge of a
+    specifc credentials type to the NetIDMgr application and manages
+    those credentials on behalf of NetIDMgr.
+
+    This version of the template adheres to the following version
+    constraints:
+
+        Network Identity Manager API version : 5
+
+    (This API version corresponds to the MIT Kerberos for Windows
+    version 3.1).
+
+    The source files in this template can be used to build the plug-in
+    DLL and the US English resource DLL for the plug-in.  In its
+    current form, the plug-in doesn't do any credentials management.
+    However, it implements a number of stub functions that can be
+    filled in to perform the necessary credentials management
+    operations.
+
+------------------------------------------------------------------
+
+2.      COPYRIGHT AND LICENSE
+
+    Copyright (c) 2006 Secure Endpoints Inc.
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------
+
+3.      ROADMAP OF THE TEMPLATE
+
+    The template consists of the following files and directories:
+
+    .\README
+
+        This file.
+
+    .\Makefile
+
+        The primary (and only) Makefile used by 'nmake' to build the
+        plug-in.  In addition to providing build directives, it also
+        contains a set of macros which defines the names and version
+        information that is used throughout the plug-in code.
+
+        Look for the 'Configuration Settings' section of the Makefile
+        for the macros.  If you are basing a plug-in on this template,
+        you will want to change these macros.  These macros will be
+        used to generate 'credacq_config.h', a header file included by
+        'credprov.h' so that the values of the macros can be used in C
+        code.
+
+    .\credprov.h
+
+        The main header file for all the C source files in the
+        plug-in.
+
+    .\main.c
+
+        Provides the entry points for the module.
+
+    .\plugin.c
+
+        Provides the message processing functions and support routines
+        for implementing the plug-in.  Note that some of the message
+        processing routines have been moved to other sources files
+        based on their use.
+
+    .\credtype.c
+
+        Functions for handling our credentials type.
+
+    .\credacq.c
+
+        Handlers for the credentials acquisition messages including
+        handling the user interface for the new credentials dialogs.
+
+    .\proppage.c
+
+        Dialog procedures and support code for displaying property
+        sheets for credentials that belong to our credentials type.
+
+    .\config_main.c
+
+        Dialog procedures and support code for providing the general
+        configuration panel for this plug-in.
+
+    .\config_id.c
+
+        Dialog procedures and support code for providing per-identity
+        configuration for this plug-in.
+
+    .\config_ids.c
+
+        Dialog procedures and support code for providing configuration
+        for defaults across all identities.
+
+    .\version.rc
+
+        Version information for the plug-in as well as all the
+        language resource DLLs.
+
+    .\langres.h
+
+        Declarations for the language resources (see below).  In its
+        current form, it was generated via Visual Studio while editing
+        the language resouces file.
+
+    .\images\plugin.ico
+
+        A generic plug-in icon.
+
+    .\lang\en_us\langres.rc
+
+        US-English language resources.  This will be used to create
+        the language resource DLL.
+
+------------------------------------------------------------------
+
+4.      BUILD REQUIREMENTS
+
+    Microsoft(R) Platform SDK (Windows Server 2003 or later)
+
+        (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/)
+
+    Microsoft(R) Visual C++ (Visual Studio 2003 or later)
+
+        Although not tested, the template should build using the
+        Microsoft Visual C++ toolkit.
+
+    MIT Kerberos for Windows (version 3.1 or later) SDK
+
+        At the current time, version 3.1 is still in beta.  However,
+        the template will not work with the 3.0 SDK due to a number of
+        changes that were made to the NetIDMgr API between 3.0 and
+        3.1.
+
+------------------------------------------------------------------
+
+5.      BUILDING
+
+    The build process is fairly starightforward.  The source is set up
+    to build using 'nmake', a build tool distributed with the Platform
+    SDK as well as with Visual Studio.
+
+    1.  Open a command prompt with a suitable build environment.
+
+        From a plain command prompt, you can set up a debug build
+        environment targetting Windows XP (32-bit) with:
+
+        > "%PROGRAMFILES%\Microsoft Platform SDK\SetEnv.Cmd" /XP32 /DEBUG
+
+    2.  Set the environment variable KFWSDKDIR to point to the root of
+        the Kerberos for Windows 3.1 SDK.  (i.e. %KFWSDKDIR%\inc
+        should be the include directory of the SDK)
+
+        > SET KFWSDKDIR=%PROGRAMFILES%\MIT\Kerberos
+
+    3.  Start the build:
+
+        > NMAKE all
+
+        The build target 'all' builds the plug-in and the language
+        resources.  There is an additional build target 'clean' which
+        removes the temporary files and the binaries generated during
+        the build.
+
+        Assuming everything goes well, the plug-in binaries should be
+        created under a subdirectory under 'dest'.  The name of the
+        subdirectory reflects the target architecture and the build
+        type ('debug' or 'release').
+
+------------------------------------------------------------------
+
+6.      RUNNING THE PLUG-IN
+
+    Once the binaries for the plug-in have been built, you need to
+    register the plug-in with NetIDMgr by adding a registry value as
+    follows:
+
+    [HKEY_CURRENT_USER\Software\MIT\NetIDMgr\PluginManager\Modules\<Module name>]
+       "ImagePath"="<path>"
+
+    The <path> should be the full path to the plug-in DLL.
+
+    <Module name> is the name of the module that you built.  The
+    default value specified in the template is 'MyModule'.  This is
+    the value of the macro 'MODULENAME' defined in the 'Makefile'.
+
+    Once this is done, you need to restart NetIDMgr so that it will
+    pick up the new plug-in.
+
+------------------------------------------------------------------
+
+7.      KNOWN ISSUES
+
+    1.  With the current MIT Kerberos for Windows 3.1 beta, NetIDMgr
+        will fail to load the plug-in when tries to load the plug-in
+        for the first time.  Restarting NetIDMgr will fix the problem.
+        This will be fixed in a future beta and the final release of
+        KfW 3.1
+
+------------------------------------------------------------------
+
+8.      SUPPORT / BUG REPORTS
+
+    Problems should be sent to netidmgr@secure-endpoints.com
+
+------------------------------------------------------------------
diff --git a/src/windows/identity/sample/templates/credprov/lang/en_us/langres.rc b/src/windows/identity/sample/templates/credprov/lang/en_us/langres.rc
index 7e3702792..ebffa5410 100644
--- a/src/windows/identity/sample/templates/credprov/lang/en_us/langres.rc
+++ b/src/windows/identity/sample/templates/credprov/lang/en_us/langres.rc
@@ -1,204 +1,204 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "..\..\langres.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\..\\langres.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_PLUGIN              ICON                    "..\\..\\images\\plugin.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_PP_CRED DIALOGEX 0, 0, 235, 156

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Property Page"

-FONT 8, "MS Shell Dlg", 0, 0, 0x0

-BEGIN

-    LTEXT           "TODO: layout property page",IDC_STATIC,60,73,110,8

-END

-

-IDD_PP_IDENT DIALOGEX 0, 0, 235, 156

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION

-CAPTION "Property Page"

-FONT 8, "MS Shell Dlg", 0, 0, 0x0

-BEGIN

-    LTEXT           "TODO: layout property page",IDC_STATIC,60,73,106,8

-END

-

-IDD_NEW_CREDS DIALOGEX 0, 0, 300, 166

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "My Cred Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11

-END

-

-IDD_CONFIG DIALOGEX 0, 0, 255, 182

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-END

-

-IDD_CONFIG_ID DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-END

-

-IDD_CONFIG_IDS DIALOGEX 0, 0, 235, 151

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

-BEGIN

-    IDD_PP_CRED, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 149

-    END

-

-    IDD_PP_IDENT, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 149

-    END

-

-    IDD_NEW_CREDS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 293

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 159

-    END

-

-    IDD_CONFIG, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 248

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 175

-    END

-

-    IDD_CONFIG_ID, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-

-    IDD_CONFIG_IDS, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 228

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 144

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_PLUGIN_DESC         "My Credentials Provider Plugin"

-    IDS_CT_SHORT_DESC       "My Cred"

-    IDS_CT_LONG_DESC        "My Credential"

-END

-

-STRINGTABLE 

-BEGIN

-    IDS_NC_CT_TEMPLATE      "<p><a id=""SwitchPanel"" param=""MyCred""><b>My Cred</b></a><tab>: %s</p>"

-    IDS_NC_CT_TEMPLATE_NL   "<p><tab>   %s</p>"

-    IDS_GEN_NONE            "(none)"

-    IDS_CFG_SHORT_DESC      "My Creds"

-    IDS_CFG_LONG_DESC       "My Creds Options"

-    IDS_CFG_IDS_SHORT_DESC  "My Creds"

-    IDS_CFG_IDS_LONG_DESC   "My Creds Options for all identities"

-    IDS_CFG_ID_SHORT_DESC   "My Creds"

-    IDS_CFG_ID_LONG_DESC    "My Creds Options for this identity"

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "..\..\langres.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\\..\\langres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_PLUGIN              ICON                    "..\\..\\images\\plugin.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_PP_CRED DIALOGEX 0, 0, 235, 156
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Property Page"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "TODO: layout property page",IDC_STATIC,60,73,110,8
+END
+
+IDD_PP_IDENT DIALOGEX 0, 0, 235, 156
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Property Page"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+    LTEXT           "TODO: layout property page",IDC_STATIC,60,73,106,8
+END
+
+IDD_NEW_CREDS DIALOGEX 0, 0, 300, 166
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    CONTROL         "My Cred Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11
+END
+
+IDD_CONFIG DIALOGEX 0, 0, 255, 182
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+END
+
+IDD_CONFIG_ID DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+END
+
+IDD_CONFIG_IDS DIALOGEX 0, 0, 235, 151
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_PP_CRED, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_PP_IDENT, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 149
+    END
+
+    IDD_NEW_CREDS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 293
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 159
+    END
+
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 248
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 175
+    END
+
+    IDD_CONFIG_ID, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+
+    IDD_CONFIG_IDS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 228
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 144
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_PLUGIN_DESC         "My Credentials Provider Plugin"
+    IDS_CT_SHORT_DESC       "My Cred"
+    IDS_CT_LONG_DESC        "My Credential"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_NC_CT_TEMPLATE      "<p><a id=""SwitchPanel"" param=""MyCred""><b>My Cred</b></a><tab>: %s</p>"
+    IDS_NC_CT_TEMPLATE_NL   "<p><tab>   %s</p>"
+    IDS_GEN_NONE            "(none)"
+    IDS_CFG_SHORT_DESC      "My Creds"
+    IDS_CFG_LONG_DESC       "My Creds Options"
+    IDS_CFG_IDS_SHORT_DESC  "My Creds"
+    IDS_CFG_IDS_LONG_DESC   "My Creds Options for all identities"
+    IDS_CFG_ID_SHORT_DESC   "My Creds"
+    IDS_CFG_ID_LONG_DESC    "My Creds Options for this identity"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/src/windows/identity/sample/templates/credprov/version.rc b/src/windows/identity/sample/templates/credprov/version.rc
index c27766761..47b032c4f 100644
--- a/src/windows/identity/sample/templates/credprov/version.rc
+++ b/src/windows/identity/sample/templates/credprov/version.rc
@@ -1,94 +1,94 @@
-/* Copyright (c) 2006 Secure Endpoints Inc.

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use, copy,

- * modify, merge, publish, distribute, sublicense, and/or sell copies

- * of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- */

-

-/* $Id$ */

-

-#include "credprov.h"

-#include<netidmgr_version.h>

-

-/* We use the same version.rc file for the main plugin DLL as well as

-   for the localized resource DLLs.*/

-

-#ifndef LANGVER

-

-#define STR_FILEDESC "My Credentials Provider Plugin for NetIDMgr"

-#define STR_INTNAME  MYPLUGIN_NAME

-#define STR_ORIGNAME MYPLUGIN_DLLBASE ".dll"

-

-#else

-

-#ifdef LANG_en_us

-

-#define STR_FILEDESC "English(US) language resources for My Credentials Provider"

-#define STR_INTNAME  MYPLUGIN_DLLBASE "_en_us"

-#define STR_ORIGNAME MYPLUGIN_DLLBASE "_en_us.dll"

-

-#else

-

-#error Unknown langugae

-

-#endif

-

-#endif

-

-1 VERSIONINFO 

-        FILEVERSION     VERSION_LISTC

-        PRODUCTVERSION  VERSION_LISTC

-        FILEFLAGSMASK   KH_VER_FILEFLAGMASK

-        FILEFLAGS       KH_VER_FILEFLAGS

-        FILEOS          KH_VER_FILEOS

-        FILETYPE        KH_VER_FILETYPEDLL

-        FILESUBTYPE     0

-  {

-

-    BLOCK "StringFileInfo"

-    {

-      BLOCK "040904b0"

-      {

-        VALUE "CompanyName",     "My Company"

-        VALUE "FileDescription", "My Credentials Provider Plugin"

-        VALUE "FileVersion",     VERSION_STRING

-        VALUE "InternalName",    STR_INTNAME

-        VALUE "LegalCopyright",  "(C) 2006 My Company"

-        VALUE "OriginalFilename", STR_ORIGNAME

-        VALUE "ProductName",     "My Plugin Product"

-        VALUE "ProductVersion",  VERSION_STRING

-#ifndef LANGVER

-        VALUE NIMV_MODULE,       MYMODULE_NAME

-

-/* if more than one plugin is provided by this module, then all of

-   those plugins should be listed here separated by commas. */

-        VALUE NIMV_PLUGINS,      MYPLUGIN_NAME

-

-        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI

-        VALUE NIMV_SUPPORT,      "http://example.com/myplugin"

-#endif

-      }

-    }

-

-    BLOCK "VarFileInfo"

-    {

-        VALUE "Translation", 0x409, 1200

-    }

-  }

+/* Copyright (c) 2006 Secure Endpoints Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+/* $Id$ */
+
+#include "credprov.h"
+#include<netidmgr_version.h>
+
+/* We use the same version.rc file for the main plugin DLL as well as
+   for the localized resource DLLs.*/
+
+#ifndef LANGVER
+
+#define STR_FILEDESC "My Credentials Provider Plugin for NetIDMgr"
+#define STR_INTNAME  MYPLUGIN_NAME
+#define STR_ORIGNAME MYPLUGIN_DLLBASE ".dll"
+
+#else
+
+#ifdef LANG_en_us
+
+#define STR_FILEDESC "English(US) language resources for My Credentials Provider"
+#define STR_INTNAME  MYPLUGIN_DLLBASE "_en_us"
+#define STR_ORIGNAME MYPLUGIN_DLLBASE "_en_us.dll"
+
+#else
+
+#error Unknown langugae
+
+#endif
+
+#endif
+
+1 VERSIONINFO 
+        FILEVERSION     VERSION_LISTC
+        PRODUCTVERSION  VERSION_LISTC
+        FILEFLAGSMASK   KH_VER_FILEFLAGMASK
+        FILEFLAGS       KH_VER_FILEFLAGS
+        FILEOS          KH_VER_FILEOS
+        FILETYPE        KH_VER_FILETYPEDLL
+        FILESUBTYPE     0
+  {
+
+    BLOCK "StringFileInfo"
+    {
+      BLOCK "040904b0"
+      {
+        VALUE "CompanyName",     "My Company"
+        VALUE "FileDescription", "My Credentials Provider Plugin"
+        VALUE "FileVersion",     VERSION_STRING
+        VALUE "InternalName",    STR_INTNAME
+        VALUE "LegalCopyright",  "(C) 2006 My Company"
+        VALUE "OriginalFilename", STR_ORIGNAME
+        VALUE "ProductName",     "My Plugin Product"
+        VALUE "ProductVersion",  VERSION_STRING
+#ifndef LANGVER
+        VALUE NIMV_MODULE,       MYMODULE_NAME
+
+/* if more than one plugin is provided by this module, then all of
+   those plugins should be listed here separated by commas. */
+        VALUE NIMV_PLUGINS,      MYPLUGIN_NAME
+
+        VALUE NIMV_APIVER,       KH_VERSION_STRINGAPI
+        VALUE NIMV_SUPPORT,      "http://example.com/myplugin"
+#endif
+      }
+    }
+
+    BLOCK "VarFileInfo"
+    {
+        VALUE "Translation", 0x409, 1200
+    }
+  }
diff --git a/src/windows/identity/ui/appver.rc b/src/windows/identity/ui/appver.rc
index 58a69a472..324ad5231 100644
--- a/src/windows/identity/ui/appver.rc
+++ b/src/windows/identity/ui/appver.rc
@@ -1,40 +1,40 @@
-

-#include<windows.h>

-#include<netidmgr_intver.h>

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION    KH_VERSION_LIST

- PRODUCTVERSION KH_VERSION_LIST

- FILEFLAGSMASK  0x17L

- FILEFLAGS      KH_VER_FILEFLAGS

- FILEOS         KH_VER_FILEOS

- FILETYPE       0x0L

- FILESUBTYPE    0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904b0"

-        BEGIN

-            VALUE "CompanyName", KH_VERSTR_COMPANY_1033

-            VALUE "FileDescription", "Network Identity Manager"

-            VALUE "FileVersion", KH_VERSTR_VERSION_1033

-            VALUE "InternalName", "NetIDMgr"

-            VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033

-            VALUE "OriginalFilename", "netidmgr.exe"

-            VALUE "ProductName", "Network Identity Manager"

-            VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033

-#ifdef KH_VERSTR_COMMENT_1033

-            VALUE "Comment", KH_VERSTR_COMMENT_1033

-#endif

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1200

-    END

-END

+
+#include<windows.h>
+#include<netidmgr_intver.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION    KH_VERSION_LIST
+ PRODUCTVERSION KH_VERSION_LIST
+ FILEFLAGSMASK  0x17L
+ FILEFLAGS      KH_VER_FILEFLAGS
+ FILEOS         KH_VER_FILEOS
+ FILETYPE       0x0L
+ FILESUBTYPE    0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", KH_VERSTR_COMPANY_1033
+            VALUE "FileDescription", "Network Identity Manager"
+            VALUE "FileVersion", KH_VERSTR_VERSION_1033
+            VALUE "InternalName", "NetIDMgr"
+            VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033
+            VALUE "OriginalFilename", "netidmgr.exe"
+            VALUE "ProductName", "Network Identity Manager"
+            VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033
+#ifdef KH_VERSTR_COMMENT_1033
+            VALUE "Comment", KH_VERSTR_COMMENT_1033
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/src/windows/identity/ui/lang/en_us/cmdline.rtf b/src/windows/identity/ui/lang/en_us/cmdline.rtf
index 8a16b8e8f..ca90069db 100644
--- a/src/windows/identity/ui/lang/en_us/cmdline.rtf
+++ b/src/windows/identity/ui/lang/en_us/cmdline.rtf
diff --git a/src/windows/identity/ui/makeacceldef.pl b/src/windows/identity/ui/makeacceldef.pl
index f13a3ec18..d1cfb2dd2 100644
--- a/src/windows/identity/ui/makeacceldef.pl
+++ b/src/windows/identity/ui/makeacceldef.pl
@@ -1,29 +1,29 @@
-#

-

-die "Please specify input and output filenames" if($#ARGV != 1);

-

-open INF, '<', $ARGV[0] or die "Can't open input file";

-open OUF, '>', $ARGV[1] or die "Can't open output file";

-

-print OUF <<EOS;

-#include<khimaira.h>

-

-    khui_accel_def khui_accel_global[] = {

-EOS

-

-# skip first line

-    <INF>;

-

-while(<INF>) {

-    print OUF "{".$_."},\n";

-}

-

-print OUF <<EOS;

-};

-

-int khui_n_accel_global = sizeof(khui_accel_global) / sizeof(khui_accel_def);

-

-EOS

-

-close INF;

-close OUF;

+#
+
+die "Please specify input and output filenames" if($#ARGV != 1);
+
+open INF, '<', $ARGV[0] or die "Can't open input file";
+open OUF, '>', $ARGV[1] or die "Can't open output file";
+
+print OUF <<EOS;
+#include<khimaira.h>
+
+    khui_accel_def khui_accel_global[] = {
+EOS
+
+# skip first line
+    <INF>;
+
+while(<INF>) {
+    print OUF "{".$_."},\n";
+}
+
+print OUF <<EOS;
+};
+
+int khui_n_accel_global = sizeof(khui_accel_global) / sizeof(khui_accel_def);
+
+EOS
+
+close INF;
+close OUF;
diff --git a/src/windows/identity/ui/makeactiondef.pl b/src/windows/identity/ui/makeactiondef.pl
index a83325b3a..f99373588 100644
--- a/src/windows/identity/ui/makeactiondef.pl
+++ b/src/windows/identity/ui/makeactiondef.pl
@@ -1,29 +1,29 @@
-#

-

-die "Please specify input and output filenames" if($#ARGV != 1);

-

-open INF, '<', $ARGV[0] or die "Can't open input file";

-open OUF, '>', $ARGV[1] or die "Can't open output file";

-

-print OUF <<EOS;

-#include<khimaira.h>

-

-    khui_action khui_actions[] = {

-EOS

-

-# skip first line

-    <INF>;

-

-while(<INF>) {

-    print OUF "{".$_."},\n";

-}

-

-print OUF <<EOS;

-};

-

-int khui_n_actions = sizeof(khui_actions) / sizeof(khui_action);

-

-EOS

-

-close INF;

-close OUF;

+#
+
+die "Please specify input and output filenames" if($#ARGV != 1);
+
+open INF, '<', $ARGV[0] or die "Can't open input file";
+open OUF, '>', $ARGV[1] or die "Can't open output file";
+
+print OUF <<EOS;
+#include<khimaira.h>
+
+    khui_action khui_actions[] = {
+EOS
+
+# skip first line
+    <INF>;
+
+while(<INF>) {
+    print OUF "{".$_."},\n";
+}
+
+print OUF <<EOS;
+};
+
+int khui_n_actions = sizeof(khui_actions) / sizeof(khui_action);
+
+EOS
+
+close INF;
+close OUF;
diff --git a/src/windows/identity/ui/netidmgr.exe.manifest.i386 b/src/windows/identity/ui/netidmgr.exe.manifest.i386
index 5e83258c4..3d77cce68 100644
--- a/src/windows/identity/ui/netidmgr.exe.manifest.i386
+++ b/src/windows/identity/ui/netidmgr.exe.manifest.i386
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-<assemblyIdentity

-    version="1.0.0.0"

-    processorArchitecture="X86"

-    name="MIT.NetIDMgr.UI"

-    type="win32"

-/>

-<description>Khimaira Credentials Manager</description>

-<dependency>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.Windows.Common-Controls"

-            version="6.0.0.0"

-            processorArchitecture="X86"

-            publicKeyToken="6595b64144ccf1df"

-            language="*"

-        />

-    </dependentAssembly>

-</dependency>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="MIT.NetIDMgr.UI"
+    type="win32"
+/>
+<description>Khimaira Credentials Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/identity/ui/netidmgr.manifest.i386.vc7 b/src/windows/identity/ui/netidmgr.manifest.i386.vc7
index 5e83258c4..3d77cce68 100644
--- a/src/windows/identity/ui/netidmgr.manifest.i386.vc7
+++ b/src/windows/identity/ui/netidmgr.manifest.i386.vc7
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-<assemblyIdentity

-    version="1.0.0.0"

-    processorArchitecture="X86"

-    name="MIT.NetIDMgr.UI"

-    type="win32"

-/>

-<description>Khimaira Credentials Manager</description>

-<dependency>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.Windows.Common-Controls"

-            version="6.0.0.0"

-            processorArchitecture="X86"

-            publicKeyToken="6595b64144ccf1df"

-            language="*"

-        />

-    </dependentAssembly>

-</dependency>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="MIT.NetIDMgr.UI"
+    type="win32"
+/>
+<description>Khimaira Credentials Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/identity/ui/netidmgr.manifest.i386.vc7.debug b/src/windows/identity/ui/netidmgr.manifest.i386.vc7.debug
index 5e83258c4..3d77cce68 100644
--- a/src/windows/identity/ui/netidmgr.manifest.i386.vc7.debug
+++ b/src/windows/identity/ui/netidmgr.manifest.i386.vc7.debug
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-<assemblyIdentity

-    version="1.0.0.0"

-    processorArchitecture="X86"

-    name="MIT.NetIDMgr.UI"

-    type="win32"

-/>

-<description>Khimaira Credentials Manager</description>

-<dependency>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.Windows.Common-Controls"

-            version="6.0.0.0"

-            processorArchitecture="X86"

-            publicKeyToken="6595b64144ccf1df"

-            language="*"

-        />

-    </dependentAssembly>

-</dependency>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="MIT.NetIDMgr.UI"
+    type="win32"
+/>
+<description>Khimaira Credentials Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/identity/ui/netidmgr.manifest.i386.vc8 b/src/windows/identity/ui/netidmgr.manifest.i386.vc8
index 84d91a339..d2ced7fd2 100644
--- a/src/windows/identity/ui/netidmgr.manifest.i386.vc8
+++ b/src/windows/identity/ui/netidmgr.manifest.i386.vc8
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-<assemblyIdentity

-    version="1.0.0.0"

-    processorArchitecture="X86"

-    name="MIT.NetIDMgr.UI"

-    type="win32"

-/>

-<description>Khimaira Credentials Manager</description>

-<dependency>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.Windows.Common-Controls"

-            version="6.0.0.0"

-            processorArchitecture="X86"

-            publicKeyToken="6595b64144ccf1df"

-            language="*"

-        />

-    </dependentAssembly>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.VC80.DebugCRT"

-            version="8.0.50215.4652"

-            processorArchitecture="x86"

-            publicKeyToken="1fc8b3b9a1e18e3b"

-        />

-    </dependentAssembly>

-</dependency>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="MIT.NetIDMgr.UI"
+    type="win32"
+/>
+<description>Khimaira Credentials Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.VC80.DebugCRT"
+            version="8.0.50215.4652"
+            processorArchitecture="x86"
+            publicKeyToken="1fc8b3b9a1e18e3b"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/identity/ui/netidmgr.manifest.i386.vc8.debug b/src/windows/identity/ui/netidmgr.manifest.i386.vc8.debug
index 84d91a339..d2ced7fd2 100644
--- a/src/windows/identity/ui/netidmgr.manifest.i386.vc8.debug
+++ b/src/windows/identity/ui/netidmgr.manifest.i386.vc8.debug
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

-<assemblyIdentity

-    version="1.0.0.0"

-    processorArchitecture="X86"

-    name="MIT.NetIDMgr.UI"

-    type="win32"

-/>

-<description>Khimaira Credentials Manager</description>

-<dependency>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.Windows.Common-Controls"

-            version="6.0.0.0"

-            processorArchitecture="X86"

-            publicKeyToken="6595b64144ccf1df"

-            language="*"

-        />

-    </dependentAssembly>

-    <dependentAssembly>

-        <assemblyIdentity

-            type="win32"

-            name="Microsoft.VC80.DebugCRT"

-            version="8.0.50215.4652"

-            processorArchitecture="x86"

-            publicKeyToken="1fc8b3b9a1e18e3b"

-        />

-    </dependentAssembly>

-</dependency>

-</assembly>

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="MIT.NetIDMgr.UI"
+    type="win32"
+/>
+<description>Khimaira Credentials Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.VC80.DebugCRT"
+            version="8.0.50215.4652"
+            processorArchitecture="x86"
+            publicKeyToken="1fc8b3b9a1e18e3b"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/identity/uilib/Makefile b/src/windows/identity/uilib/Makefile
index 349263d3c..5c019b454 100644
--- a/src/windows/identity/uilib/Makefile
+++ b/src/windows/identity/uilib/Makefile
@@ -1,68 +1,68 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=uilib

-!include <../config/Makefile.w32>

-

-UIDLLOBJFILES=			\

-	$(OBJ)\rescache.obj 	\

-	$(OBJ)\action.obj 	\

-	$(OBJ)\creddlg.obj	\

-	$(OBJ)\alert.obj 	\

-	$(OBJ)\propsheet.obj 	\

-	$(OBJ)\propwnd.obj 	\

-	$(OBJ)\uilibmain.obj 	\

-	$(OBJ)\actiondef.obj 	\

-	$(OBJ)\acceldef.obj	\

-	$(OBJ)\configui.obj	\

-	$(OBJ)\trackerwnd.obj	\

-	$(OBJ)\uibind.obj	\

-	$(OBJ)\version.obj

-

-INCFILES=			\

-	$(INCDIR)\khuidefs.h	\

-	$(INCDIR)\khrescache.h 	\

-	$(INCDIR)\khaction.h 	\

-	$(INCDIR)\khactiondef.h	\

-	$(INCDIR)\khalerts.h	\

-	$(INCDIR)\khhtlink.h	\

-	$(INCDIR)\khnewcred.h	\

-	$(INCDIR)\khprops.h	\

-	$(INCDIR)\khconfigui.h	\

-	$(INCDIR)\khtracker.h	\

-	$(INCDIR)\khremote.h	\

-	$(INCDIR)\intaction.h	\

-	$(INCDIR)\intalert.h

-

-$(OBJ)\actiondef.c: actions.csv actiondef.cfg

-	$(CCSV) $** $@

-

-$(OBJ)\acceldef.c: accel.csv acceldef.cfg

-	$(CCSV) $** $@

-

-all: mkdirs $(INCFILES) $(UIDLLOBJFILES)

-

-clean::

-	if exist "$(INCDIR)" $(RM) $(INCFILES)

-

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=uilib
+!include <../config/Makefile.w32>
+
+UIDLLOBJFILES=			\
+	$(OBJ)\rescache.obj 	\
+	$(OBJ)\action.obj 	\
+	$(OBJ)\creddlg.obj	\
+	$(OBJ)\alert.obj 	\
+	$(OBJ)\propsheet.obj 	\
+	$(OBJ)\propwnd.obj 	\
+	$(OBJ)\uilibmain.obj 	\
+	$(OBJ)\actiondef.obj 	\
+	$(OBJ)\acceldef.obj	\
+	$(OBJ)\configui.obj	\
+	$(OBJ)\trackerwnd.obj	\
+	$(OBJ)\uibind.obj	\
+	$(OBJ)\version.obj
+
+INCFILES=			\
+	$(INCDIR)\khuidefs.h	\
+	$(INCDIR)\khrescache.h 	\
+	$(INCDIR)\khaction.h 	\
+	$(INCDIR)\khactiondef.h	\
+	$(INCDIR)\khalerts.h	\
+	$(INCDIR)\khhtlink.h	\
+	$(INCDIR)\khnewcred.h	\
+	$(INCDIR)\khprops.h	\
+	$(INCDIR)\khconfigui.h	\
+	$(INCDIR)\khtracker.h	\
+	$(INCDIR)\khremote.h	\
+	$(INCDIR)\intaction.h	\
+	$(INCDIR)\intalert.h
+
+$(OBJ)\actiondef.c: actions.csv actiondef.cfg
+	$(CCSV) $** $@
+
+$(OBJ)\acceldef.c: accel.csv acceldef.cfg
+	$(CCSV) $** $@
+
+all: mkdirs $(INCFILES) $(UIDLLOBJFILES)
+
+clean::
+	if exist "$(INCDIR)" $(RM) $(INCFILES)
+
diff --git a/src/windows/identity/uilib/accel.csv b/src/windows/identity/uilib/accel.csv
index 2984eba61..d55bff0b7 100644
--- a/src/windows/identity/uilib/accel.csv
+++ b/src/windows/identity/uilib/accel.csv
@@ -1,26 +1,26 @@
-command,mod,key,scope

-KHUI_PACTION_MENU,FVIRTKEY,VK_F10,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_UP,FVIRTKEY,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_UP_EXTEND,FVIRTKEY|FSHIFT,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_UP_TOGGLE,FVIRTKEY|FCONTROL,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_PGUP,FVIRTKEY,VK_PRIOR,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_PGUP_EXTEND,FVIRTKEY|FSHIFT,VK_PRIOR,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_DOWN,FVIRTKEY,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_DOWN_EXTEND,FVIRTKEY|FSHIFT,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_DOWN_TOGGLE,FVIRTKEY|FCONTROL,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_PGDN,FVIRTKEY,VK_NEXT,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_PGDN_EXTEND,FVIRTKEY|FSHIFT,VK_NEXT,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_LEFT,FVIRTKEY,VK_LEFT,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_RIGHT,FVIRTKEY,VK_RIGHT,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_ENTER,FVIRTKEY,VK_RETURN,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_ESC,FVIRTKEY,VK_ESCAPE,KHUI_ACCEL_SCOPE_GLOBAL

-#KHUI_PACTION_DELETE,FVIRTKEY,VK_DELETE,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_DESTROY_CRED,FVIRTKEY,VK_DELETE,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_EXIT,FCONTROL|FVIRTKEY,\'X\',KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_VIEW_REFRESH,FVIRTKEY,VK_F5,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_NEW_CRED,FCONTROL|FVIRTKEY,\'N\',KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_RENEW_CRED,FCONTROL|FVIRTKEY,\'R\',KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_IMPORT,FCONTROL|FVIRTKEY,\'I\',KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_DESTROY_CRED,FCONTROL|FVIRTKEY,\'D\',KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_ACTION_LAYOUT_MINI,FVIRTKEY,VK_F7,KHUI_ACCEL_SCOPE_GLOBAL

-KHUI_PACTION_SELALL,FCONTROL|FVIRTKEY,\'A\',KHUI_ACCEL_SCOPE_GLOBAL

+command,mod,key,scope
+KHUI_PACTION_MENU,FVIRTKEY,VK_F10,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_UP,FVIRTKEY,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_UP_EXTEND,FVIRTKEY|FSHIFT,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_UP_TOGGLE,FVIRTKEY|FCONTROL,VK_UP,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_PGUP,FVIRTKEY,VK_PRIOR,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_PGUP_EXTEND,FVIRTKEY|FSHIFT,VK_PRIOR,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_DOWN,FVIRTKEY,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_DOWN_EXTEND,FVIRTKEY|FSHIFT,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_DOWN_TOGGLE,FVIRTKEY|FCONTROL,VK_DOWN,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_PGDN,FVIRTKEY,VK_NEXT,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_PGDN_EXTEND,FVIRTKEY|FSHIFT,VK_NEXT,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_LEFT,FVIRTKEY,VK_LEFT,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_RIGHT,FVIRTKEY,VK_RIGHT,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_ENTER,FVIRTKEY,VK_RETURN,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_ESC,FVIRTKEY,VK_ESCAPE,KHUI_ACCEL_SCOPE_GLOBAL
+#KHUI_PACTION_DELETE,FVIRTKEY,VK_DELETE,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_DESTROY_CRED,FVIRTKEY,VK_DELETE,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_EXIT,FCONTROL|FVIRTKEY,\'X\',KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_VIEW_REFRESH,FVIRTKEY,VK_F5,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_NEW_CRED,FCONTROL|FVIRTKEY,\'N\',KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_RENEW_CRED,FCONTROL|FVIRTKEY,\'R\',KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_IMPORT,FCONTROL|FVIRTKEY,\'I\',KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_DESTROY_CRED,FCONTROL|FVIRTKEY,\'D\',KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_ACTION_LAYOUT_MINI,FVIRTKEY,VK_F7,KHUI_ACCEL_SCOPE_GLOBAL
+KHUI_PACTION_SELALL,FCONTROL|FVIRTKEY,\'A\',KHUI_ACCEL_SCOPE_GLOBAL
diff --git a/src/windows/identity/uilib/acceldef.cfg b/src/windows/identity/uilib/acceldef.cfg
index 3be4f2e46..20bbeb581 100644
--- a/src/windows/identity/uilib/acceldef.cfg
+++ b/src/windows/identity/uilib/acceldef.cfg
@@ -1,51 +1,51 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation

-# files (the "Software"), to deal in the Software without

-# restriction, including without limitation the rights to use, copy,

-# modify, merge, publish, distribute, sublicense, and/or sell copies

-# of the Software, and to permit persons to whom the Software is

-# furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-#

-

-$file_prefix = <<EOS;

-/*

-This file was autogenerated from src/ui/acceldef.cfg and src/ui/accel.csv.

-

-Do not modify directly.

-*/

-#define NOEXPORT

-#include<khuidefs.h>

-

-khui_accel_def khui_accel_global[] = {

-EOS

-

-$record_prefix = "{";

-

-$record_sep = ",\n";

-

-$record_postfix = "}";

-

-$file_postfix = <<EOS;

-

-};

-

-int khui_n_accel_global = sizeof(khui_accel_global) / sizeof(khui_accel_def);

-

-EOS

-

-$skip_lines = 1;

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+$file_prefix = <<EOS;
+/*
+This file was autogenerated from src/ui/acceldef.cfg and src/ui/accel.csv.
+
+Do not modify directly.
+*/
+#define NOEXPORT
+#include<khuidefs.h>
+
+khui_accel_def khui_accel_global[] = {
+EOS
+
+$record_prefix = "{";
+
+$record_sep = ",\n";
+
+$record_postfix = "}";
+
+$file_postfix = <<EOS;
+
+};
+
+int khui_n_accel_global = sizeof(khui_accel_global) / sizeof(khui_accel_def);
+
+EOS
+
+$skip_lines = 1;
diff --git a/src/windows/identity/uilib/actiondef.cfg b/src/windows/identity/uilib/actiondef.cfg
index 561335257..4537c9849 100644
--- a/src/windows/identity/uilib/actiondef.cfg
+++ b/src/windows/identity/uilib/actiondef.cfg
@@ -1,67 +1,67 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation

-# files (the "Software"), to deal in the Software without

-# restriction, including without limitation the rights to use, copy,

-# modify, merge, publish, distribute, sublicense, and/or sell copies

-# of the Software, and to permit persons to whom the Software is

-# furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-#

-

-$file_prefix = <<EOS;

-/*

-This file was autogenerated from src/ui/actiondef.cfg and src/ui/actions.csv.

-

-Do not modify directly.

-*/

-

-#define NOEXPORT

-

-#include<khuidefs.h>

-#include<khhelp.h>

-#include<intaction.h>

-#include"../ui/resource.h"

-

-khui_action khui_actions [] = {

-EOS

-

-$record_prefix = "ACTION_FULL(";

-

-$record_sep = ",\n";

-

-$record_postfix = ")";

-

-$file_postfix = <<EOS;

-

-};

-

-int khui_n_actions = sizeof(khui_actions) / sizeof(khui_action);

-

-EOS

-

-$skip_lines = 1;

-

-sub rec_handler {

-    $arr = shift;

-    if($$arr[2] =~ /^$/) {

-	$$arr[2] = "NULL";

-    } else {

-	$$arr[2] = "L\"".$$arr[2]."\"";

-    }

-}

-

-$record_parser = \&rec_handler;

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use, copy,
+# modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+$file_prefix = <<EOS;
+/*
+This file was autogenerated from src/ui/actiondef.cfg and src/ui/actions.csv.
+
+Do not modify directly.
+*/
+
+#define NOEXPORT
+
+#include<khuidefs.h>
+#include<khhelp.h>
+#include<intaction.h>
+#include"../ui/resource.h"
+
+khui_action khui_actions [] = {
+EOS
+
+$record_prefix = "ACTION_FULL(";
+
+$record_sep = ",\n";
+
+$record_postfix = ")";
+
+$file_postfix = <<EOS;
+
+};
+
+int khui_n_actions = sizeof(khui_actions) / sizeof(khui_action);
+
+EOS
+
+$skip_lines = 1;
+
+sub rec_handler {
+    $arr = shift;
+    if($$arr[2] =~ /^$/) {
+	$$arr[2] = "NULL";
+    } else {
+	$$arr[2] = "L\"".$$arr[2]."\"";
+    }
+}
+
+$record_parser = \&rec_handler;
diff --git a/src/windows/identity/uilib/actions.csv b/src/windows/identity/uilib/actions.csv
index 36a43dfdd..b3f6e1f26 100644
--- a/src/windows/identity/uilib/actions.csv
+++ b/src/windows/identity/uilib/actions.csv
@@ -1,53 +1,53 @@
-Command,Type,Name,Img Normal,Img Hot,Img Disabled,Ico Normal,Ico Disabled,Caption,Tooltip,Topic,State

-KHUI_MENU_FILE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_FILE,0,IDH_MENU_FILE,0

-KHUI_MENU_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_CRED,0,IDH_MENU_CRED,0

-KHUI_MENU_VIEW,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_VIEW,0,IDH_MENU_VIEW,0

-KHUI_MENU_OPTIONS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_OPTIONS,0,IDH_MENU_OPTIONS,0

-KHUI_MENU_HELP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_HELP,0,IDH_MENU_HELP,0

-KHUI_MENU_LAYOUT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_LAYOUT,0,0,0

-KHUI_MENU_TOOLBARS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_TOOLBARS,0,0,0

-KHUI_MENU_COLUMNS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_CHOOSE_COLS,0,IDH_ACTION_CHOOSE_COLS,0

-KHUI_MENU_DESTROY_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_DESTROY_CRED,0,0,0

-KHUI_MENU_RENEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_RENEW_CRED,0,0,0

-KHUI_ACTION_PROPERTIES,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_PROPERTIES,IDS_ACTIONT_PROPERTIES,IDH_ACTION_PROPERTIES,0

-KHUI_ACTION_EXIT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_EXIT,IDS_ACTIONT_EXIT,IDH_ACTION_EXIT,0

-KHUI_ACTION_SET_DEF_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_SET_DEF_ID,IDS_ACTIONT_SET_DEF_ID,IDH_ACTION_SET_DEF_ID,0

-KHUI_ACTION_SET_SRCH_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_SET_SRCH_ID,0,IDH_ACTION_SET_SRCH_ID,KHUI_ACTIONSTATE_DISABLED

-KHUI_ACTION_PASSWD_ID,KHUI_ACTIONTYPE_TRIGGER,,IDB_CHPW,0,IDB_CHPW_DIS,IDB_CHPW_SM,IDB_CHPW_DIS_SM,IDS_ACTION_PASSWD_ID,IDS_ACTIONT_PASSWD_ID,IDH_ACTION_PASSWD_ID,0

-KHUI_ACTION_NEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_NEW,0,IDB_TK_NEW_DIS,IDB_TK_NEW_SM,IDB_TK_NEW_DIS_SM,IDS_ACTION_NEW_CRED,IDS_ACTIONT_NEW_CRED,IDH_ACTION_NEW_CRED,0

-KHUI_ACTION_RENEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_REFRESH,0,IDB_TK_REFRESH_DIS,IDB_TK_REFRESH_SM,IDB_TK_REFRESH_DIS_SM,IDS_ACTION_RENEW_CRED,IDS_ACTIONT_RENEW_CRED,0,0

-KHUI_ACTION_DESTROY_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_DELETE,0,IDB_TK_DELETE_DIS,IDB_TK_DELETE_SM,IDB_TK_DELETE_DIS_SM,IDS_ACTION_DESTROY_CRED,IDS_ACTIONT_DESTROY_CRED,0,0

-KHUI_ACTION_LAYOUT_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_ID,0,0,KHUI_ACTIONSTATE_CHECKED

-KHUI_ACTION_LAYOUT_TYPE,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_TYPE,0,0,0

-KHUI_ACTION_LAYOUT_LOC,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_LOC,0,0,0

-KHUI_ACTION_LAYOUT_CUST,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_CUST,0,0,0

-KHUI_ACTION_LAYOUT_MINI,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_MINI,0,0,0

-KHUI_ACTION_TB_STANDARD,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_TB_STANDARD,0,0,KHUI_ACTIONSTATE_CHECKED|KHUI_ACTIONSTATE_DISABLED

-KHUI_ACTION_DEBUG_WINDOW,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_DEBUG_WINDOW,0,IDH_ACTION_DEBUG_WINDOW,KHUI_ACTIONSTATE_DISABLED

-KHUI_ACTION_VIEW_REFRESH,KHUI_ACTIONTYPE_TRIGGER,,IDB_VW_REFRESH,0,0,IDB_VW_REFRESH_SM,0,IDS_ACTION_VIEW_REFRESH,IDS_ACTIONT_VIEW_REFRESH,IDH_ACTION_VIEW_REFRESH,0

-KHUI_ACTION_OPT_IDENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_IDENTS,IDS_ACTIONT_OPT_IDENTS,IDH_ACTION_OPT_INIT,0

-KHUI_ACTION_OPT_KHIM,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_KHIM,IDS_ACTIONT_OPT_KHIM,IDH_ACTION_OPT_KHIM,0

-KHUI_ACTION_OPT_NOTIF,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_NOTIF,IDS_ACTIONT_OPT_NOTIF,IDH_ACTION_OPT_NOTIF,0

-KHUI_ACTION_OPT_PLUGINS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_PLUGINS,IDS_ACTIONT_OPT_PLUGINS,IDH_ACTION_OPT_KHIM,0

-KHUI_ACTION_OPT_APPEAR,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_APPEAR,IDS_ACTIONT_OPT_APPEAR,0,0

-KHUI_ACTION_HELP_CTX,KHUI_ACTIONTYPE_TRIGGER,,IDB_HELP,0,0,IDB_HELP_SM,0,IDS_ACTION_HELP_CTX,IDS_ACTIONT_HELP_CTX,0,0

-KHUI_ACTION_HELP_CONTENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_CONTENTS,0,0,0

-KHUI_ACTION_HELP_INDEX,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_INDEX,0,0,0

-KHUI_ACTION_HELP_ABOUT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_ABOUT,0,0,0

-KHUI_ACTION_OPEN_APP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPEN_APP,0,0,0

-KHUI_ACTION_CLOSE_APP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_CLOSE_APP,0,0,0

-KHUI_ACTION_IMPORT,KHUI_ACTIONTYPE_TRIGGER,,IDB_IMPORT,0,IDB_IMPORT_DIS,IDB_IMPORT_SM,IDB_IMPORT_SM_DIS,IDS_ACTION_IMPORT,IDS_ACTIONT_IMPORT,0,0

-KHUI_ACTION_DESTROY_ALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_DESTROY_ALL,0,0,0

-KHUI_ACTION_RENEW_ALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_RENEW_ALL,0,0,0

-KHUI_PACTION_OK,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_OK,0,0,0

-KHUI_PACTION_CANCEL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_CANCEL,0,0,0

-KHUI_PACTION_CLOSE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_CLOSE,0,0,0

-KHUI_PACTION_BLANK,0,,IDB_TB_SPACE,0,IDB_TB_SPACE,IDB_TB_BLANK_SM,IDB_TB_BLANK_SM,0,0,0,KHUI_ACTIONSTATE_DISABLED

-KHUI_PACTION_NEXT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NEXT,0,0,0

-KHUI_PACTION_YES,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_YES,0,0,0

-KHUI_PACTION_NO,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NO,0,0,0

-KHUI_PACTION_YESALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_YESALL,0,0,0

-KHUI_PACTION_NOALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NOALL,0,0,0

-KHUI_PACTION_KEEP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_KEEP,0,0,0

-KHUI_PACTION_REMOVE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_REMOVE,0,0,0

-KHUI_PACTION_DISCARD,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_DISCARD,0,0,0

+Command,Type,Name,Img Normal,Img Hot,Img Disabled,Ico Normal,Ico Disabled,Caption,Tooltip,Topic,State
+KHUI_MENU_FILE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_FILE,0,IDH_MENU_FILE,0
+KHUI_MENU_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_CRED,0,IDH_MENU_CRED,0
+KHUI_MENU_VIEW,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_VIEW,0,IDH_MENU_VIEW,0
+KHUI_MENU_OPTIONS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_OPTIONS,0,IDH_MENU_OPTIONS,0
+KHUI_MENU_HELP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_HELP,0,IDH_MENU_HELP,0
+KHUI_MENU_LAYOUT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_LAYOUT,0,0,0
+KHUI_MENU_TOOLBARS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_TOOLBARS,0,0,0
+KHUI_MENU_COLUMNS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_CHOOSE_COLS,0,IDH_ACTION_CHOOSE_COLS,0
+KHUI_MENU_DESTROY_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_DESTROY_CRED,0,0,0
+KHUI_MENU_RENEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_MENU_RENEW_CRED,0,0,0
+KHUI_ACTION_PROPERTIES,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_PROPERTIES,IDS_ACTIONT_PROPERTIES,IDH_ACTION_PROPERTIES,0
+KHUI_ACTION_EXIT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_EXIT,IDS_ACTIONT_EXIT,IDH_ACTION_EXIT,0
+KHUI_ACTION_SET_DEF_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_SET_DEF_ID,IDS_ACTIONT_SET_DEF_ID,IDH_ACTION_SET_DEF_ID,0
+KHUI_ACTION_SET_SRCH_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_SET_SRCH_ID,0,IDH_ACTION_SET_SRCH_ID,KHUI_ACTIONSTATE_DISABLED
+KHUI_ACTION_PASSWD_ID,KHUI_ACTIONTYPE_TRIGGER,,IDB_CHPW,0,IDB_CHPW_DIS,IDB_CHPW_SM,IDB_CHPW_DIS_SM,IDS_ACTION_PASSWD_ID,IDS_ACTIONT_PASSWD_ID,IDH_ACTION_PASSWD_ID,0
+KHUI_ACTION_NEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_NEW,0,IDB_TK_NEW_DIS,IDB_TK_NEW_SM,IDB_TK_NEW_DIS_SM,IDS_ACTION_NEW_CRED,IDS_ACTIONT_NEW_CRED,IDH_ACTION_NEW_CRED,0
+KHUI_ACTION_RENEW_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_REFRESH,0,IDB_TK_REFRESH_DIS,IDB_TK_REFRESH_SM,IDB_TK_REFRESH_DIS_SM,IDS_ACTION_RENEW_CRED,IDS_ACTIONT_RENEW_CRED,0,0
+KHUI_ACTION_DESTROY_CRED,KHUI_ACTIONTYPE_TRIGGER,,IDB_TK_DELETE,0,IDB_TK_DELETE_DIS,IDB_TK_DELETE_SM,IDB_TK_DELETE_DIS_SM,IDS_ACTION_DESTROY_CRED,IDS_ACTIONT_DESTROY_CRED,0,0
+KHUI_ACTION_LAYOUT_ID,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_ID,0,0,KHUI_ACTIONSTATE_CHECKED
+KHUI_ACTION_LAYOUT_TYPE,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_TYPE,0,0,0
+KHUI_ACTION_LAYOUT_LOC,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_LOC,0,0,0
+KHUI_ACTION_LAYOUT_CUST,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_CUST,0,0,0
+KHUI_ACTION_LAYOUT_MINI,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_LAYOUT_MINI,0,0,0
+KHUI_ACTION_TB_STANDARD,KHUI_ACTIONTYPE_TRIGGER | KHUI_ACTIONTYPE_TOGGLE,,0,0,0,0,0,IDS_ACTION_TB_STANDARD,0,0,KHUI_ACTIONSTATE_CHECKED|KHUI_ACTIONSTATE_DISABLED
+KHUI_ACTION_DEBUG_WINDOW,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_DEBUG_WINDOW,0,IDH_ACTION_DEBUG_WINDOW,KHUI_ACTIONSTATE_DISABLED
+KHUI_ACTION_VIEW_REFRESH,KHUI_ACTIONTYPE_TRIGGER,,IDB_VW_REFRESH,0,0,IDB_VW_REFRESH_SM,0,IDS_ACTION_VIEW_REFRESH,IDS_ACTIONT_VIEW_REFRESH,IDH_ACTION_VIEW_REFRESH,0
+KHUI_ACTION_OPT_IDENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_IDENTS,IDS_ACTIONT_OPT_IDENTS,IDH_ACTION_OPT_INIT,0
+KHUI_ACTION_OPT_KHIM,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_KHIM,IDS_ACTIONT_OPT_KHIM,IDH_ACTION_OPT_KHIM,0
+KHUI_ACTION_OPT_NOTIF,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_NOTIF,IDS_ACTIONT_OPT_NOTIF,IDH_ACTION_OPT_NOTIF,0
+KHUI_ACTION_OPT_PLUGINS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_PLUGINS,IDS_ACTIONT_OPT_PLUGINS,IDH_ACTION_OPT_KHIM,0
+KHUI_ACTION_OPT_APPEAR,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_APPEAR,IDS_ACTIONT_OPT_APPEAR,0,0
+KHUI_ACTION_HELP_CTX,KHUI_ACTIONTYPE_TRIGGER,,IDB_HELP,0,0,IDB_HELP_SM,0,IDS_ACTION_HELP_CTX,IDS_ACTIONT_HELP_CTX,0,0
+KHUI_ACTION_HELP_CONTENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_CONTENTS,0,0,0
+KHUI_ACTION_HELP_INDEX,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_INDEX,0,0,0
+KHUI_ACTION_HELP_ABOUT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_ABOUT,0,0,0
+KHUI_ACTION_OPEN_APP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPEN_APP,0,0,0
+KHUI_ACTION_CLOSE_APP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_CLOSE_APP,0,0,0
+KHUI_ACTION_IMPORT,KHUI_ACTIONTYPE_TRIGGER,,IDB_IMPORT,0,IDB_IMPORT_DIS,IDB_IMPORT_SM,IDB_IMPORT_SM_DIS,IDS_ACTION_IMPORT,IDS_ACTIONT_IMPORT,0,0
+KHUI_ACTION_DESTROY_ALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_DESTROY_ALL,0,0,0
+KHUI_ACTION_RENEW_ALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_RENEW_ALL,0,0,0
+KHUI_PACTION_OK,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_OK,0,0,0
+KHUI_PACTION_CANCEL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_CANCEL,0,0,0
+KHUI_PACTION_CLOSE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_CLOSE,0,0,0
+KHUI_PACTION_BLANK,0,,IDB_TB_SPACE,0,IDB_TB_SPACE,IDB_TB_BLANK_SM,IDB_TB_BLANK_SM,0,0,0,KHUI_ACTIONSTATE_DISABLED
+KHUI_PACTION_NEXT,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NEXT,0,0,0
+KHUI_PACTION_YES,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_YES,0,0,0
+KHUI_PACTION_NO,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NO,0,0,0
+KHUI_PACTION_YESALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_YESALL,0,0,0
+KHUI_PACTION_NOALL,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_NOALL,0,0,0
+KHUI_PACTION_KEEP,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_KEEP,0,0,0
+KHUI_PACTION_REMOVE,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_REMOVE,0,0,0
+KHUI_PACTION_DISCARD,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_PACTION_DISCARD,0,0,0
diff --git a/src/windows/identity/util/Makefile b/src/windows/identity/util/Makefile
index cf23e05bf..07202869f 100644
--- a/src/windows/identity/util/Makefile
+++ b/src/windows/identity/util/Makefile
@@ -1,49 +1,49 @@
-#

-# Copyright (c) 2004 Massachusetts Institute of Technology

-# Copyright (c) 2007 Secure Endpoints Inc.

-#

-# Permission is hereby granted, free of charge, to any person

-# obtaining a copy of this software and associated documentation files

-# (the "Software"), to deal in the Software without restriction,

-# including without limitation the rights to use, copy, modify, merge,

-# publish, distribute, sublicense, and/or sell copies of the Software,

-# and to permit persons to whom the Software is furnished to do so,

-# subject to the following conditions:

-#

-# The above copyright notice and this permission notice shall be

-# included in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-# SOFTWARE.

-

-

-MODULE=util

-!include <../config/Makefile.w32>

-

-INCFILES= \

-	$(INCDIR)\utils.h 	\

-	$(INCDIR)\hashtable.h 	\

-	$(INCDIR)\mstring.h 	\

-	$(INCDIR)\sync.h	\

-	$(INCDIR)\perfstat.h

-

-OBJFILES= \

-	$(OBJ)\hashtable.obj 	\

-	$(OBJ)\mstring.obj 	\

-	$(OBJ)\sync.obj		\

-	$(OBJ)\perfstat.obj

-

-LIBFILES=

-

-SDKLIBFILES= 

-

-all: mkdirs $(INCFILES) $(OBJFILES)

-

-clean::

-	if exist ..\obj $(RM) $(INCFILES)

+#
+# Copyright (c) 2004 Massachusetts Institute of Technology
+# Copyright (c) 2007 Secure Endpoints Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+MODULE=util
+!include <../config/Makefile.w32>
+
+INCFILES= \
+	$(INCDIR)\utils.h 	\
+	$(INCDIR)\hashtable.h 	\
+	$(INCDIR)\mstring.h 	\
+	$(INCDIR)\sync.h	\
+	$(INCDIR)\perfstat.h
+
+OBJFILES= \
+	$(OBJ)\hashtable.obj 	\
+	$(OBJ)\mstring.obj 	\
+	$(OBJ)\sync.obj		\
+	$(OBJ)\perfstat.obj
+
+LIBFILES=
+
+SDKLIBFILES= 
+
+all: mkdirs $(INCFILES) $(OBJFILES)
+
+clean::
+	if exist ..\obj $(RM) $(INCFILES)