DEVEL15-windows-install-20090527
[openafs.git] / src / WINNT / install / wix / files.wxi
index ab19ec1..db1288e 100644 (file)
@@ -1,33 +1,5 @@
 <?xml version="1.0"?>
 <Include>
-  <?ifndef BinsOnly?>
-    <Directory Id="$(var.PISystemFolder)" SourceName="System">
-        <Component Win64="$(var.Win64)" Id="cmf_afslogon_DLL" Guid="$(var.cmf_afslogon_DLL_guid)">
-            <File Id="fileafslogon_DLL" Name="afslogon.dll" LongName="afslogon.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)afslogon.dll" />
-            <Registry Id="reg_afslogon01" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Action="createKeyAndRemoveKeyOnUninstall" />
-            <Registry Id="reg_afslogon02" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" />
-            <Registry Id="reg_afslogon03" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Asynchronous" Type="integer" Value="0" />
-            <Registry Id="reg_afslogon04" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Impersonate" Type="integer" Value="1" />
-            <Registry Id="reg_afslogon05" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="DLLName" Type="string" Value="[#fileafslogon_DLL]" />
-            <Registry Id="reg_afslogon06" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logoff" Type="string" Value="AFS_Logoff_Event" />
-            <Registry Id="reg_afslogon07" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logon" Type="string" Value="AFS_Logon_Event" />
-            <Registry Id="reg_afslogon08" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Startup" Type="string" Value="AFS_Startup_Event" />
-            <Registry Id="reg_afslogon09" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Asynchronous" Type="integer" Value="0" />
-            <Registry Id="reg_afslogon10" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Impersonate" Type="integer" Value="0" />
-            <Registry Id="reg_afslogon11" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="DLLName" Type="string" Value="[#fileafslogon_DLL]" />
-            <Registry Id="reg_afslogon13" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Logon" Type="string" Value="KFW_Logon_Event" />
-        </Component>
-        <Component Win64="$(var.Win64)" Id="cmf_afscpcc_EXE" Guid="$(var.cmf_afscpcc_EXE_guid)">
-            <File Id="fileafscpcc_EXE"  Name="afscpcc.exe"  LongName="afscpcc.exe"  DiskId="1" src="$(var.ClientDir)afscpcc.exe" KeyPath="yes"/>
-        </Component>
-    <?ifdef DebugSyms?>
-        <Component Win64="$(var.Win64)" Id="cmp_ClientSystemDebug" Guid="$(var.cmp_ClientSystemDebug_guid)">
-                       <File Id="fileafslogon_PDB" Name="afslogon.pdb" LongName="afslogon.pdb" KeyPath="yes" DiskId="1" src="$(var.ClientDir)afslogon.pdb" />
-                       <File Id="fileafscpcc_PDB" Name="afscpcc.pdb" LongName="afscpcc.pdb" DiskId="1" src="$(var.ClientDir)afscpcc.pdb" />
-        </Component>
-    <?endif?>
-    </Directory>
-  <?endif?>
     <Directory Id="$(var.PIProgramFilesFolder)">
         <Directory Id="AFSDIR" Name="OpenAFS" SourceName=".">
            <Component Id="efl_desktop_INI" Guid="0ADB427F-3648-4BE0-983B-C454AA51895C">
                     <CreateFolder />
                 </Component>
 
+                <Component Win64="$(var.Win64)" Id="cmf_afsclientadmin_DLL" Guid="$(var.cmf_afsclientadmin_DLL_guid)">
+                    <File Id="fileafsclientadmin_DLL" Name="afscliad.dll" LongName="afsclientadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsclientadmin.dll"/>
+                </Component>
+                <Component Win64="$(var.Win64)" Id="cmf_afsadminutil_DLL" Guid="$(var.cmf_afsadminutil_DLL_guid)">
+                    <File Id="fileafsadminutil_DLL" Name="afsadmut.dll" LongName="afsadminutil.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsadminutil.dll"/>
+                </Component>
+                <Component Win64="$(var.Win64)" Id="cmf_afsvosadmin_DLL" Guid="$(var.cmf_afsvosadmin_DLL_guid)">
+                    <File Id="fileafsvosadmin_DLL" Name="afsvosad.dll" LongName="afsvosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsvosadmin.dll"/>
+                </Component>
   <?ifndef BinsOnly?>
                 <Component Win64="$(var.Win64)" Id="cmf_afsbosadmin_DLL" Guid="$(var.cmf_afsbosadmin_DLL_guid)">
                     <File Id="fileafsbosadmin_DLL" Name="afsbosad.dll" LongName="afsbosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.dll"/>
                 <Component Win64="$(var.Win64)" Id="cmf_afscfgadmin_DLL" Guid="$(var.cmf_afscfgadmin_DLL_guid)">
                     <File Id="fileafscfgadmin_DLL" Name="afscfgad.dll" LongName="afscfgadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afscfgadmin.dll"/>
                 </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_afsclientadmin_DLL" Guid="$(var.cmf_afsclientadmin_DLL_guid)">
-                    <File Id="fileafsclientadmin_DLL" Name="afscliad.dll" LongName="afsclientadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsclientadmin.dll"/>
-                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afskasadmin_DLL" Guid="$(var.cmf_afskasadmin_DLL_guid)">
                     <File Id="fileafskasadmin_DLL" Name="afskasad.dll" LongName="afskasadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afskasadmin.dll"/>
                 </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afsptsadmin_DLL" Guid="$(var.cmf_afsptsadmin_DLL_guid)">
                     <File Id="fileafsptsadmin_DLL" Name="afsptsad.dll" LongName="afsptsadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsptsadmin.dll"/>
                 </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_afsvosadmin_DLL" Guid="$(var.cmf_afsvosadmin_DLL_guid)">
-                    <File Id="fileafsvosadmin_DLL" Name="afsvosad.dll" LongName="afsvosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsvosadmin.dll"/>
-                </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_afsadminutil_DLL" Guid="$(var.cmf_afsadminutil_DLL_guid)">
-                    <File Id="fileafsadminutil_DLL" Name="afsadmut.dll" LongName="afsadminutil.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsadminutil.dll"/>
-                </Component>
   <?endif?>
 
                 <Component Win64="$(var.Win64)" Id="cmf_afsrpc_DLL" Guid="$(var.cmf_afsrpc_DLL_guid)">
                     <File Id="fileafsrpc_DLL" Name="afsrpc.dll" LongName="afsrpc.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.dll"/>
                 </Component>
+                <Component Win64="$(var.Win64)" Id="cmf_libafsconf_DLL" Guid="$(var.cmf_libafsconf_DLL_guid)">
+                    <File Id="filelibafsconf_DLL" Name="libafscf.dll" LongName="libafsconf.dll" KeyPath="yes" DiskId="1"  src="$(var.LibDir)\libafsconf.dll"/>
+                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afsauthent2_DLL" Guid="$(var.cmf_afsauthent2_DLL_guid)">
                     <File Id="fileafsauthent2_DLL" Name="afsauth.dll" LongName="afsauthent.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsauthent.dll"/>
                 </Component>
                 <Component Win64="$(var.Win64)" Id="cmp_ServerCommonDebug" Guid="$(var.cmp_ServerCommonDebug_guid)">
                     <File Id="fileafsbosadmin_PDB" Name="afsbosad.pdb" LongName="afsbosadmin.pdb" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.pdb"/>
                     <File Id="fileafscfgadmin_PDB" Name="afscfgad.pdb" LongName="afscfgadmin.pdb" DiskId="1" src="$(var.ServerDir)\afscfgadmin.pdb"/>
-                    <File Id="fileafsclientadmin_PDB" Name="afscliad.pdb" LongName="afsclientadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsclientadmin.pdb"/>
                     <File Id="fileafskasadmin_PDB" Name="afskasad.pdb" LongName="afskasadmin.pdb" DiskId="1" src="$(var.ServerDir)\afskasadmin.pdb"/>
                     <File Id="fileafsptsadmin_PDB" Name="afsptsad.pdb" LongName="afsptsadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsptsadmin.pdb"/>
-                    <File Id="fileafsvosadmin_PDB" Name="afsvosad.pdb" LongName="afsvosadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsvosadmin.pdb"/>
-                    <File Id="fileafsadminutil_PDB" Name="afsadmut.pdb" LongName="afsadminutil.pdb" DiskId="1" src="$(var.ServerDir)\afsadminutil.pdb"/>
                 </Component>
               <?endif?>
                 <Component Win64="$(var.Win64)" Id="cmp_CommonCommonDebug" Guid="$(var.cmp_CommonCommonDebug_guid)">
                     <File Id="fileafsrpc_PDB" Name="afsrpc.pdb" LongName="afsrpc.pdb" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.pdb"/>
+                    <File Id="filelibafsconf_PDB" Name="libafscf.pdb" LongName="libafsconf.pdb" DiskId="1" src="$(var.LibDir)\libafsconf.pdb"/>
                     <File Id="fileafsauthent_PDB" Name="afsauth.pdb" LongName="afsauthent.pdb" DiskId="1" src="$(var.LibDir)\afsauthent.pdb"/>
                     <File Id="fileafspthread_PDB" Name="afspthrd.pdb" LongName="afspthread.pdb" DiskId="1" src="$(var.LibDir)\afspthread.pdb"/>
                     <File Id="fileTaAfsAppLib_PDB" Name="TaAfsApL.pdb" LongName="TaAfsAppLib.pdb" DiskId="1" src="$(var.ServerDir)\TaAfsAppLib.pdb"/>
                     <File Id="fileafsprocmgmt_PDB" Name="afsprcmg.pdb" LongName="afsprocmgmt.pdb" DiskId="1" src="$(var.ServerDir)\afsprocmgmt.pdb"/>
+                    <File Id="fileafsvosadmin_PDB" Name="afsvosad.pdb" LongName="afsvosadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsvosadmin.pdb"/>
+                    <File Id="fileafsadminutil_PDB" Name="afsadmut.pdb" LongName="afsadminutil.pdb" DiskId="1" src="$(var.ServerDir)\afsadminutil.pdb"/>
+                    <File Id="fileafsclientadmin_PDB" Name="afscliad.pdb" LongName="afsclientadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsclientadmin.pdb"/>
                 </Component>
               <?ifndef BinsOnly ?>
                 <Component Win64="$(var.Win64)" Id="cmp_ClientCommonDebug" Guid="$(var.cmp_ClientCommonDebug_guid)">
                 <Component Win64="$(var.Win64)" Id="cmf_TaAfsServerManager_1033_DLL" Guid="$(var.cmf_TaAfsServerManager_1033_DLL_guid)">
                     <File Id="fileTaAfsServerManager_1033_DLL" Name="tasm1033.dll" LongName="TaAfsServerManager_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsServerManager_1033.dll"/>
                 </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_afscreds_1033_DLL" Guid="$(var.cmf_afscreds_1033_DLL_guid)">
-                    <File Id="fileafscreds_1033_DLL" Name="acrd1033.dll" LongName="afscreds_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afscreds_1033.dll"/>
-                </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afs_config_1033_DLL" Guid="$(var.cmf_afs_config_1033_DLL_guid)">
                     <File Id="fileafs_config_1033_DLL" Name="acfg1033.dll" LongName="afs_config_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_config_1033.dll"/>
                 </Component>
                 <Component Win64="$(var.Win64)" Id="cmf_afs_cpa_1033_DLL" Guid="$(var.cmf_afs_cpa_1033_DLL_guid)">
                     <File Id="fileafs_cpa_1033_DLL" Name="acpa1033.dll" LongName="afs_cpa_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_cpa_1033.dll"/>
                 </Component>
-                <Component Win64="$(var.Win64)" Id="cmf_afs_shl_ext_1033_DLL" Guid="$(var.cmf_afs_shl_ext_1033_DLL_guid)">
-                    <File Id="fileafs_shl_ext_1033_DLL" Name="ashl1033.dll" LongName="afs_shl_ext_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_shl_ext_1033.dll"/>
-                </Component>
 
                 <Directory Id="dirCommon_en_US" Name="en_US" src="$(var.SrcDir)\WINNT\doc\help\en_US\">
