Merge from 2.2

diff --git a/docs/Registry/WinXP_SignOrSeal.reg b/docs/Registry/WinXP_SignOrSeal.reg
index 18690ae66197c8a9d2464f04c06cae73272e4299..f6f4b4cd91c658c070a1960da01f3e219fe259dd 100644 (file)
--- a/docs/Registry/WinXP_SignOrSeal.reg
+++ b/docs/Registry/WinXP_SignOrSeal.reg
@@ -1,9 +1,11 @@
-REGEDIT4
-
-;
-; This registry key (gathered from the Samba-tng lists) is needed
-; for a Windows XP client to join and logon to a Samba domain
-;
-
-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\netlogon\parameters
-"RequireSignOrSeal"=dword:00000000 
+Windows Registry Editor Version 5.00\r
+\r
+;\r
+; This registry key is needed for a Windows XP Client to join\r
+; and logon to a Samba domain. Note: Samba 2.2.3a contained \r
+; this key in a broken format which did nothing to the registry - \r
+; however XP reported "registry key imported". If in doubt\r
+; check the key by hand with regedit.\r
+\r
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters]\r
+"requiresignorseal"=dword:00000000\r