-                    <Component Id="cmf_afs_nt_HLP_en_US" Guid="A59FF1E3-984F-47E0-8A65-590A01B6E1C4">
-                        <File Id="fileafs_nt_HLP_en_US" Name="afs-nt.hlp" LongName="afs-nt.hlp" KeyPath="yes" DiskId="1">
-                                                       <Shortcut Id="scClientHelp_en_US" Directory="dirShortCut" Name="CliHelp.lnk" LongName="Client Help.lnk" Description="$(loc.StrHlpFileDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
-                        </File>
-                        <File Id="fileafs_nt2_CNT_en_US" Name="afs-nt.cnt" LongName="afs-nt.cnt" DiskId="1"  />
-                    </Component>
 
                     <Component Id="cmp_Lang_en_US" Guid="9B6B5AB2-8BD1-402D-BFC0-63255740A653">
                         <File Id="filetaafssvrmgr_CNT_en_US" Name="taafs.cnt" LongName="taafssvrmgr.cnt" DiskId="1" />
 
                 <!-- Runtime libraries -->
           <?ifndef Debug?>
-                       <!-- Note that for AFSVER_CL=1400, the runtime libraries are included via merge modules
-                            at the TARGETDIR level, since we use shared assemblies instead of private assemblies. -->
+
+                       <!-- Note that for AFSVER_CL=1400 and 1500, the runtime
+                            libraries are included via merge modules at the
+                            TARGETDIR level, since we use shared assemblies
+                            instead of private assemblies. -->
+
             <?if $(env.AFSVER_CL) = "1310"?>
                                <?ifdef comment?>
                                        While we would love to just use the merge modules, they are unfortunately
   <?endif?>
 
   <?ifndef BinsOnly?>
-         <?if $(var.Language) = "en_US"?>
-            <Component Id="efl_Readme_TXT_en_US" Guid="959DC63A-6C67-4B51-9F7D-2CDEE91F0099">
-                <File Id="fileREADME_TXT_en_US" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\en_US\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "zh_TW"?>
-            <Component Id="efl_Readme_TXT_zh_TW" Guid="BF25CD95-7BCD-4B0C-9999-B246199236F6">
-                <File Id="fileREADME_TXT_zh_TW" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\zh_TW\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "de_DE"?>
-            <Component Id="efl_Readme_TXT_de_DE" Guid="5F1433F0-C57D-46C8-857B-4265B95CEF24">
-                <File Id="fileREADME_TXT_de_DE" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\de_DE\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "es_ES"?>
-            <Component Id="efl_Readme_TXT_es_ES" Guid="8B0C573E-B33E-4EC5-8B3B-C08347FFAB79">
-                <File Id="fileREADME_TXT_es_ES" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\es_ES\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "ja_JP"?>
-            <Component Id="efl_Readme_TXT_ja_JP" Guid="5A15925E-00EB-4B00-A5BE-7461EE7D6C95">
-                <File Id="fileREADME_TXT_ja_JP" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\ja_JP\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "ko_KR"?>
-            <Component Id="efl_Readme_TXT_ko_KR" Guid="715D4A97-6356-41E8-8660-76D74DC88495">
-                <File Id="fileREADME_TXT_ko_KR" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\ko_KR\README.txt"/>
-            </Component>
-         <?endif?>
-     
-         <?if $(var.Language) = "pt_BR"?>
-            <Component Id="efl_Readme_TXT_pt_BR" Guid="03682CAA-66D4-472F-86DE-C508F33AE50C">
-                <File Id="fileREADME_TXT_pt_BR" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\pt_BR\README.txt"/>
-            </Component>
-         <?endif?>
-                        
-         <?if $(var.Language) = "zh_CN"?>
-            <Component Id="efl_Readme_TXT_zh_CN" Guid="6D1DD8B0-0D61-4BC4-976B-F72E087F83D4">
-                <File Id="fileREADME_TXT_zh_CN" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\zh_CN\README.txt"/>
-            </Component>
-         <?endif?>
-  <?endif?>
-
-  <?ifndef BinsOnly?>
             <Directory Id="dirDocumentation" Name="Docum" LongName="Documentation" SourceName="Docs">
-                               <!-- The following directory and everything below it is language dependent. -->
-                    <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
-                        <Component Id="cmf_index2_HTM_$(var.Language)" Guid="$(var.DocHtmlIndexGuid)">
-                            <File Id="fileindex2_HTM_$(var.Language)" Name="index.htm" LongName="index.htm" KeyPath="yes" DiskId="1">
-                                                               <Shortcut Id="scDoc_$(var.Language)" Directory="dirShortCut" Name="Doc$(var.Language).lnk" LongName="Documentation ($(var.Language)).lnk" Description="$(loc.StrDocLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
-                            </File>
+                   <!-- The following directory and everything below it is language dependent. -->
+                    <?if $(var.Language) = "en_US"?>
+                        <Component Id="cmp_Sys_Admin_Guide_en_US" Guid="$(var.DocChmSysAdminGuid)">
+                        <File Id="file_admin_guide_CHM_$(var.Language)" Name="AdminGd.chm" LongName="AdminGuide.chm" KeyPath="yes" DiskId="1" src="$(var.DocDir)\xml\AdminGuide\htmlhelp.chm">
+                                 <Shortcut Id="scDocAdmin_en_US" Directory="dirShortCutDocs" Name="AdminGd.lnk" LongName="Administrator Guide.lnk" Description="$(loc.StrDocAdminGdLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
                         </Component>
-                        <Component Id="efl_DocHtml_$(var.Language)" Guid="$(var.DocHtmlGuid)">
-                            <File Id="filebanner_GIF_$(var.Language)" Name="banner.gif" LongName="banner.gif" DiskId="1" />
-                            <File Id="filebooks_GIF_$(var.Language)" Name="books.gif" LongName="books.gif" DiskId="1" />
-                            <File Id="filebot_GIF_$(var.Language)" Name="bot.gif" LongName="bot.gif" DiskId="1" />
-                            <File Id="fileindex_GIF_$(var.Language)" Name="index.gif" LongName="index.gif" DiskId="1" />
-                            <File Id="filenext_GIF_$(var.Language)" Name="next.gif" LongName="next.gif" DiskId="1" />
-                            <File Id="fileprev_GIF_$(var.Language)" Name="prev.gif" LongName="prev.gif" DiskId="1" />
-                            <File Id="filetoc_GIF_$(var.Language)" Name="toc.gif" LongName="toc.gif" DiskId="1" />
-                            <File Id="filetop_GIF_$(var.Language)" Name="top.gif" LongName="top.gif" DiskId="1" />
-                            <File Id="file$(var.Language)_RTF" Name="$(var.Language).rtf" LongName="$(var.Language).rtf" KeyPath="yes" DiskId="1" src="$(var.SrcDir)\WINNT\license\lang\$(var.Language).rtf"/>
+                        <Component Id="cmp_User_Guide_en_US" Guid="$(var.DocChmUserGuid)">
+                        <File Id="file_user_guide_CHM_$(var.Language)" Name="UserGd.chm" LongName="UserGuide.chm" KeyPath="yes" DiskId="1"  src="$(var.DocDir)\xml\UserGuide\htmlhelp.chm">
+                                 <Shortcut Id="scDocUser_en_US" Directory="dirShortCutDocs" Name="UserGd.lnk" LongName="User Guide.lnk" Description="$(loc.StrDocUserGdLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
                         </Component>
-                        <Directory Id="dirindex_files_$(var.Language)" Name="index" LongName="index_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\index_files\">
-                            <Component Id="cmp_index_files_$(var.Language)" Guid="$(var.DocHtmlIndexFilesGuid)">
-                                <File Id="filefilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1" />
-                                <File Id="fileimage001_JPG_$(var.Language)" Name="image001.jpg" LongName="image001.jpg" DiskId="1" />
-                                <File Id="fileimage002_JPG_$(var.Language)" Name="image002.jpg" LongName="image002.jpg" DiskId="1" />
+                        <Component Id="cmp_Release_Notes_en_US" Guid="$(var.DocChmRelNotesGuid)">
+                        <File Id="file_relnotes_CHM_$(var.Language)" Name="RelNotes.chm" LongName="ReleaseNotes.chm" KeyPath="yes" DiskId="1"  src="$(var.DocDir)\xml\ReleaseNotesWindows\htmlhelp.chm">
+                                 <Shortcut Id="scDocRelNotes_en_US" Directory="dirShortCutDocs" Name="RelNotes.lnk" LongName="Release Notes.lnk" Description="$(loc.StrDocRelNotesLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
+                        </Component>
+                    <?endif?>                        
+                    <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
+                    <?if $(var.Language) = "en_US"?>
+                        <Directory Id="dirCmdRef_en_US" Name="CmdRef" src="$(var.DocDir)\man-pages\html\">
+                            <Component Id="cmp_Cmd_Ref_en_US" Guid="$(var.DocHtmlCmdRefGuid)">
+                                <File Id="file_CmdRef_Index_HTM_en_US" Name="index.htm" LongName="index.html" KeyPath="yes" DiskId="1">
+                                 <Shortcut Id="scDocRefMan_$(var.Language)" Directory="dirShortCutDocs" Name="RefMan.lnk" LongName="Reference Manual.lnk" Description="$(loc.StrDocRefManLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                                </File>
+                                <File Id="file_CmdRef_Style_CSS_en_US" Name="style.css" LongName="style.css" DiskId="1" />
                             </Component>
-                        </Directory>
+                        <Directory Id="dirCmdRef1_en_US" Name="1" src="$(var.DocDir)\man-pages\html\1\">
+                            <Component Id="cmp_Cmd_Ref_1_en_US" Guid="$(var.DocHtmlCmdRef1Guid)">
+                            <File Id="file_CmdRef_1_afs_html" Name="afs.htm" LongName="afs.html" KeyPath="yes" DiskId="1" />
+                            <File Id="file_CmdRef_1_afsmonitor_html" Name="afsmonit.htm" LongName="afsmonitor.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_aklog_html" Name="aklog.htm" LongName="aklog.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_cmdebug_html" Name="cmdebug.htm" LongName="cmdebug.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_compile_et_html" Name="compile_.htm" LongName="compile_et.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_copyauth_html" Name="copyauth.htm" LongName="copyauth.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_dlog_html" Name="dlog.htm" LongName="dlog.html" DiskId="1" />
+                            <File Id="file_CmdRef_1_dpass_html"  Name="dpass.htm"  LongName="dpass.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_html"  Name="fs.htm"  LongName="fs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_apropos_html"  Name="fs_aprop.htm"  LongName="fs_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_checkservers_html"  Name="fs_chsrv.htm"  LongName="fs_checkservers.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_checkvolumes_html"  Name="fs_chvol.htm"  LongName="fs_checkvolumes.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_cleanacl_html"  Name="fs_clean.htm"  LongName="fs_cleanacl.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_copyacl_html"  Name="fs_copya.htm"  LongName="fs_copyacl.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_cscpolicy_html"  Name="fs_cscpo.htm"  LongName="fs_cscpolicy.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_diskfree_html"  Name="fs_diskf.htm"  LongName="fs_diskfree.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_examine_html"  Name="fs_exami.htm"  LongName="fs_examine.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_exportafs_html"  Name="fs_expor.htm"  LongName="fs_exportafs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_flush_html"  Name="fs_flush.htm"  LongName="fs_flush.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_flushall_html"  Name="fs_flall.htm"  LongName="fs_flushall.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_flushmount_html"  Name="fs_flmnt.htm"  LongName="fs_flushmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_flushvolume_html"  Name="fs_flvol.htm"  LongName="fs_flushvolume.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getcacheparms_html"  Name="fs_getcp.htm"  LongName="fs_getcacheparms.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getcalleraccess_html"  Name="fs_getca.htm"  LongName="fs_getcalleraccess.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getcellstatus_html"  Name="fs_getce.htm"  LongName="fs_getcellstatus.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getclientaddrs_html"  Name="fs_getcl.htm"  LongName="fs_getclientaddrs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getcrypt_html"  Name="fs_getcr.htm"  LongName="fs_getcrypt.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getfid_html"  Name="fs_getfi.htm"  LongName="fs_getfid.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_getserverprefs_html"  Name="fs_getse.htm"  LongName="fs_getserverprefs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_help_html"  Name="fs_help.htm"  LongName="fs_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_listacl_html"  Name="fs_lista.htm"  LongName="fs_listacl.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_listaliases_html"  Name="fs_listl.htm"  LongName="fs_listaliases.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_listcells_html"  Name="fs_listc.htm"  LongName="fs_listcells.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_listquota_html"  Name="fs_listq.htm"  LongName="fs_listquota.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_lsmount_html"  Name="fs_lsmou.htm"  LongName="fs_lsmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_memdump_html"  Name="fs_memdu.htm"  LongName="fs_memdump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_messages_html"  Name="fs_messa.htm"  LongName="fs_messages.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_minidump_html"  Name="fs_minid.htm"  LongName="fs_minidump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_mkmount_html"  Name="fs_mkmou.htm"  LongName="fs_mkmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_monitor_html"  Name="fs_monit.htm"  LongName="fs_monitor.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_newalias_html"  Name="fs_newal.htm"  LongName="fs_newalias.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_newcell_html"  Name="fs_newce.htm"  LongName="fs_newcell.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_quota_html"  Name="fs_quota.htm"  LongName="fs_quota.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_rmmount_html"  Name="fs_rmmou.htm"  LongName="fs_rmmount.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_rxstatpeer_html"  Name="fs_rxsta.htm"  LongName="fs_rxstatpeer.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_rxstatproc_html"  Name="fs_rxstc.htm"  LongName="fs_rxstatproc.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setacl_html"  Name="fs_setac.htm"  LongName="fs_setacl.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setcachesize_html"  Name="fs_setca.htm"  LongName="fs_setcachesize.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setcbaddr_html"  Name="fs_setcb.htm"  LongName="fs_setcbaddr.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setcell_html"  Name="fs_setce.htm"  LongName="fs_setcell.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setclientaddrs_html"  Name="fs_setcl.htm"  LongName="fs_setclientaddrs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setcrypt_html"  Name="fs_setcr.htm"  LongName="fs_setcrypt.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setquota_html"  Name="fs_setqu.htm"  LongName="fs_setquota.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setserverprefs_html"  Name="fs_setse.htm"  LongName="fs_setserverprefs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_setvol_html"  Name="fs_setvo.htm"  LongName="fs_setvol.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_storebehind_html"  Name="fs_store.htm"  LongName="fs_storebehind.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_sysname_html"  Name="fs_sysna.htm"  LongName="fs_sysname.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_trace_html"  Name="fs_trace.htm"  LongName="fs_trace.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_uuid_html"  Name="fs_uuid.htm"  LongName="fs_uuid.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_whereis_html"  Name="fs_where.htm"  LongName="fs_whereis.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_whichcell_html"  Name="fs_which.htm"  LongName="fs_whichcell.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_fs_wscell_html"  Name="fs_wscel.htm"  LongName="fs_wscell.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_klog_html"  Name="klog.htm"  LongName="klog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_klog__krb5_html"  Name="klogkrb5.htm"  LongName="klog.krb5.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_knfs_html"  Name="knfs.htm"  LongName="knfs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_kpasswd_html"  Name="kpasswd.htm"  LongName="kpasswd.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_livesys_html"  Name="livesys.htm"  LongName="livesys.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_package_test_html"  Name="pack_tst.htm"  LongName="package_test.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pagsh_html"  Name="pagsh.htm"  LongName="pagsh.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_html"  Name="pts.htm"  LongName="pts.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_adduser_html"  Name="pts_addu.htm"  LongName="pts_adduser.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_apropos_html"  Name="pts_apro.htm"  LongName="pts_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_chown_html"  Name="pts_chow.htm"  LongName="pts_chown.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_creategroup_html"  Name="pts_crgr.htm"  LongName="pts_creategroup.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_createuser_html"  Name="pts_crus.htm"  LongName="pts_createuser.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_delete_html"  Name="pts_dele.htm"  LongName="pts_delete.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_examine_html"  Name="pts_exam.htm"  LongName="pts_examine.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_help_html"  Name="pts_help.htm"  LongName="pts_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_interactive_html"  Name="pts_inte.htm"  LongName="pts_interactive.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_listentries_html"  Name="pts_lent.htm"  LongName="pts_listentries.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_listmax_html"  Name="pts_lmax.htm"  LongName="pts_listmax.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_listowned_html"  Name="pts_lown.htm"  LongName="pts_listowned.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_membership_html"  Name="pts_memb.htm"  LongName="pts_membership.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_quit_html"  Name="pts_quit.htm"  LongName="pts_quit.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_removeuser_html"  Name="pts_remo.htm"  LongName="pts_removeuser.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_rename_html"  Name="pts_rena.htm"  LongName="pts_rename.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_setfields_html"  Name="pts_setf.htm"  LongName="pts_setfields.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_setmax_html"  Name="pts_setm.htm"  LongName="pts_setmax.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_sleep_html"  Name="pts_slee.htm"  LongName="pts_sleep.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_pts_source_html"  Name="pts_sour.htm"  LongName="pts_source.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_rxdebug_html"  Name="rxdebug.htm"  LongName="rxdebug.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_rxgen_html"  Name="rxgen.htm"  LongName="rxgen.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_scout_html"  Name="scout.htm"  LongName="scout.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_symlink_html"  Name="symlink.htm"  LongName="symlink.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_symlink_list_html"  Name="sym_list.htm"  LongName="symlink_list.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_symlink_make_html"  Name="sym_make.htm"  LongName="symlink_make.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_symlink_remove_html"  Name="symremov.htm"  LongName="symlink_remove.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_sys_html"  Name="sys.htm"  LongName="sys.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_tokens_html"  Name="tokens.htm"  LongName="tokens.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_translate_et_html"  Name="translat.htm"  LongName="translate_et.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_udebug_html"  Name="udebug.htm"  LongName="udebug.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_unlog_html"  Name="unlog.htm"  LongName="unlog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_up_html"  Name="up.htm"  LongName="up.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_html"  Name="vos.htm"  LongName="vos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_addsite_html"  Name="vos_adds.htm"  LongName="vos_addsite.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_apropos_html"  Name="vos_apro.htm"  LongName="vos_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_backup_html"  Name="vos_back.htm"  LongName="vos_backup.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_backupsys_html"  Name="vos_bsys.htm"  LongName="vos_backupsys.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_changeaddr_html"  Name="vos_chad.htm"  LongName="vos_changeaddr.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_changeloc_html"  Name="vos_chan.htm"  LongName="vos_changeloc.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_clone_html"  Name="vos_clon.htm"  LongName="vos_clone.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_convertROtoRW_html"  Name="vos_conv.htm"  LongName="vos_convertROtoRW.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_copy_html"  Name="vos_copy.htm"  LongName="vos_copy.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_create_html"  Name="vos_crea.htm"  LongName="vos_create.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_delentry_html"  Name="vos_dele.htm"  LongName="vos_delentry.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_dump_html"  Name="vos_dump.htm"  LongName="vos_dump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_examine_html"  Name="vos_exam.htm"  LongName="vos_examine.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_help_html"  Name="vos_help.htm"  LongName="vos_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_listaddrs_html"  Name="vos_ladd.htm"  LongName="vos_listaddrs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_listpart_html"  Name="vos_lpar.htm"  LongName="vos_listpart.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_listvldb_html"  Name="vos_lvld.htm"  LongName="vos_listvldb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_listvol_html"  Name="vos_lvol.htm"  LongName="vos_listvol.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_lock_html"  Name="vos_lock.htm"  LongName="vos_lock.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_move_html"  Name="vos_move.htm"  LongName="vos_move.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_offline_html"  Name="vos_offl.htm"  LongName="vos_offline.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_online_html"  Name="vos_onli.htm"  LongName="vos_online.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_partinfo_html"  Name="vos_part.htm"  LongName="vos_partinfo.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_release_html"  Name="vos_rele.htm"  LongName="vos_release.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_remove_html"  Name="vos_remo.htm"  LongName="vos_remove.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_remsite_html"  Name="vos_rems.htm"  LongName="vos_remsite.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_rename_html"  Name="vos_rena.htm"  LongName="vos_rename.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_restore_html"  Name="vos_rest.htm"  LongName="vos_restore.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_shadow_html"  Name="vos_shad.htm"  LongName="vos_shadow.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_size_html"  Name="vos_size.htm"  LongName="vos_size.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_status_html"  Name="vos_stat.htm"  LongName="vos_status.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_syncserv_html"  Name="vos_syse.htm"  LongName="vos_syncserv.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_syncvldb_html"  Name="vos_syvl.htm"  LongName="vos_syncvldb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_unlock_html"  Name="vos_unlo.htm"  LongName="vos_unlock.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_unlockvldb_html"  Name="vos_unvl.htm"  LongName="vos_unlockvldb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_vos_zap_html"  Name="vos_zap.htm"  LongName="vos_zap.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_xstat_cm_test_html"  Name="xstat_cm.htm"  LongName="xstat_cm_test.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_1_xstat_fs_test_html"  Name="xstat_fs.htm"  LongName="xstat_fs_test.html"  DiskId="1"  />
+                            </Component>
+                        </Directory> <!-- CmdRef_1 -->
+                        <Directory Id="dirCmdRef5_en_US" Name="5" src="$(var.DocDir)\man-pages\html\5\">
+                            <Component Id="cmp_Cmd_Ref_5_en_US" Guid="$(var.DocHtmlCmdRef5Guid)">
+                            <File Id="file_CmdRef_5_afs_html"  Name="afs.htm"  LongName="afs.html"  KeyPath="yes"  DiskId="1"  />
+                            <File Id="file_CmdRef_5_afsmonitor_html"  Name="afsmonit.htm"  LongName="afsmonitor.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_afszcm_cat_html"  Name="afszcm.htm"  LongName="afszcm.cat.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_afs_cache_html"  Name="afs_cach.htm"  LongName="afs_cache.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_afs_volume_header_html"  Name="afs_volu.htm"  LongName="afs_volume_header.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_AuthLog_dir_html"  Name="AuthLogD.htm"  LongName="AuthLog.dir.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_AuthLog_html"  Name="AuthLog.htm"  LongName="AuthLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_BackupLog_html"  Name="BackupLo.htm"  LongName="BackupLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_bdb_DB0_html"  Name="bdb_DB0.htm"  LongName="bdb.DB0.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_BosConfig_html"  Name="BosConfi.htm"  LongName="BosConfig.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_BosLog_html"  Name="BosLog.htm"  LongName="BosLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_butc_html"  Name="butc.htm"  LongName="butc.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_butc_logs_html"  Name="butc_log.htm"  LongName="butc_logs.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_cacheinfo_html"  Name="cacheinf.htm"  LongName="cacheinfo.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_CellAlias_html"  Name="CellAlia.htm"  LongName="CellAlias.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_CellServDB_html"  Name="CellServ.htm"  LongName="CellServDB.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_FileLog_html"  Name="FileLog.htm"  LongName="FileLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_fms_log_html"  Name="fms_log.htm"  LongName="fms.log.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_ForceSalvage_html"  Name="ForceSal.htm"  LongName="ForceSalvage.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_kaserver_DB0_html"  Name="kaserved.htm"  LongName="kaserver.DB0.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_kaserverauxdb_html"  Name="kaserver.htm"  LongName="kaserverauxdb.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_KeyFile_html"  Name="KeyFile.htm"  LongName="KeyFile.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_krb_conf_html"  Name="krb_conf.htm"  LongName="krb.conf.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_NetInfo_html"  Name="NetInfo.htm"  LongName="NetInfo.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_NetRestrict_html"  Name="NetRestr.htm"  LongName="NetRestrict.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_NoAuth_html"  Name="NoAuth.htm"  LongName="NoAuth.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_package_html"  Name="package.htm"  LongName="package.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_prdb_DB0_html"  Name="prdb_DB0.htm"  LongName="prdb.DB0.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_Salvage_fs_html"  Name="SalvageF.htm"  LongName="Salvage.fs.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_Salvage_lock_html"  Name="SalvageL.htm"  LongName="Salvage.lock.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_SalvageLog_html"  Name="SalvageL.htm"  LongName="SalvageLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_sysid_html"  Name="sysid.htm"  LongName="sysid.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_tapeconfig_html"  Name="tapeconf.htm"  LongName="tapeconfig.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_ThisCell_html"  Name="ThisCell.htm"  LongName="ThisCell.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_UserList_html"  Name="UserList.htm"  LongName="UserList.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_uss_html"  Name="uss.htm"  LongName="uss.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_uss_bulk_html"  Name="uss_bulk.htm"  LongName="uss_bulk.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_vldb_DB0_html"  Name="vldb_DB0.htm"  LongName="vldb.DB0.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_VLLog_html"  Name="VLLog.htm"  LongName="VLLog.html"    DiskId="1"  />
+                            <File Id="file_CmdRef_5_VolserLog_html"  Name="VolserLo.htm"  LongName="VolserLog.html"    DiskId="1"  />
+                            </Component>
+                        </Directory> <!-- CmdRef_5 -->
+                        <Directory Id="dirCmdRef8_en_US" Name="8" src="$(var.DocDir)\man-pages\html\8\">
+                            <Component Id="cmp_Cmd_Ref_8_en_US" Guid="$(var.DocHtmlCmdRef8Guid)">
+                            <File Id="file_CmdRef_8_afsd_html"  Name="afsd.htm"  LongName="afsd.html"  KeyPath="yes"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_asetkey_html"  Name="asetkey.htm"  LongName="asetkey.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_html"  Name="backup.htm"  LongName="backup.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_adddump_html"  Name="bk_adddu.htm"  LongName="backup_adddump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_addhost_html"  Name="bk_addho.htm"  LongName="backup_addhost.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_addvolentry_html"  Name="bk_avole.htm"  LongName="backup_addvolentry.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_addvolset_html"  Name="bk_avols.htm"  LongName="backup_addvolset.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_apropos_html"  Name="bk_aprop.htm"  LongName="backup_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_dbverify_html"  Name="bk_dbver.htm"  LongName="backup_dbverify.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_deldump_html"  Name="bk_deldu.htm"  LongName="backup_deldump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_deletedump_html"  Name="bk_deldu.htm"  LongName="backup_deletedump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_delhost_html"  Name="bk_delho.htm"  LongName="backup_delhost.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_delvolentry_html"  Name="bk_delve.htm"  LongName="backup_delvolentry.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_delvolset_html"  Name="bk_delvo.htm"  LongName="backup_delvolset.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_diskrestore_html"  Name="bk_diskr.htm"  LongName="backup_diskrestore.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_dump_html"  Name="bk_dump.htm"  LongName="backup_dump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_dumpinfo_html"  Name="bk_dumpi.htm"  LongName="backup_dumpinfo.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_help_html"  Name="bk_help.htm"  LongName="backup_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_interactive_html"  Name="bk_inter.htm"  LongName="backup_interactive.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_jobs_html"  Name="bk_jobs.htm"  LongName="backup_jobs.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_kill_html"  Name="bk_kill.htm"  LongName="backup_kill.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_labeltape_html"  Name="bk_label.htm"  LongName="backup_labeltape.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_listdumps_html"  Name="bk_lsdum.htm"  LongName="backup_listdumps.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_listhosts_html"  Name="bk_listh.htm"  LongName="backup_listhosts.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_listvolsets_html"  Name="bk_listv.htm"  LongName="backup_listvolsets.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_quit_html"  Name="bk_quit.htm"  LongName="backup_quit.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_readlabel_html"  Name="bk_readl.htm"  LongName="backup_readlabel.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_restoredb_html"  Name="bk_resto.htm"  LongName="backup_restoredb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_savedb_html"  Name="bk_saved.htm"  LongName="backup_savedb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_scantape_html"  Name="bk_scant.htm"  LongName="backup_scantape.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_setexp_html"  Name="bk_setex.htm"  LongName="backup_setexp.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_status_html"  Name="bk_statu.htm"  LongName="backup_status.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_volinfo_html"  Name="bk_volin.htm"  LongName="backup_volinfo.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_volrestore_html"  Name="bk_volre.htm"  LongName="backup_volrestore.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_backup_volsetrestore_html"  Name="bk_volse.htm"  LongName="backup_volsetrestore.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_html"  Name="bos.htm"  LongName="bos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bosserver_html"  Name="bosserve.htm"  LongName="bosserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_addhost_html"  Name="bos_addh.htm"  LongName="bos_addhost.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_addkey_html"  Name="bos_addk.htm"  LongName="bos_addkey.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_adduser_html"  Name="bos_addu.htm"  LongName="bos_adduser.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_apropos_html"  Name="bos_apro.htm"  LongName="bos_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_create_html"  Name="bos_crea.htm"  LongName="bos_create.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_delete_html"  Name="bos_dele.htm"  LongName="bos_delete.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_exec_html"  Name="bos_exec.htm"  LongName="bos_exec.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_getdate_html"  Name="bos_getd.htm"  LongName="bos_getdate.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_getlog_html"  Name="bos_getl.htm"  LongName="bos_getlog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_getrestart_html"  Name="bos_getr.htm"  LongName="bos_getrestart.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_help_html"  Name="bos_help.htm"  LongName="bos_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_install_html"  Name="bos_inst.htm"  LongName="bos_install.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_listhosts_html"  Name="bos_lsho.htm"  LongName="bos_listhosts.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_listkeys_html"  Name="bos_lsky.htm"  LongName="bos_listkeys.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_listusers_html"  Name="bos_lsus.htm"  LongName="bos_listusers.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_prune_html"  Name="bos_prun.htm"  LongName="bos_prune.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_removehost_html"  Name="bos_rmho.htm"  LongName="bos_removehost.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_removekey_html"  Name="bos_rmky.htm"  LongName="bos_removekey.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_removeuser_html"  Name="bos_rmus.htm"  LongName="bos_removeuser.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_restart_html"  Name="bos_rest.htm"  LongName="bos_restart.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_salvage_html"  Name="bos_salv.htm"  LongName="bos_salvage.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_setauth_html"  Name="bos_seta.htm"  LongName="bos_setauth.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_setcellname_html"  Name="bos_setc.htm"  LongName="bos_setcellname.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_setrestart_html"  Name="bos_setr.htm"  LongName="bos_setrestart.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_shutdown_html"  Name="bos_shut.htm"  LongName="bos_shutdown.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_start_html"  Name="bos_star.htm"  LongName="bos_start.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_startup_html"  Name="bos_stup.htm"  LongName="bos_startup.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_status_html"  Name="bos_stat.htm"  LongName="bos_status.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_stop_html"  Name="bos_stop.htm"  LongName="bos_stop.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_uninstall_html"  Name="bos_unin.htm"  LongName="bos_uninstall.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_bos_util_html"  Name="bos_util.htm"  LongName="bos_util.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_buserver_html"  Name="buserver.htm"  LongName="buserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_butc_html"  Name="butc.htm"  LongName="butc.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fileserver_html"  Name="fileserv.htm"  LongName="fileserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fms_html"  Name="fms.htm"  LongName="fms.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_html"  Name="fstrace.htm"  LongName="fstrace.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_apropos_html"  Name="fst_apro.htm"  LongName="fstrace_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_clear_html"  Name="fst_clea.htm"  LongName="fstrace_clear.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_dump_html"  Name="fst_dump.htm"  LongName="fstrace_dump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_help_html"  Name="fst_help.htm"  LongName="fstrace_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_lslog_html"  Name="fst_lslo.htm"  LongName="fstrace_lslog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_lsset_html"  Name="fst_lsse.htm"  LongName="fstrace_lsset.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_setlog_html"  Name="fst_setl.htm"  LongName="fstrace_setlog.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_fstrace_setset_html"  Name="fst_sets.htm"  LongName="fstrace_setset.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_ka_forwarder_html"  Name="ka-forwa.htm"  LongName="ka-forwarder.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kadb_check_html"  Name="kadb_che.htm"  LongName="kadb_check.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_html"  Name="kas.htm"  LongName="kas.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kaserver_html"  Name="kaserver.htm"  LongName="kaserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_apropos_html"  Name="kas_apro.htm"  LongName="kas_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_create_html"  Name="kas_crea.htm"  LongName="kas_create.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_delete_html"  Name="kas_dele.htm"  LongName="kas_delete.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_examine_html"  Name="kas_exam.htm"  LongName="kas_examine.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_forgetticket_html"  Name="kas_forg.htm"  LongName="kas_forgetticket.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_help_html"  Name="kas_help.htm"  LongName="kas_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_interactive_html"  Name="kas_inte.htm"  LongName="kas_interactive.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_list_html"  Name="kas_list.htm"  LongName="kas_list.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_listtickets_html"  Name="kas_ltkt.htm"  LongName="kas_listtickets.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_noauthentication_html"  Name="kas_noau.htm"  LongName="kas_noauthentication.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_quit_html"  Name="kas_quit.htm"  LongName="kas_quit.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_setfields_html"  Name="kas_setf.htm"  LongName="kas_setfields.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_setpassword_html"  Name="kas_setp.htm"  LongName="kas_setpassword.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_statistics_html"  Name="kas_stat.htm"  LongName="kas_statistics.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_stringtokey_html"  Name="kas_stri.htm"  LongName="kas_stringtokey.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kas_unlock_html"  Name="kas_unlo.htm"  LongName="kas_unlock.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kdb_html"  Name="kdb.htm"  LongName="kdb.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_kpwvalid_html"  Name="kpwvalid.htm"  LongName="kpwvalid.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_package_html"  Name="package.htm"  LongName="package.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_prdb_check_html"  Name="prdb_che.htm"  LongName="prdb_check.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_ptserver_html"  Name="ptserver.htm"  LongName="ptserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_pt_util_html"  Name="pt_util.htm"  LongName="pt_util.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_read_tape_html"  Name="read_tap.htm"  LongName="read_tape.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_restorevol_html"  Name="restorev.htm"  LongName="restorevol.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_rmtsysd_html"  Name="rmtsysd.htm"  LongName="rmtsysd.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_salvager_html"  Name="salvager.htm"  LongName="salvager.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_salvageserver_html"  Name="salvages.htm"  LongName="salvageserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_upclient_html"  Name="upclient.htm"  LongName="upclient.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_upserver_html"  Name="upserver.htm"  LongName="upserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_html"  Name="uss.htm"  LongName="uss.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_add_html"  Name="uss_add.htm"  LongName="uss_add.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_apropos_html"  Name="uss_apro.htm"  LongName="uss_apropos.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_bulk_html"  Name="uss_bulk.htm"  LongName="uss_bulk.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_delete_html"  Name="uss_dele.htm"  LongName="uss_delete.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_uss_help_html"  Name="uss_help.htm"  LongName="uss_help.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_vldb_check_html"  Name="vldb_che.htm"  LongName="vldb_check.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_vldb_convert_html"  Name="vldb_con.htm"  LongName="vldb_convert.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_vlserver_html"  Name="vlserver.htm"  LongName="vlserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_voldump_html"  Name="voldump.htm"  LongName="voldump.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_volinfo_html"  Name="volinfo.htm"  LongName="volinfo.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_volserver_html"  Name="volserve.htm"  LongName="volserver.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_vsys_html"  Name="vsys.htm"  LongName="vsys.html"  DiskId="1"  />
+                            <File Id="file_CmdRef_8_xfs_size_check_html"  Name="xfs_size.htm"  LongName="xfs_size_check.html"  DiskId="1"  />
+                            </Component>
+                        </Directory> <!-- CmdRef_8 -->
+                        </Directory> <!-- CmdRef -->
+                    <?else?>
                         <Directory Id="dirCmdRef_$(var.Language)" Name="CmdRef" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\CmdRef\">
                             <Component Id="cmp_Cmd_Ref_$(var.Language)" Guid="$(var.DocHtmlCmdRefGuid)">
-                                <File Id="fileauarf000_HTM_$(var.Language)" Name="auarf000.htm" LongName="auarf000.htm" KeyPath="yes" DiskId="1" />
+                                <File Id="fileauarf000_HTM_$(var.Language)" Name="auarf000.htm" LongName="auarf000.htm" KeyPath="yes" DiskId="1">
+                                         <Shortcut Id="scDocRefMan_$(var.Language)" Directory="dirShortCutDocs" Name="RefMan.lnk" LongName="Reference Manual.lnk" Description="$(loc.StrDocRefManLnkDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                                </File>
                                 <File Id="fileauarf002_HTM_$(var.Language)" Name="auarf002.htm" LongName="auarf002.htm" DiskId="1" />
                                 <File Id="fileauarf003_HTM_$(var.Language)" Name="auarf003.htm" LongName="auarf003.htm" DiskId="1" />
                                 <File Id="fileauarf004_HTM_$(var.Language)" Name="auarf004.htm" LongName="auarf004.htm" DiskId="1" />
                                 <File Id="fileauarf284_HTM_$(var.Language)" Name="auarf284.htm" LongName="auarf284.htm" DiskId="1" />
                             </Component>
                         </Directory> <!-- CmdRef -->
-                        <Directory Id="dirInstallGd_$(var.Language)" Name="InstalGd" SourceName="InstGd" LongSource="InstallGuide" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\InstallGd\">
+                        <Directory Id="dirInstallGd_$(var.Language)" Name="InstalGd" LongName="InstallGd" SourceName="InstGd" LongSource="InstallGuide" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\InstallGd\">
                             <Component Id="cmp_Install_Guide_$(var.Language)" Guid="$(var.DocHtmlInstallGuid)">
                                 <File Id="fileawqbg000_HTM_$(var.Language)" Name="awqbg000.htm" LongName="awqbg000.htm" KeyPath="yes" DiskId="1" />
                                 <File Id="fileawqbg002_HTM_$(var.Language)" Name="awqbg002.htm" LongName="awqbg002.htm" DiskId="1" />
                         </Directory> <!-- Sys Admin guide -->
                         <Directory Id="dirReleaseNotes_$(var.Language)" Name="Relea" LongName="ReleaseNotes" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\">
                             <Component Id="cmp_Release_Notes_$(var.Language)" Guid="$(var.DocHtmlRelNotesGuid)">
-                                <File Id="fileawrns000_HTM_$(var.Language)" Name="awrns.htm" LongName="awrns000.htm" KeyPath="yes" DiskId="1" />
-                                <File Id="fileawrns002_HTM_$(var.Language)" Name="awrns~2.htm" LongName="awrns002.htm" DiskId="1" />
-                                <File Id="fileawrns003_HTM_$(var.Language)" Name="awrns~3.htm" LongName="awrns003.htm" DiskId="1" />
-                                <File Id="fileawrns004_HTM_$(var.Language)" Name="awrns~4.htm" LongName="awrns004.htm" DiskId="1" />
-                                <File Id="fileawrns005_HTM_$(var.Language)" Name="awrns~5.htm" LongName="awrns005.htm" DiskId="1" />
-                                <File Id="fileawrns006_HTM_$(var.Language)" Name="awrns~6.htm" LongName="awrns006.htm" DiskId="1" />
-                                <File Id="fileawrns007_HTM_$(var.Language)" Name="awrns~7.htm" LongName="awrns007.htm" DiskId="1" />
-                                <File Id="fileframes_HTM_$(var.Language)" Name="frames.htm" LongName="frames.htm" DiskId="1" />
+                                <File Id="fileframes_HTM_$(var.Language)" Name="relnot~2.htm" LongName="relnotes-frames.htm" DiskId="1" />
                                 <File Id="filelogo_HTM_$(var.Language)" Name="logo.htm" LongName="logo.htm" DiskId="1" />
                                 <File Id="filerelnotes_HTM_$(var.Language)" Name="relnotes.htm" LongName="relnotes.htm" DiskId="1" />
                                 <File Id="filetoc_HTM_$(var.Language)" Name="toc.htm" LongName="toc.htm" DiskId="1" />
                             </Component>
-                            <Directory Id="dirrelnotes_files_$(var.Language)" Name="relnotes" LongName="relnotes_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\relnotes_files\">
-                                <Component Id="cmp_relnotes_files_$(var.Language)" Guid="$(var.DocHtmlRelnotesFilesGuid)">
-                                    <File Id="filernfilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1"/>
-                                    <File Id="filernheader_HTM_$(var.Language)" Name="header.htm" LongName="header.htm" DiskId="1"/>
-                                    <File Id="filernpreview_WMF_$(var.Language)" Name="preview.wmf" LongName="preview.wmf" DiskId="1"/>
-                                </Component>
-                            </Directory> <!-- relnotes_files -->
                             <Directory Id="dirlogo_files_$(var.Language)" Name="logo" LongName="logo_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\logo_files\">
                                 <Component Id="cmp_logo_files_$(var.Language)" Guid="$(var.DocHtmlLogoFilesGuid)">
-                                    <File Id="filelffilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1"/>
                                     <File Id="filelfimage001_JPG_$(var.Language)" Name="image001.jpg" LongName="image001.jpg" DiskId="1"/>
-                                    <File Id="filelfimage002_JPG_$(var.Language)" Name="image002.jpg" LongName="image002.jpg" DiskId="1"/>
                                 </Component>
                             </Directory> <!-- logo_files -->
+                            <Directory Id="dirrelnotes_files_$(var.Language)" Name="relnotes" LongName="relnotes_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\relnotes_files">
+                                <Component Id="cmp_relnotes_files_$(var.Language)" Guid="$(var.DocHtmlRelnotesFilesGuid)">
+                                  <File Id="filernfilelist.xml_$(var.Language)" Name="filelist.xml" DiskId="1" /> 
+                                  <File Id="filernimage001.png_$(var.Language)" LongName="image001.png" Name="image001.png" DiskId="1" /> 
+                                  <File Id="filernimage002.jpg_$(var.Language)" LongName="image002.jpg" Name="image002.jpg" DiskId="1" /> 
+                                  <File Id="filernimage003.png_$(var.Language)" LongName="image003.png" Name="image003.png" DiskId="1" /> 
+                                  <File Id="filernimage004.jpg_$(var.Language)" LongName="image004.jpg" Name="image004.jpg" DiskId="1" /> 
+                                  <File Id="filernimage005.png_$(var.Language)" LongName="image005.png" Name="image005.png" DiskId="1" /> 
+                                  <File Id="filernimage006.jpg_$(var.Language)" LongName="image006.jpg" Name="image006.jpg" DiskId="1" /> 
+                                  <File Id="filernimage007.jpg_$(var.Language)" LongName="image007.jpg" Name="image007.jpg" DiskId="1" /> 
+                                  <File Id="filernnetidmgr_afs_cfg.png_$(var.Language)" LongName="netidmgr_afs_cfg.png" Name="nmafscfg.png" DiskId="1" /> 
+                                  <File Id="filernnetidmgr_afs_opt.png_$(var.Language)" LongName="netidmgr_afs_opt.png" Name="nmafsopt.png" DiskId="1" /> 
+                                  <File Id="filernnetidmgr_main.png_$(var.Language)" LongName="netidmgr_main.png" Name="nmmain.png" DiskId="1" /> 
+                                </Component>
+                            </Directory>
                         </Directory> <!-- Release Notes -->
+                    <?endif?>
                     </Directory> <!-- Html -->
             </Directory> <!-- Documentation -->
   <?endif?>
                 </Component>
                 <Component Id="cpf_CellServDB" Guid="D5BA4C15-DBEC-4292-91FC-B54C30F24F2A">
                                        <Registry Root="HKLM" Key="SOFTWARE\OpenAFS\Client" Name="CellServDBMoved" Type="integer" Value="1" Id="reg_OldCellDB" KeyPath="yes" />
-                    <CopyFile Id="copy_CellServDB" Delete="yes" DestinationDirectory="dirClient" DestinationName="CellServ|CellServDB" SourceDirectory="WindowsFolder" SourceName="afsdcell.ini" />
+                    <CopyFile Id="copy_CellServDB" Delete="yes" DestinationDirectory="dirClient" DestinationName="CelSrvDB" SourceDirectory="WindowsFolder" SourceName="afsdcell.ini" />
                     <Condition>OLDCELLSERVDB &lt;&gt; ""</Condition>
                 </Component>
   <?endif?>
                 <Directory Id="dirProgram" Name="Program" src="$(var.ClientDir)">
+                    <Component Win64="$(var.Win64)" Id="cmf_instloop_EXE" Guid="$(var.cmf_instloop_EXE_guid)">
+                        <File Id="fileinstloop_EXE" Name="instloop.exe" LongName="instloop.exe" KeyPath="yes" DiskId="1" src="$(var.MediaBinDir)instloop.exe" />
+                        <Condition>INSTALLINSTLOOPEXE &lt;&gt; ""</Condition>
+                    </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_afsshare_EXE" Guid="$(var.cmf_afsshare_EXE_guid)">
                         <File Id="fileafsshare_EXE" Name="afsshare.exe" LongName="afsshare.exe" KeyPath="yes" DiskId="1" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_libosi_DLL" Guid="$(var.cmf_libosi_DLL_guid)">
                         <File Id="filelibosi_DLL" Name="libosi.dll" LongName="libosi.dll" KeyPath="yes" DiskId="1" />
                     </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_libafsconf_DLL" Guid="$(var.cmf_libafsconf_DLL_guid)">
-                        <File Id="filelibafsconf_DLL" Name="libafscf.dll" LongName="libafsconf.dll" KeyPath="yes" DiskId="1" />
-                    </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_klog_EXE" Guid="$(var.cmf_klog_EXE_guid)">
                         <File Id="fileklog_EXE" Name="klog.exe" LongName="klog.exe" KeyPath="yes" DiskId="1" />
                     </Component>
                         <File Id="fileafsdacl_EXE" Name="afsdacl.exe" KeyPath="yes" DiskId="1" />
                     </Component>
   <?ifndef BinsOnly ?>
+
+        <!-- en_US help -->
+
+                    <Component Id="cmf_afs_nt_HLP_en_US" Guid="E9CAF872-E71B-466E-9560-9E6F542128E4">
+                        <File Id="fileafs_nt_HLP_en_US" Name="afs-nt.hlp" LongName="afs-nt.hlp" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\doc\help\en_US\afs-nt.hlp">
+                                                       <Shortcut Id="scClientHelp_en_US" Directory="dirShortCut" Name="CliHelp.lnk" LongName="Client Help.lnk" Description="$(loc.StrHlpFileDesc)" Icon="ico_Help" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+                        </File>
+                        <File Id="fileafs_nt2_CNT_en_US" Name="afs-nt.cnt" LongName="afs-nt.cnt" DiskId="1" src="$(var.SrcDir)WINNT\doc\help\en_US\afs-nt.cnt" />
+                    </Component>
+
                     <Component Win64="$(var.Win64)" Id="cmf_afscreds_EXE" Guid="$(var.cmf_afscreds_EXE_guid)">
                         <File Id="fileafscreds_EXE" Name="afscreds.exe" LongName="afscreds.exe" KeyPath="yes" DiskId="1">
                                                        <Shortcut Id="scAfsCreds" Directory="dirShortCut" Name="Auth.lnk" LongName="Authentication.lnk" Description="$(loc.StrAfsCredsDesc)" Arguments="[CREDSAUTOINIT] [CREDSRENEWDRMAP] [CREDSIPCHDET] [CREDSQUIET] [CREDSSHOW]" Icon="ico_afscreds" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
                         </File>
                     </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_afscreds_1033_DLL" Guid="$(var.cmf_afscreds_1033_DLL_guid)">
+                        <File Id="fileafscreds_1033_DLL" Name="acrd1033.dll" LongName="afscreds_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afscreds_1033.dll"/>
+                    </Component>
                     <Component Win64="$(var.Win64)" Id="cmp_credsStartup" Guid="$(var.cmp_credsStartup_guid)">
                                                <Shortcut Id="scAfsCredsStart" Directory="StartupFolder" Name="AFSAuth.lnk" LongName="AFS Credentials.lnk" Description="$(loc.StrAfsCredsDesc)" Arguments="[CREDSAUTOINIT] [CREDSRENEWDRMAP] [CREDSIPCHDET] [CREDSQUIET] [CREDSSHOW]" Icon="ico_afscreds" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" Target="[#fileafscreds_EXE]"/>
                                                <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client\CurrentVersion" Name="StartupShortcutInstalled" Type="integer" Value="1" Id="reg_CredsAutoStart" KeyPath="yes" />
                     </Component>
+  <?endif?>
+
                     <Component Win64="$(var.Win64)" Id="cmf_afs_shl_ext_DLL" Guid="$(var.cmf_afs_shl_ext_DLL_guid)">
                         <File Id="fileafs_shl_ext_DLL" Name="afsshext.dll" LongName="afs_shl_ext.dll" KeyPath="yes" DiskId="1">
-                            <Class Id="DC515C27-6CAC-11D1-BAE7-00C04FD140D2" Advertise="no" Context="InprocServer32" Description="$(loc.StrShlExtDesc)" ThreadingModel="apartment">
+                            <Class Id="$(var.clsid_afs_shl_ext)" Advertise="no" Context="InprocServer32" Description="$(loc.StrShlExtDesc)" ThreadingModel="apartment">
                                 <ProgId Id="AfsClientContextMenu.1" Description="$(loc.StrShlExtDesc)">
                                     <ProgId Id="AfsClientContextMenu" />
                                 </ProgId>
                             </Class>
                         </File>
                     </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_afs_shl_ext_1033_DLL" Guid="$(var.cmf_afs_shl_ext_1033_DLL_guid)">
+                        <File Id="fileafs_shl_ext_1033_DLL" Name="ashl1033.dll" LongName="afs_shl_ext_1033.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_shl_ext_1033.dll"/>
+                    </Component>
+
+                    <Component Win64="$(var.Win64)" Id="_afscreds_en_us"
+                        Guid="$(var._afscreds_en_us_guid)" DiskId="1">
+                        <File Id="file_afscred_en_us_dll" Name="afscenu.dll" LongName="afscred_en_us.dll" KeyPath="yes"/>
+                    </Component>
+
+                    <Component Win64="$(var.Win64)" Id="_afscreds_plugin" 
+                        Guid="$(var._afscreds_plugin_guid)" DiskId="1">
+                        <File Id="file_afscred_dll" Name="afscred.dll" LongName="afscred.dll" KeyPath="yes"/>
+                        <Registry Id="reg_mod_01" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Action="createKeyAndRemoveKeyOnUninstall" />
+                        <Registry Id="reg_mod_02" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" />
+                        <Registry Id="reg_mod_03" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Name="ImagePath" Type="string" Value="[#file_afscred_dll]" />
+                        <Registry Id="reg_mod_04" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Name="Description" Type="string" Value="OpenAFS Module" />
+                        <Registry Id="reg_mod_05" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Name="Vendor" Type="string" Value="Secure Endpoints Inc." />
+                        <Registry Id="reg_mod_06" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Name="PluginList" Type="string" Value="AfsCred" />
+                        <Registry Id="reg_mod_07" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Modules\OpenAFS" Name="NoUnload" Type="integer" Value="1" />
+                        <Registry Id="reg_plg_01" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" Action="createKeyAndRemoveKeyOnUninstall" />
+                        <Registry Id="reg_plg_02" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" />
+                        <Registry Id="reg_plg_03" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" Name="Module" Type="string" Value="OpenAFS" />
+                        <Registry Id="reg_plg_04" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" Name="Description" Type="string" Value="AFS Credentials Provider" />
+                        <Registry Id="reg_plg_05" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" Name="Dependencies" Type="string" Value="Krb5Cred" />
+                        <Registry Id="reg_plg_06" Root="HKLM" Key="SOFTWARE\MIT\NetIDMgr\PluginManager\Plugins\AfsCred" Name="Type" Type="integer" Value="1" />
+                    </Component>
+  
+     <?ifdef DebugSyms?>            
+                    <Component Win64="$(var.Win64)" Id="_afscreds_debugsym"
+                        Guid="$(var._afscreds_debugsym_guid)" DiskId="1">
+                        <File Id="file_afscred_pdb" Name="afscred.pdb" LongName="afscred.pdb" KeyPath="yes"/>
+                    </Component>
+     <?endif?>
+                    <Component Id="_afscreds_chm"
+                        Guid="$(var._afscreds_chm_guid)" DiskId="1">
+                        <File Id="file_afsplhlp_chm" Name="afsplhlp.chm" LongName="afsplhlp.chm" KeyPath="yes" />
+                    </Component>
+
+  <?ifndef BinsOnly ?>
                     <Component Win64="$(var.Win64)" Id="cmf_afsd_service_EXE" Guid="$(var.cmf_afsd_service_EXE_guid)">
                         <File Id="fileafsd_service_EXE" Name="afsd_svc.exe" LongName="afsd_service.exe" KeyPath="yes" DiskId="1" />
                         <ServiceControl Id="TransarcAFSDaemon" Name="TransarcAFSDaemon" Stop="both" Remove="both" Wait="yes" />
-                        <ServiceInstall Id="svc_Client" Name="TransarcAFSDaemon" DisplayName="OpenAFS Client" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Provides access to files and directories stored in AFS" Interactive="yes">
+                        <ServiceInstall Id="svc_Client" Name="TransarcAFSDaemon" DisplayName="OpenAFS Client Service" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Provides access to files and directories stored in AFS" Interactive="yes">
                                                        <!-- ServiceConfig doesn't currently do what you think it does.
                                                             We instead use a custom action to set the service failure actions.
                             <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="10" SecondFailureActionType="restart" ThirdFailureActionType="none"/>
                             <ServiceDependency Id="NetBIOS" />
                             <ServiceDependency Id="PNP_TDI" Group="yes"/>
                         </ServiceInstall>
-                        <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
                         <RemoveFile Id="removeCache" Directory="WindowsVolume" LongName="AFSCache" Name="AFSCache" On="uninstall" />
                     </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_afslogon_DLL" Guid="$(var.cmf_afslogon_DLL_guid)">
+                            <File Id="fileafslogon_DLL" Name="afslogon.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)afslogon.dll" />
+                            <Registry Id="reg_afslogon01" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Action="createKeyAndRemoveKeyOnUninstall" />
+                            <Registry Id="reg_afslogon02" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" />
+                            <Registry Id="reg_afslogon03" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Asynchronous" Type="integer" Value="0" />
+                            <Registry Id="reg_afslogon04" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Impersonate" Type="integer" Value="1" />
+                            <Registry Id="reg_afslogon05" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="DLLName" Type="string" Value="[#fileafslogon_DLL]" />
+                            <Registry Id="reg_afslogon06" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logoff" Type="string" Value="AFS_Logoff_Event" />
+                            <Registry Id="reg_afslogon07" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logon" Type="string" Value="AFS_Logon_Event" />
+                            <Registry Id="reg_afslogon08" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Startup" Type="string" Value="AFS_Startup_Event" />
+                           <!-- KFW includes this functionality - OpenAFS does not need to provide it
+                            <Registry Id="reg_afslogon09" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Asynchronous" Type="integer" Value="0" />
+                            <Registry Id="reg_afslogon10" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Impersonate" Type="integer" Value="0" />
+                            <Registry Id="reg_afslogon11" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="DLLName" Type="string" Value="[#fileafslogon_DLL]" />
+                            <Registry Id="reg_afslogon13" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\KFWLogon" Name="Logon" Type="string" Value="KFW_Logon_Event" />
+                           -->
+                        </Component>
+                        <Component Win64="$(var.Win64)" Id="cmf_afscpcc_EXE" Guid="$(var.cmf_afscpcc_EXE_guid)">
+                            <File Id="fileafscpcc_EXE"  Name="afscpcc.exe"  LongName="afscpcc.exe"  DiskId="1" src="$(var.ClientDir)afscpcc.exe" KeyPath="yes"/>
+                        </Component>
+                    <?ifdef DebugSyms?>
+                        <Component Win64="$(var.Win64)" Id="cmp_ClientSystemDebug" Guid="$(var.cmp_ClientSystemDebug_guid)">
+                               <File Id="fileafslogon_PDB" Name="afslogon.pdb" KeyPath="yes" DiskId="1" src="$(var.ClientDir)afslogon.pdb" />
+                               <File Id="fileafscpcc_PDB" Name="afscpcc.pdb" DiskId="1" src="$(var.ClientDir)afscpcc.pdb" />
+                        </Component>
+                    <?endif?>
   <?endif?>
                      <Component Win64="$(var.Win64)" Id="cmf_symlink_EXE" Guid="$(var.cmf_symlink_EXE_guid)">
                         <File Id="filesymlink_EXE" Name="symlink.exe" LongName="symlink.exe" KeyPath="yes" DiskId="1" />
                      <Component Win64="$(var.Win64)" Id="cmf_backup_EXE" Guid="$(var.cmf_backup_EXE_guid)">
                         <File Id="filebackup_EXE" Name="backup.exe" LongName="backup.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\backup.exe"/>
                     </Component>
-                   <?if $(env.CPU) = "i386"?>
-                           <Component Win64="$(var.Win64)" Id="cmf_aklog_EXE" Guid="$(var.cmf_aklog_EXE_guid)">
-                               <File Id="fileaklog_EXE" Name="aklog.exe" LongName="aklog.exe" KeyPath="yes" DiskId="1" />
-                           </Component>
-                   <?endif?>
+                   <Component Win64="$(var.Win64)" Id="cmf_aklog_EXE" Guid="$(var.cmf_aklog_EXE_guid)">
+                        <File Id="fileaklog_EXE" Name="aklog.exe" LongName="aklog.exe" KeyPath="yes" DiskId="1" />
+                   </Component>
                      <Component Win64="$(var.Win64)" Id="cmf_cmdebug_EXE" Guid="$(var.cmf_cmdebug_EXE_guid)">
                         <File Id="filecmdebug_EXE" Name="cmdebug.exe" LongName="cmdebug.exe" KeyPath="yes" DiskId="1" />
+                        <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
                     </Component>
   <?ifndef BinsOnly?>
                    <Component Win64="$(var.Win64)" Id="cmf_afs_cpa_CPL" Guid="$(var.cmf_afs_cpa_CPL_guid)">
                      <Component Win64="$(var.Win64)" Id="cmp_ClientProgramDebug" Guid="$(var.cmp_ClientProgramDebug_guid)">
                         <File Id="fileafsshare_PDB" Name="afsshare.pdb" LongName="afsshare.pdb" DiskId="1" />
                         <File Id="filelibosi_PDB" Name="libosi.pdb" LongName="libosi.pdb" DiskId="1" />
-                        <File Id="filelibafsconf_PDB" Name="libafscf.pdb" LongName="libafsconf.pdb" DiskId="1" />
                         <File Id="fileklog_PDB" Name="klog.pdb" LongName="klog.pdb" DiskId="1" />
                         <File Id="filetokens_PDB" Name="tokens.pdb" LongName="tokens.pdb" DiskId="1" />
                         <File Id="fileunlog_PDB" Name="unlog.pdb" LongName="unlog.pdb" DiskId="1" />
                         <File Id="filetranslate_et_PDB" Name="translet.pdb" LongName="translate_et.pdb" DiskId="1" src="$(var.BinDir)\translate_et.pdb"/>
                         <File Id="filerxdebug_PDB" Name="rxdebug.pdb" LongName="rxdebug.pdb" DiskId="1" src="$(var.EtcDir)\rxdebug.pdb"/>
                         <File Id="filebackup_PDB" Name="backup.pdb" LongName="backup.pdb" DiskId="1" src="$(var.EtcDir)\backup.pdb"/>
-                       <?if $(env.CPU) = "i386"?>
-                               <File Id="fileaklog_PDB" Name="aklog.pdb" LongName="aklog.pdb" DiskId="1" />
-                       <?endif?>
+                        <File Id="fileaklog_PDB" Name="aklog.pdb" LongName="aklog.pdb" DiskId="1" />
                         <File Id="filecmdebug_PDB" Name="cmdebug.pdb" LongName="cmdebug.pdb" DiskId="1" />
+                        <File Id="fileafs_shl_ext_PDB" Name="afsshext.pdb" LongName="afs_shl_ext.pdb" DiskId="1" />
   <?ifndef BinsOnly ?>
                        <File Id="fileafs_cpa_PDB" Name="afs_cpa.pdb" LongName="afs_cpa.pdb" KeyPath="yes" DiskId="1"/>
                         <File Id="fileafscreds_PDB" Name="afscreds.pdb" LongName="afscreds.pdb" DiskId="1" />
-                        <File Id="fileafs_shl_ext_PDB" Name="afsshext.pdb" LongName="afs_shl_ext.pdb" DiskId="1" />
                         <File Id="fileafsd_service_PDB" Name="afsd_svc.pdb" LongName="afsd_service.pdb" DiskId="1" />
   <?endif?>
                     </Component>
                 <?endif?>
+                </Directory> <!-- /Program -->
+            </Directory> <!-- /Client -->
+  <?ifndef BinsOnly ?>
+            <Directory Id="dirServer" Name="Server">
+                <Directory Id="dirusr" Name="usr">
+                    <Directory Id="dirafs" Name="afs">
+                        <Directory Id="dirbin" Name="bin" src="$(var.ServerDir)">
+                             <Component Win64="$(var.Win64)" Id="cmf_vlserver_EXE" Guid="$(var.cmf_vlserver_EXE_guid)">
+                                <File Id="filevlserver_EXE" Name="vlser.exe" LongName="vlserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_volinfo_EXE" Guid="$(var.cmf_volinfo_EXE_guid)">
+                                <File Id="filevolinfo_EXE" Name="volin.exe" LongName="volinfo.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_volserver_EXE" Guid="$(var.cmf_volserver_EXE_guid)">
+                                <File Id="filevolserver_EXE" Name="volse.exe" LongName="volserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_afskill_EXE" Guid="$(var.cmf_afskill_EXE_guid)">
+                                <File Id="fileafskill_EXE" Name="afski.exe" LongName="afskill.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_afssvrcfg_EXE" Guid="$(var.cmf_afssvrcfg_EXE_guid)">
+                                <File Id="fileafssvrcfg_EXE" Name="afssv.exe" LongName="afssvrcfg.exe" KeyPath="yes" DiskId="1">
+<!--
+                                                                       <Shortcut Id="scSvrCfgWizard" Directory="dirShortCut" Name="SvrCfgWz.lnk" LongName="Server Configuration Wizard.lnk" Description="$(loc.StrCfgWzdDesc)" Arguments="/wizard" Icon="ico_afssvrcfg" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
+-->
+                                </File>
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_asetkey_EXE" Guid="$(var.cmf_asetkey_EXE_guid)">
+                                <File Id="fileasetkey_EXE" Name="asetk.exe" LongName="asetkey.exe" KeyPath="yes" DiskId="1" />
+                           </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_bosctlsvc_EXE" Guid="$(var.cmf_bosctlsvc_EXE_guid)">
+                                <File Id="filebosctlsvc_EXE" Name="bosct.exe" LongName="bosctlsvc.exe" KeyPath="yes" DiskId="1" />
+                                <ServiceControl Id="TransarcAFSServer" Name="TransarcAFSServer" Stop="both" Remove="both" Wait="yes" />
+                                <ServiceInstall Id="svc_Server" Name="TransarcAFSServer" DisplayName="OpenAFS Server" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Manages AFS server processes" Interactive="yes">
+                                                                       <!-- ServiceConfig does nothing 
+                                    <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="5" SecondFailureActionType="restart" ThirdFailureActionType="none"/>
+                                    -->
+                                    <ServiceDependency Id="Tcpip" />
+                                    <ServiceDependency Id="PNP_TDI" Group="yes"/>
+                                </ServiceInstall>
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_bosserver_EXE" Guid="$(var.cmf_bosserver_EXE_guid)">
+                                <File Id="filebosserver_EXE" Name="bosse.exe" LongName="bosserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_buserver_EXE" Guid="$(var.cmf_buserver_EXE_guid)">
+                                <File Id="filebuserver_EXE" Name="buser.exe" LongName="buserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_fileserver_EXE" Guid="$(var.cmf_fileserver_EXE_guid)">
+                                <File Id="filefileserver_EXE" Name="files.exe" LongName="fileserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_fms_EXE" Guid="$(var.cmf_fms_EXE_guid)">
+                                <File Id="filefms_EXE" Name="fms.exe" LongName="fms.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\fms.exe"/>
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_butc_EXE" Guid="$(var.cmf_butc_EXE_guid)">
+                                <File Id="filebutc_EXE" Name="butc.exe" LongName="butc.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\butc.exe"/>
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_kaserver_EXE" Guid="$(var.cmf_kaserver_EXE_guid)">
+                                <File Id="filekaserver_EXE" Name="kaser.exe" LongName="kaserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_ptserver_EXE" Guid="$(var.cmf_ptserver_EXE_guid)">
+                                <File Id="fileptserver_EXE" Name="ptser.exe" LongName="ptserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_ptclient_EXE" Guid="$(var.cmf_ptclient_EXE_guid)">
+                                <File Id="fileptclient_EXE" Name="ptclient.exe" LongName="ptclient.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\ptclient.exe" />
+                            </Component>
+                             <Component Win64="$(var.Win64)" Id="cmf_pt_util_EXE" Guid="$(var.cmf_pt_util_EXE_guid)">
+                                <File Id="filept_util_EXE" Name="pt_util.exe" LongName="pt_util.exe" KeyPath="yes" DiskId="1" src="$(var.BinDir)\pt_util.exe" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_salvager_EXE" Guid="$(var.cmf_salvager_EXE_guid)">
+                                <File Id="filesalvager_EXE" Name="salva.exe" LongName="salvager.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_upclient_EXE" Guid="$(var.cmf_upclient_EXE_guid)">
+                                <File Id="fileupclient_EXE" Name="upcli.exe" LongName="upclient.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                            <Component Win64="$(var.Win64)" Id="cmf_upserver_EXE" Guid="$(var.cmf_upserver_EXE_guid)">
+                                <File Id="fileupserver_EXE" Name="upser.exe" LongName="upserver.exe" KeyPath="yes" DiskId="1" />
+                            </Component>
+                                                       <Component Win64="$(var.Win64)" Id="cmf_afsserver_CPL" Guid="$(var.cmf_afsserver_CPL_guid)">
+                                                               <File Id="fileafsserver_CPL" Name="afsserve.cpl" LongName="afsserver.cpl" KeyPath="yes" DiskId="1"/>
+                                                       <Registry Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls" Name="AFS Server CPL" Type="string" Value="[#fileafsserver_CPL]" Id="reg_Server30" />
+                                                       </Component>
+
+                            <Component Id="cmp_Server_Program" Guid="8C4D0351-8EBF-4192-BF63-DCB3AADF4115" KeyPath="yes">
+                                <CreateFolder />
+                                <CreateFolder Directory="dirlog" />
+                                <CreateFolder Directory="diretc" />
+                                <CreateFolder Directory="dirlocal" />
+                            </Component>
+                            
+                        <?ifdef DebugSyms?>
+                            <Component Win64="$(var.Win64)" Id="cmp_Server_Program_Debug" Guid="$(var.cmp_Server_Program_Debug_guid)">
+                                <File Id="filevlserver_PDB" Name="vlser.pdb" LongName="vlserver.pdb" DiskId="1" />
+                                <File Id="filevolinfo_PDB" Name="volin.pdb" LongName="volinfo.pdb" DiskId="1" />
+                                <File Id="filevolserver_PDB" Name="volse.pdb" LongName="volserver.pdb" DiskId="1" />
+                                <File Id="fileafskill_PDB" Name="afski.pdb" LongName="afskill.pdb" DiskId="1" />
+                                <File Id="fileafssvrcfg_PDB" Name="afssv.pdb" LongName="afssvrcfg.pdb" DiskId="1" />
+                                <File Id="fileasetkey_PDB" Name="asetk.pdb" LongName="asetkey.pdb" DiskId="1" />
+                                <File Id="filebosctlsvc_PDB" Name="bosct.pdb" LongName="bosctlsvc.pdb" DiskId="1" />
+                                <File Id="filebosserver_PDB" Name="bosse.pdb" LongName="bosserver.pdb" DiskId="1" />
+                                <File Id="filebuserver_PDB" Name="buser.pdb" LongName="buserver.pdb" DiskId="1" />
+                                <File Id="filefileserver_PDB" Name="files.pdb" LongName="fileserver.pdb" DiskId="1" />
+                                <File Id="filefms_PDB" Name="fms.pdb" LongName="fms.pdb" DiskId="1" src="$(var.EtcDir)\fms.pdb"/>
+                                <File Id="filebutc_PDB" Name="butc.pdb" LongName="butc.pdb" DiskId="1" src="$(var.EtcDir)\butc.pdb"/>
+                                <File Id="filekaserver_PDB" Name="kaser.pdb" LongName="kaserver.pdb" DiskId="1" />
+                                <File Id="fileptserver_PDB" Name="ptser.pdb" LongName="ptserver.pdb" DiskId="1" />
+                                <File Id="filesalvager_PDB" Name="salva.pdb" LongName="salvager.pdb" DiskId="1" />
+                                <File Id="fileupclient_PDB" Name="upcli.pdb" LongName="upclient.pdb" DiskId="1" />
+                                <File Id="fileupserver_PDB" Name="upser.pdb" LongName="upserver.pdb" DiskId="1" />
+                                                               <File Id="fileafsserver_PDB" Name="afsserve.pdb" LongName="afsserver.pdb" KeyPath="yes" DiskId="1"/>
+                            </Component>
+                        <?endif?>
+                        
+                        </Directory>
+                        <Directory Id="dirlog" Name="log" />
+                        <Directory Id="diretc" Name="etc" />
+                        <Directory Id="dirlocal" Name="local" />
+                    </Directory>
+                </Directory>
+            </Directory> <!-- Server -->
+  <?endif?>
   <?ifndef BinsOnly?>                  
+            <Directory Id="dirSDK" Name="SDK">
                     <Directory Id="dirSample" Name="Sample">
                         <Component Id="cmp_SDK_Sample" Guid="F9373E95-F410-4AA5-AA79-07C11EE00334">
                             <File Id="filetoken_C" Name="token.c" LongName="token.c" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\afsd\sample\token.c"/>
                             <File Id="filelanahelper_LIB" Name="LANAHE~1.lib" LongName="lanahelper.lib" DiskId="1" src="$(var.LibDir)lanahelper.lib" /> 
                             <File Id="filelibafsconf_LIB" Name="LIBAFS~1.lib" LongName="libafsconf.lib" DiskId="1" src="$(var.LibDir)libafsconf.lib" /> 
                             <File Id="filelibosi_LIB" Name="libosi.lib" LongName="libosi.lib" DiskId="1" src="$(var.LibDir)libosi.lib" /> 
-                            <File Id="filecm_config_OBJ" Name="CM_CON~1.obj" LongName="cm_config.obj" DiskId="1" src="$(var.LibDir)cm_config.obj" /> 
-                            <File Id="filecm_dns_OBJ" Name="cm_dns.obj" LongName="cm_dns.obj" DiskId="1" src="$(var.LibDir)cm_dns.obj" /> 
                         </Component>
+                        <?ifdef CygwinArchives?>
+                        <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Cygwin" Guid="$(var.cmp_SDK_Lib_Cygwin_guid)">
+                          <File Id="fileafsauthent_A" Name="afsauth.a" LongName="afsauthent.a" DiskId="1" src="$(var.LibDir)afsauthent.a" />
+                          <File Id="fileafspthread_A" Name="afspthrd.a" LongName="afspthread.a" DiskId="1" src="$(var.LibDir)afspthread.a" />
+                          <File Id="fileafsrpc_A" Name="afsrpc.a" LongName="afsrpc.a" DiskId="1" src="$(var.LibDir)afsrpc.a" />
+                          <File Id="filelibafsconf_A" Name="libafscf.a" LongName="libafsconf.a" DiskId="1" src="$(var.LibDir)libafsconf.a" />
+                          <File Id="filelibosi_A" Name="libosi.a" LongName="libosi.a" DiskId="1" src="$(var.ClientDir)libosi.a" /> 
+                        </Component>
+                        <?endif?>
                         <Directory Id="dirLibAfs" Name="afs">
                             <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs" Guid="$(var.cmp_SDK_Lib_Afs_guid)">
                                 <File Id="fileafsacl_LIB" Name="afsacl.lib" LongName="afsacl.lib" DiskId="1" src="$(var.LibDir)afs\afsacl.lib" /> 
                                 <File Id="fileTaAfsAppLib_LIB" Name="TAAFSA~2.lib" LongName="TaAfsAppLib.lib" DiskId="1" src="$(var.LibDir)afs\TaAfsAppLib.lib" /> 
                                 <File Id="filetalocale_LIB" Name="talocale.lib" LongName="talocale.lib" DiskId="1" src="$(var.LibDir)afs\talocale.lib" /> 
                             </Component>
-                        </Directory>
-                    </Directory>
-  <?endif?>
-                </Directory> <!-- /Program -->
-            </Directory> <!-- /Client -->
-  <?ifndef BinsOnly ?>
-            <Directory Id="dirServer" Name="Server">
-                <Directory Id="dirusr" Name="usr">
-                    <Directory Id="dirafs" Name="afs">
-                        <Directory Id="dirbin" Name="bin" src="$(var.ServerDir)">
-                             <Component Win64="$(var.Win64)" Id="cmf_vlserver_EXE" Guid="$(var.cmf_vlserver_EXE_guid)">
-                                <File Id="filevlserver_EXE" Name="vlser.exe" LongName="vlserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                             <Component Win64="$(var.Win64)" Id="cmf_volinfo_EXE" Guid="$(var.cmf_volinfo_EXE_guid)">
-                                <File Id="filevolinfo_EXE" Name="volin.exe" LongName="volinfo.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                             <Component Win64="$(var.Win64)" Id="cmf_volserver_EXE" Guid="$(var.cmf_volserver_EXE_guid)">
-                                <File Id="filevolserver_EXE" Name="volse.exe" LongName="volserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                             <Component Win64="$(var.Win64)" Id="cmf_afskill_EXE" Guid="$(var.cmf_afskill_EXE_guid)">
-                                <File Id="fileafskill_EXE" Name="afski.exe" LongName="afskill.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                             <Component Win64="$(var.Win64)" Id="cmf_afssvrcfg_EXE" Guid="$(var.cmf_afssvrcfg_EXE_guid)">
-                                <File Id="fileafssvrcfg_EXE" Name="afssv.exe" LongName="afssvrcfg.exe" KeyPath="yes" DiskId="1">
-                                                                       <Shortcut Id="scSvrCfgWizard" Directory="dirShortCut" Name="SvrCfgWz.lnk" LongName="Server Configuration Wizard.lnk" Description="$(loc.StrCfgWzdDesc)" Arguments="/wizard" Icon="ico_afssvrcfg" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
-                                </File>
-                            </Component>
-                           <?if $(env.CPU) = "i386"?>
-                                    <Component Win64="$(var.Win64)" Id="cmf_asetkey_EXE" Guid="$(var.cmf_asetkey_EXE_guid)">
-                                       <File Id="fileasetkey_EXE" Name="asetk.exe" LongName="asetkey.exe" KeyPath="yes" DiskId="1" />
-                                   </Component>
-                           <?endif?>
-                             <Component Win64="$(var.Win64)" Id="cmf_bosctlsvc_EXE" Guid="$(var.cmf_bosctlsvc_EXE_guid)">
-                                <File Id="filebosctlsvc_EXE" Name="bosct.exe" LongName="bosctlsvc.exe" KeyPath="yes" DiskId="1" />
-                                <ServiceControl Id="TransarcAFSServer" Name="TransarcAFSServer" Stop="both" Remove="both" Wait="yes" />
-                                <ServiceInstall Id="svc_Server" Name="TransarcAFSServer" DisplayName="OpenAFS Server" Type="ownProcess" Start="auto" ErrorControl="normal" Description="Manages AFS server processes" Interactive="yes">
-                                                                       <!-- ServiceConfig does nothing 
-                                    <ServiceConfig FirstFailureActionType="restart" RestartServiceDelayInSeconds="5" SecondFailureActionType="restart" ThirdFailureActionType="none"/>
-                                    -->
-                                </ServiceInstall>
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_bosserver_EXE" Guid="$(var.cmf_bosserver_EXE_guid)">
-                                <File Id="filebosserver_EXE" Name="bosse.exe" LongName="bosserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_buserver_EXE" Guid="$(var.cmf_buserver_EXE_guid)">
-                                <File Id="filebuserver_EXE" Name="buser.exe" LongName="buserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_fileserver_EXE" Guid="$(var.cmf_fileserver_EXE_guid)">
-                                <File Id="filefileserver_EXE" Name="files.exe" LongName="fileserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_fms_EXE" Guid="$(var.cmf_fms_EXE_guid)">
-                                <File Id="filefms_EXE" Name="fms.exe" LongName="fms.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\fms.exe"/>
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_butc_EXE" Guid="$(var.cmf_butc_EXE_guid)">
-                                <File Id="filebutc_EXE" Name="butc.exe" LongName="butc.exe" KeyPath="yes" DiskId="1" src="$(var.EtcDir)\butc.exe"/>
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_kaserver_EXE" Guid="$(var.cmf_kaserver_EXE_guid)">
-                                <File Id="filekaserver_EXE" Name="kaser.exe" LongName="kaserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_ptserver_EXE" Guid="$(var.cmf_ptserver_EXE_guid)">
-                                <File Id="fileptserver_EXE" Name="ptser.exe" LongName="ptserver.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_salvager_EXE" Guid="$(var.cmf_salvager_EXE_guid)">
-                                <File Id="filesalvager_EXE" Name="salva.exe" LongName="salvager.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_upclient_EXE" Guid="$(var.cmf_upclient_EXE_guid)">
-                                <File Id="fileupclient_EXE" Name="upcli.exe" LongName="upclient.exe" KeyPath="yes" DiskId="1" />
-                            </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_upserver_EXE" Guid="$(var.cmf_upserver_EXE_guid)">
-                                <File Id="fileupserver_EXE" Name="upser.exe" LongName="upserver.exe" KeyPath="yes" DiskId="1" />
+                            <?ifdef CygwinArchives?>
+                            <Component Win64="$(var.Win64)" Id="cmp_SDK_Lib_Afs_Cygwin" Guid="$(var.cmp_SDK_Lib_Afs_Cygwin_guid)">
+                                <File Id="fileafsadminutil_A" Name="afsadmut.a" LongName="afsadminutil.a" DiskId="1" src="$(var.ServerDir)afsadminutil.a" /> 
+                                <File Id="fileafsbosadmin_A" Name="afsbosad.a" LongName="afsbosadmin.a" DiskId="1" src="$(var.ServerDir)afsbosadmin.a" /> 
+                                <File Id="fileafscfgadmin_A" Name="afscfgad.a" LongName="afscfgadmin.a" DiskId="1" src="$(var.ServerDir)afscfgadmin.a" /> 
+                                <File Id="fileafsclientadmin_A" Name="afscliad.a" LongName="afsclientadmin.a" DiskId="1" src="$(var.ServerDir)afsclientadmin.a" /> 
+                                <File Id="fileafskasadmin_A" Name="afskasad.a" LongName="afskasadmin.a" DiskId="1" src="$(var.ServerDir)afskasadmin.a" /> 
+                                <File Id="fileafsprocmgmt_A" Name="afsprcmg.a" LongName="afsprocmgmt.a" DiskId="1" src="$(var.ServerDir)afsprocmgmt.a" /> 
+                                <File Id="fileafsptsadmin_A" Name="afsptsad.a" LongName="afsptsadmin.a" DiskId="1" src="$(var.ServerDir)afsptsadmin.a" /> 
+                                <File Id="fileafsvosadmin_A" Name="afsvosad.a" LongName="afsvosadmin.a" DiskId="1" src="$(var.ServerDir)afsvosadmin.a" /> 
                             </Component>
-                                                       <Component Win64="$(var.Win64)" Id="cmf_afsserver_CPL" Guid="$(var.cmf_afsserver_CPL_guid)">
-                                                               <File Id="fileafsserver_CPL" Name="afsserve.cpl" LongName="afsserver.cpl" KeyPath="yes" DiskId="1"/>
-                                                       <Registry Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls" Name="AFS Server CPL" Type="string" Value="[#fileafsserver_CPL]" Id="reg_Server30" />
-                                                       </Component>
-
-                            <Component Id="cmp_Server_Program" Guid="8C4D0351-8EBF-4192-BF63-DCB3AADF4115" KeyPath="yes">
-                                <CreateFolder />
-                                <CreateFolder Directory="dirlog" />
-                                <CreateFolder Directory="diretc" />
-                                <CreateFolder Directory="dirlocal" />
-                            </Component>
-                            
-                        <?ifdef DebugSyms?>
-                            <Component Win64="$(var.Win64)" Id="cmp_Server_Program_Debug" Guid="$(var.cmp_Server_Program_Debug_guid)">
-                                <File Id="filevlserver_PDB" Name="vlser.pdb" LongName="vlserver.pdb" DiskId="1" />
-                                <File Id="filevolinfo_PDB" Name="volin.pdb" LongName="volinfo.pdb" DiskId="1" />
-                                <File Id="filevolserver_PDB" Name="volse.pdb" LongName="volserver.pdb" DiskId="1" />
-                                <File Id="fileafskill_PDB" Name="afski.pdb" LongName="afskill.pdb" DiskId="1" />
-                                <File Id="fileafssvrcfg_PDB" Name="afssv.pdb" LongName="afssvrcfg.pdb" DiskId="1" />
-                               <?if $(env.CPU) = "i386"?>
-                                       <File Id="fileasetkey_PDB" Name="asetk.pdb" LongName="asetkey.pdb" DiskId="1" />
-                               <?endif?>
-                                <File Id="filebosctlsvc_PDB" Name="bosct.pdb" LongName="bosctlsvc.pdb" DiskId="1" />
-                                <File Id="filebosserver_PDB" Name="bosse.pdb" LongName="bosserver.pdb" DiskId="1" />
-                                <File Id="filebuserver_PDB" Name="buser.pdb" LongName="buserver.pdb" DiskId="1" />
-                                <File Id="filefileserver_PDB" Name="files.pdb" LongName="fileserver.pdb" DiskId="1" />
-                                <File Id="filefms_PDB" Name="fms.pdb" LongName="fms.pdb" DiskId="1" src="$(var.EtcDir)\fms.pdb"/>
-                                <File Id="filebutc_PDB" Name="butc.pdb" LongName="butc.pdb" DiskId="1" src="$(var.EtcDir)\butc.pdb"/>
-                                <File Id="filekaserver_PDB" Name="kaser.pdb" LongName="kaserver.pdb" DiskId="1" />
-                                <File Id="fileptserver_PDB" Name="ptser.pdb" LongName="ptserver.pdb" DiskId="1" />
-                                <File Id="filesalvager_PDB" Name="salva.pdb" LongName="salvager.pdb" DiskId="1" />
-                                <File Id="fileupclient_PDB" Name="upcli.pdb" LongName="upclient.pdb" DiskId="1" />
-                                <File Id="fileupserver_PDB" Name="upser.pdb" LongName="upserver.pdb" DiskId="1" />
-                                                               <File Id="fileafsserver_PDB" Name="afsserve.pdb" LongName="afsserver.pdb" KeyPath="yes" DiskId="1"/>
-                            </Component>
-                        <?endif?>
-                        
+                            <?endif?>
                         </Directory>
-                        <Directory Id="dirlog" Name="log" />
-                        <Directory Id="diretc" Name="etc" />
-                        <Directory Id="dirlocal" Name="local" />
                     </Directory>
-                </Directory>
-            </Directory> <!-- Server -->
+            </Directory> <!-- SDK -->
   <?endif?>
 
         </Directory> <!-- AFS -->
   <?ifndef BinsOnly ?>
     <!-- References -->
     <Directory Id="ProgramMenuFolder" Name=".">
-        <Directory Id="dirShortCut" Name="OpenAFS"/>
+        <Directory Id="dirShortCut" Name="OpenAFS">
+            <Directory Id="dirShortCutDocs" Name="Docs" LongName="Documentation" />
+        </Directory>
     </Directory>
     <Directory Id="StartupFolder" Name="." />
     <Directory Id="WindowsVolume" Name="." />
        <!-- Shared assembly runtime for VS 2005 -->
        <?if $(env.AFSVER_CL) = "1400"?>
                <?ifdef env.CommonProgramFiles6432?>
-                 <?define CPF="$(env.CommonProgramFiles)"?>
+                 <?define CPF="$(env.CommonProgramFiles(x86)"?>
                <?else?>
-                 <?define CPF="$(env.CommonProgramFiles(x86))"?>
+                 <?define CPF="$(env.CommonProgramFiles)"?>
                <?endif?>
+
                <?if $(var.Platform) = "x64" ?>
                        <?ifndef Debug?>
                                <Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm"/>
                                <Merge Id="MSVCRT8PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_8_0_Microsoft_VC80_MFCLOC_x86.msm"/>
                        <?endif?>
                <?endif?>
+
+    <?elseif $(env.AFSVER_CL) = "1500"?>
+
+               <?ifdef env.CommonProgramFiles6432?>
+                 <?define CPF="$(env.CommonProgramFiles(x86)"?>
+               <?else?>
+                 <?define CPF="$(env.CommonProgramFiles)"?>
+               <?endif?>
+
+               <?if $(var.Platform) = "x64" ?>
+                       <?ifndef Debug?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                       <?else?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm"/>
+                       <?endif?>
+               <?else?>
+                       <?ifndef Debug?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_CRT_x86.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFC_x86.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+                       <?else?>
+                               <Merge Id="MSVCRT9MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugCRT_x86.msm"/>
+                               <Merge Id="MSVCRT9POL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"/>
+                               <Merge Id="MSVCRT9MFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_DebugMFC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFC" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_DebugMFC_x86.msm"/>
+                               <Merge Id="MSVCRT9MFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC90_MFCLOC_x86.msm"/>
+                               <Merge Id="MSVCRT9PFL" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm"/>
+                       <?endif?>
+               <?endif?>
+
        <?endif?>
 </Include>