[PATCHES] some cleanup to loadparm

Michael Adam obnox at samba.org
Wed Jul 22 08:14:36 UTC 2015


Hi,

some time ago, I started to work on cleaning up
our (two) loadparm(s) as a side project. The main
goal is to ultimately have all code that holds the
data structures auto-generated (from the docs),
especially param_table.c.

I am getting closer, so here is a first set of preparatory
patches.  One aspect is to prepare the headers in the xml docs
to contain the necessary items that are reflected in the
param-table. This first patchset contains the easy ones.
This patchset is only big because it also contains a patch
that makes formatting of the metadata headers in the
docs-xml/smbdotconf/ file uniform, making them much easier
to read (imho). See with git show -w that this patch has
no non-whitespace change (only a few line breaks visible).

Following patchsets will remove special treatments of
several parameters (from the infamous
EXTRA_LOCALS/GLOBALS...), add more flags to the docs
and finally autogenerate the param_table.c.

Review appreciated,

Cheers - Michael

-------------- next part --------------
From cc84dd6e8d3b18e150d57295783acd1596c70389 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 21 Jul 2015 08:23:21 +0200
Subject: [PATCH 01/12] param: make set_variable() static.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 lib/param/loadparm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 06a9e59..95e8438 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1555,7 +1555,8 @@ static bool set_variable_helper(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr
 
 }
 
-bool set_variable(TALLOC_CTX *mem_ctx, struct loadparm_service *service, int parmnum, void *parm_ptr,
+static bool set_variable(TALLOC_CTX *mem_ctx, struct loadparm_service *service,
+			 int parmnum, void *parm_ptr,
 			 const char *pszParmName, const char *pszParmValue,
 			 struct loadparm_context *lp_ctx, bool on_globals)
 {
-- 
2.4.3


From 40dbd1f941d78912dbb724a3ca11c5d629e0ae80 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 8 Jul 2015 18:23:28 +0200
Subject: [PATCH 02/12] param: accompany FN_LOCAL_PARM_CHAR with FN_LOCAL_CHAR

just like with the other FN_LOCAL_PARM macros.
FN_LOCAL_CHAR is the main definition.

This is also in preparation of a possible future
removal of the _PARM variants (when snum is no
longer used...).

Signed-off-by: Michael Adam <obnox at samba.org>
---
 lib/param/loadparm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 95e8438..3d96bff 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -209,12 +209,14 @@ static struct loadparm_context *global_loadparm_context;
 
 #define FN_LOCAL_PARM_INTEGER(fn_name, val) FN_LOCAL_INTEGER(fn_name, val)
 
-#define FN_LOCAL_PARM_CHAR(fn_name,val) \
+#define FN_LOCAL_CHAR(fn_name,val) \
  _PUBLIC_ char lpcfg_ ## fn_name(struct loadparm_service *service, \
 				struct loadparm_service *sDefault) {	\
 	 return((service != NULL)? service->val : sDefault->val); \
  }
 
+#define FN_LOCAL_PARM_CHAR(fn_name,val) FN_LOCAL_CHAR(fn_name, val)
+
 #include "lib/param/param_functions.c"
 
 /* These functions cannot be auto-generated */
-- 
2.4.3


From bd413f1f88e71a69f4a0e79e81528111abbfb83f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 21 Jul 2015 09:10:34 +0200
Subject: [PATCH 03/12] s3:lib: remove unused dummyparam.c

Signed-off-by: Michael Adam <obnox at samba.org>
---
 source3/lib/dummyparam.c | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 source3/lib/dummyparam.c

diff --git a/source3/lib/dummyparam.c b/source3/lib/dummyparam.c
deleted file mode 100644
index 91dda65..0000000
--- a/source3/lib/dummyparam.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   RPC pipe client
-
-   Copyright (C) Gerald (Jerry) Carter          2004.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* Stupid dummy functions required due to the horrible dependency mess
-   in Samba. */
-
-#include "includes.h"
-
-int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out)
-{
-	return -1;
-}
-
-- 
2.4.3


From f698fa92536e2a637c7b1506562c57f4e12b8948 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 30 Apr 2015 23:32:45 +0200
Subject: [PATCH 04/12] docs:smbdotconf: make formatting of headers uniform.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/base/bindinterfacesonly.xml             |  2 +-
 docs-xml/smbdotconf/base/comment.xml                        |  2 +-
 docs-xml/smbdotconf/base/configbackend.xml                  |  2 +-
 docs-xml/smbdotconf/base/doscharset.xml                     |  4 ++--
 docs-xml/smbdotconf/base/interfaces.xml                     |  2 +-
 docs-xml/smbdotconf/base/multicastdnsregister.xml           |  2 +-
 docs-xml/smbdotconf/base/netbiosaliases.xml                 |  2 +-
 docs-xml/smbdotconf/base/netbiosscope.xml                   |  2 +-
 docs-xml/smbdotconf/base/realm.xml                          |  2 +-
 docs-xml/smbdotconf/base/sharebackend.xml                   |  2 +-
 docs-xml/smbdotconf/base/unixcharset.xml                    |  4 ++--
 docs-xml/smbdotconf/base/workgroup.xml                      |  2 +-
 docs-xml/smbdotconf/browse/browseable.xml                   |  4 +++-
 docs-xml/smbdotconf/browse/browselist.xml                   |  2 +-
 docs-xml/smbdotconf/browse/domainmaster.xml                 |  2 +-
 docs-xml/smbdotconf/browse/enhancedbrowsing.xml             |  2 +-
 docs-xml/smbdotconf/browse/lmannounce.xml                   |  2 +-
 docs-xml/smbdotconf/browse/lminterval.xml                   |  2 +-
 docs-xml/smbdotconf/browse/oslevel.xml                      |  2 +-
 docs-xml/smbdotconf/browse/preferredmaster.xml              |  2 +-
 docs-xml/smbdotconf/domain/machinepasswordtimeout.xml       |  2 +-
 docs-xml/smbdotconf/filename/casesensitive.xml              |  2 +-
 docs-xml/smbdotconf/filename/defaultcase.xml                |  5 +++--
 docs-xml/smbdotconf/filename/deletevetofiles.xml            |  2 +-
 docs-xml/smbdotconf/filename/hidedotfiles.xml               |  2 +-
 docs-xml/smbdotconf/filename/hidespecialfiles.xml           |  2 +-
 docs-xml/smbdotconf/filename/hideunreadable.xml             |  2 +-
 docs-xml/smbdotconf/filename/hideunwriteablefiles.xml       |  2 +-
 docs-xml/smbdotconf/filename/manglednames.xml               |  2 +-
 docs-xml/smbdotconf/filename/mangleprefix.xml               |  2 +-
 docs-xml/smbdotconf/filename/manglingchar.xml               |  2 +-
 docs-xml/smbdotconf/filename/manglingmethod.xml             |  4 ++--
 docs-xml/smbdotconf/filename/maparchive.xml                 |  4 ++--
 docs-xml/smbdotconf/filename/maphidden.xml                  |  2 +-
 docs-xml/smbdotconf/filename/mapreadonly.xml                |  2 +-
 docs-xml/smbdotconf/filename/mapsystem.xml                  |  2 +-
 docs-xml/smbdotconf/filename/maxstatcachesize.xml           |  2 +-
 docs-xml/smbdotconf/filename/preservecase.xml               |  2 +-
 docs-xml/smbdotconf/filename/shortpreservecase.xml          |  2 +-
 docs-xml/smbdotconf/filename/statcache.xml                  |  2 +-
 docs-xml/smbdotconf/filename/storedosattributes.xml         |  2 +-
 docs-xml/smbdotconf/filename/vetofiles.xml                  |  2 +-
 docs-xml/smbdotconf/filename/vetooplockfiles.xml            |  2 +-
 docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml         |  2 +-
 docs-xml/smbdotconf/ldap/ldapadmindn.xml                    |  4 ++--
 docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml          |  6 +++---
 docs-xml/smbdotconf/ldap/ldapdeletedn.xml                   |  2 +-
 docs-xml/smbdotconf/ldap/ldapderef.xml                      |  6 ++++--
 docs-xml/smbdotconf/ldap/ldapfollowreferral.xml             |  6 ++++--
 docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml                |  2 +-
 docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml                |  2 +-
 docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml              |  6 +++---
 docs-xml/smbdotconf/ldap/ldappagesize.xml                   |  6 +++---
 docs-xml/smbdotconf/ldap/ldappasswdsync.xml                 |  6 +++---
 docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml           |  2 +-
 docs-xml/smbdotconf/ldap/ldapsameditposix.xml               |  4 ++--
 docs-xml/smbdotconf/ldap/ldapsamtrusted.xml                 |  4 ++--
 docs-xml/smbdotconf/ldap/ldapssl.xml                        |  2 +-
 docs-xml/smbdotconf/ldap/ldapsslads.xml                     |  6 +++---
 docs-xml/smbdotconf/ldap/ldapsuffix.xml                     |  2 +-
 docs-xml/smbdotconf/ldap/ldaptimeout.xml                    |  2 +-
 docs-xml/smbdotconf/ldap/ldapusersuffix.xml                 |  6 +++---
 docs-xml/smbdotconf/locking/blockinglocks.xml               |  2 +-
 docs-xml/smbdotconf/locking/cscpolicy.xml                   |  2 +-
 docs-xml/smbdotconf/locking/fakeoplocks.xml                 |  2 +-
 docs-xml/smbdotconf/locking/kerneloplocks.xml               |  4 ++--
 docs-xml/smbdotconf/locking/kernelsharemodes.xml            |  4 ++--
 docs-xml/smbdotconf/locking/level2oplocks.xml               |  2 +-
 docs-xml/smbdotconf/locking/locking.xml                     |  2 +-
 docs-xml/smbdotconf/locking/lockspintime.xml                |  2 +-
 docs-xml/smbdotconf/locking/oplockbreakwaittime.xml         |  2 +-
 docs-xml/smbdotconf/locking/oplockcontentionlimit.xml       |  2 +-
 docs-xml/smbdotconf/locking/oplocks.xml                     |  2 +-
 docs-xml/smbdotconf/locking/posixlocking.xml                |  2 +-
 docs-xml/smbdotconf/locking/smb2leases.xml                  |  2 +-
 docs-xml/smbdotconf/locking/strictlocking.xml               |  2 +-
 docs-xml/smbdotconf/logging/debugclass.xml                  |  2 +-
 docs-xml/smbdotconf/logging/debughirestimestamp.xml         |  2 +-
 docs-xml/smbdotconf/logging/debugpid.xml                    |  2 +-
 docs-xml/smbdotconf/logging/debugprefixtimestamp.xml        |  2 +-
 docs-xml/smbdotconf/logging/debugtimestamp.xml              |  2 +-
 docs-xml/smbdotconf/logging/debuguid.xml                    |  2 +-
 docs-xml/smbdotconf/logging/ldapdebuglevel.xml              |  6 +++---
 docs-xml/smbdotconf/logging/ldapdebugthreshold.xml          |  6 +++---
 docs-xml/smbdotconf/logging/logfile.xml                     |  2 +-
 docs-xml/smbdotconf/logging/logging.xml                     |  6 +++---
 docs-xml/smbdotconf/logging/loglevel.xml                    |  2 +-
 docs-xml/smbdotconf/logging/maxlogsize.xml                  |  2 +-
 docs-xml/smbdotconf/logging/syslog.xml                      |  2 +-
 docs-xml/smbdotconf/logging/syslogonly.xml                  |  2 +-
 docs-xml/smbdotconf/logon/domainlogons.xml                  |  2 +-
 docs-xml/smbdotconf/misc/addsharecommand.xml                |  2 +-
 docs-xml/smbdotconf/misc/afsshare.xml                       |  6 +++---
 docs-xml/smbdotconf/misc/afsusernamemap.xml                 |  2 +-
 docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml         |  6 +++---
 docs-xml/smbdotconf/misc/asyncsmbechohandler.xml            |  2 +-
 docs-xml/smbdotconf/misc/available.xml                      |  6 +++---
 docs-xml/smbdotconf/misc/cachedirectory.xml                 |  4 ++--
 docs-xml/smbdotconf/misc/changenotify.xml                   |  2 +-
 docs-xml/smbdotconf/misc/changesharecommand.xml             |  2 +-
 docs-xml/smbdotconf/misc/clusteraddresses.xml               |  6 +++---
 docs-xml/smbdotconf/misc/clustering.xml                     |  2 +-
 docs-xml/smbdotconf/misc/configfile.xml                     |  2 +-
 docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml      |  2 +-
 docs-xml/smbdotconf/misc/ctdbtimeout.xml                    |  2 +-
 docs-xml/smbdotconf/misc/defaultservice.xml                 |  2 +-
 docs-xml/smbdotconf/misc/deletereadonly.xml                 |  6 +++---
 docs-xml/smbdotconf/misc/deletesharecommand.xml             |  2 +-
 docs-xml/smbdotconf/misc/dfreecachetime.xml                 |  6 +++---
 docs-xml/smbdotconf/misc/directorynamecachesize.xml         |  6 +++---
 docs-xml/smbdotconf/misc/dmapisupport.xml                   |  2 +-
 docs-xml/smbdotconf/misc/dontdescend.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/dosfilemode.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/dosfiletimeresolution.xml          |  6 +++---
 docs-xml/smbdotconf/misc/dosfiletimes.xml                   |  6 +++---
 docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml       |  6 +++---
 docs-xml/smbdotconf/misc/followsymlinks.xml                 |  6 +++---
 docs-xml/smbdotconf/misc/fssprunestale.xml                  |  2 +-
 docs-xml/smbdotconf/misc/fsssequencetimeout.xml             |  2 +-
 docs-xml/smbdotconf/misc/fstype.xml                         |  6 +++---
 docs-xml/smbdotconf/misc/homedirmap.xml                     |  6 +++---
 docs-xml/smbdotconf/misc/include.xml                        |  6 +++---
 docs-xml/smbdotconf/misc/kernelchangenotify.xml             |  2 +-
 docs-xml/smbdotconf/misc/lockdirectory.xml                  |  2 +-
 docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml        |  6 +++---
 docs-xml/smbdotconf/misc/magicoutput.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/magicscript.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/messagecommand.xml                 |  6 +++---
 docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml         |  6 +++---
 docs-xml/smbdotconf/misc/ncalrpcdir.xml                     |  6 +++---
 docs-xml/smbdotconf/misc/nishomedir.xml                     |  6 +++---
 docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml      |  6 +++---
 docs-xml/smbdotconf/misc/panicaction.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/perfcountmodule.xml                |  6 +++---
 docs-xml/smbdotconf/misc/piddirectory.xml                   |  2 +-
 docs-xml/smbdotconf/misc/postexec.xml                       |  6 +++---
 docs-xml/smbdotconf/misc/preexec.xml                        |  8 ++++----
 docs-xml/smbdotconf/misc/preload.xml                        |  2 +-
 docs-xml/smbdotconf/misc/registryshares.xml                 |  2 +-
 docs-xml/smbdotconf/misc/remoteannounce.xml                 |  6 +++---
 docs-xml/smbdotconf/misc/remotebrowsesync.xml               |  6 +++---
 docs-xml/smbdotconf/misc/resetonzerovc.xml                  |  6 +++---
 docs-xml/smbdotconf/misc/rootpostexec.xml                   |  6 +++---
 docs-xml/smbdotconf/misc/rootpreexec.xml                    |  6 +++---
 docs-xml/smbdotconf/misc/rootpreexecclose.xml               |  6 +++---
 docs-xml/smbdotconf/misc/rpcdaemon.xml                      |  2 +-
 docs-xml/smbdotconf/misc/rpcserver.xml                      |  2 +-
 docs-xml/smbdotconf/misc/smbdprofilinglevel.xml             |  6 +++---
 docs-xml/smbdotconf/misc/statedirectory.xml                 |  4 ++--
 docs-xml/smbdotconf/misc/usershareallowguests.xml           |  6 +++---
 docs-xml/smbdotconf/misc/usersharemaxshares.xml             |  6 +++---
 docs-xml/smbdotconf/misc/usershareowneronly.xml             |  6 +++---
 docs-xml/smbdotconf/misc/usersharepath.xml                  |  6 +++---
 docs-xml/smbdotconf/misc/usershareprefixallowlist.xml       |  6 +++---
 docs-xml/smbdotconf/misc/usershareprefixdenylist.xml        |  6 +++---
 docs-xml/smbdotconf/misc/usersharetemplateshare.xml         |  6 +++---
 docs-xml/smbdotconf/misc/utmpdirectory.xml                  |  2 +-
 docs-xml/smbdotconf/misc/valid.xml                          |  6 +++---
 docs-xml/smbdotconf/misc/volume.xml                         |  6 +++---
 docs-xml/smbdotconf/misc/widelinks.xml                      |  6 +++---
 docs-xml/smbdotconf/misc/wtmpdirectory.xml                  |  2 +-
 docs-xml/smbdotconf/printing/addportcommand.xml             |  2 +-
 docs-xml/smbdotconf/printing/addprintercommand.xml          |  2 +-
 docs-xml/smbdotconf/printing/cupsencrypt.xml                |  6 +++---
 docs-xml/smbdotconf/printing/cupsoptions.xml                |  2 +-
 docs-xml/smbdotconf/printing/cupsserver.xml                 |  2 +-
 docs-xml/smbdotconf/printing/defaultdevmode.xml             |  2 +-
 docs-xml/smbdotconf/printing/deleteprintercommand.xml       |  2 +-
 docs-xml/smbdotconf/printing/disablespoolss.xml             |  2 +-
 docs-xml/smbdotconf/printing/enablespoolss.xml              |  2 +-
 docs-xml/smbdotconf/printing/enumportscommand.xml           |  2 +-
 docs-xml/smbdotconf/printing/forceprintername.xml           |  2 +-
 docs-xml/smbdotconf/printing/iprintserver.xml               |  2 +-
 docs-xml/smbdotconf/printing/loadprinters.xml               |  2 +-
 docs-xml/smbdotconf/printing/lppausecommand.xml             |  2 +-
 docs-xml/smbdotconf/printing/lpqcachetime.xml               |  6 +++---
 docs-xml/smbdotconf/printing/lpqcommand.xml                 |  2 +-
 docs-xml/smbdotconf/printing/lpresumecommand.xml            |  2 +-
 docs-xml/smbdotconf/printing/lprmcommand.xml                |  2 +-
 docs-xml/smbdotconf/printing/maxprintjobs.xml               |  2 +-
 docs-xml/smbdotconf/printing/maxreportedprintjobs.xml       |  2 +-
 docs-xml/smbdotconf/printing/os2drivermap.xml               |  2 +-
 docs-xml/smbdotconf/printing/printable.xml                  |  2 +-
 docs-xml/smbdotconf/printing/printcapcachetime.xml          |  4 ++--
 docs-xml/smbdotconf/printing/printcapname.xml               |  4 ++--
 docs-xml/smbdotconf/printing/printcommand.xml               |  2 +-
 docs-xml/smbdotconf/printing/printername.xml                |  2 +-
 docs-xml/smbdotconf/printing/printing.xml                   |  2 +-
 docs-xml/smbdotconf/printing/printjobusername.xml           |  2 +-
 docs-xml/smbdotconf/printing/printnotifybackchannel.xml     |  6 +++---
 docs-xml/smbdotconf/printing/queuepausecommand.xml          |  2 +-
 docs-xml/smbdotconf/printing/queueresumecommand.xml         |  2 +-
 docs-xml/smbdotconf/printing/showaddprinterwizard.xml       |  2 +-
 docs-xml/smbdotconf/printing/spoolssarchitecture.xml        |  6 +++---
 docs-xml/smbdotconf/printing/spoolssosversion.xml           |  6 +++---
 docs-xml/smbdotconf/printing/useclientdriver.xml            |  2 +-
 docs-xml/smbdotconf/protocol/aclcheckpermissions.xml        |  2 +-
 docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml          |  6 +++---
 docs-xml/smbdotconf/protocol/cldapport.xml                  |  2 +-
 docs-xml/smbdotconf/protocol/clientmaxprotocol.xml          |  8 ++++----
 docs-xml/smbdotconf/protocol/clientminprotocol.xml          |  6 +++---
 docs-xml/smbdotconf/protocol/clientusespnego.xml            |  2 +-
 docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml      |  2 +-
 docs-xml/smbdotconf/protocol/defersharingviolations.xml     |  2 +-
 docs-xml/smbdotconf/protocol/dgramport.xml                  |  2 +-
 docs-xml/smbdotconf/protocol/disablenetbios.xml             |  2 +-
 docs-xml/smbdotconf/protocol/easupport.xml                  |  2 +-
 docs-xml/smbdotconf/protocol/enableasusupport.xml           |  6 +++---
 docs-xml/smbdotconf/protocol/eventloglist.xml               |  2 +-
 docs-xml/smbdotconf/protocol/largereadwrite.xml             |  2 +-
 docs-xml/smbdotconf/protocol/mapaclinherit.xml              |  2 +-
 docs-xml/smbdotconf/protocol/maxmux.xml                     |  2 +-
 docs-xml/smbdotconf/protocol/maxttl.xml                     |  2 +-
 docs-xml/smbdotconf/protocol/maxwinsttl.xml                 |  2 +-
 docs-xml/smbdotconf/protocol/maxxmit.xml                    |  2 +-
 docs-xml/smbdotconf/protocol/minreceivefilesize.xml         |  6 +++---
 docs-xml/smbdotconf/protocol/minwinsttl.xml                 |  2 +-
 docs-xml/smbdotconf/protocol/nameresolveorder.xml           |  2 +-
 docs-xml/smbdotconf/protocol/nbtport.xml                    |  2 +-
 docs-xml/smbdotconf/protocol/ntaclsupport.xml               |  2 +-
 docs-xml/smbdotconf/protocol/ntpipesupport.xml              |  2 +-
 docs-xml/smbdotconf/protocol/ntstatussupport.xml            |  2 +-
 docs-xml/smbdotconf/protocol/profileacls.xml                |  2 +-
 docs-xml/smbdotconf/protocol/readraw.xml                    |  2 +-
 docs-xml/smbdotconf/protocol/rpcbigendian.xml               |  2 +-
 docs-xml/smbdotconf/protocol/servermaxprotocol.xml          |  6 +++---
 docs-xml/smbdotconf/protocol/serverminprotocol.xml          |  6 +++---
 docs-xml/smbdotconf/protocol/sharefakefscaps.xml            |  4 ++--
 docs-xml/smbdotconf/protocol/smb2maxcredits.xml             |  6 +++---
 docs-xml/smbdotconf/protocol/smb2maxread.xml                |  6 +++---
 docs-xml/smbdotconf/protocol/smb2maxtrans.xml               |  6 +++---
 docs-xml/smbdotconf/protocol/smb2maxwrite.xml               |  6 +++---
 docs-xml/smbdotconf/protocol/smbports.xml                   |  3 ++-
 docs-xml/smbdotconf/protocol/svcctllist.xml                 |  2 +-
 docs-xml/smbdotconf/protocol/timeserver.xml                 |  2 +-
 docs-xml/smbdotconf/protocol/unicode.xml                    |  2 +-
 docs-xml/smbdotconf/protocol/unixextensions.xml             |  2 +-
 docs-xml/smbdotconf/protocol/usespnego.xml                  |  2 +-
 docs-xml/smbdotconf/protocol/webport.xml                    |  2 +-
 docs-xml/smbdotconf/protocol/writeraw.xml                   |  2 +-
 docs-xml/smbdotconf/security/accessbasedshareenum.xml       |  4 ++--
 docs-xml/smbdotconf/security/aclgroupcontrol.xml            |  2 +-
 docs-xml/smbdotconf/security/adminusers.xml                 |  2 +-
 docs-xml/smbdotconf/security/algorithmicridbase.xml         |  4 ++--
 docs-xml/smbdotconf/security/allowtrusteddomains.xml        |  4 ++--
 docs-xml/smbdotconf/security/authmethods.xml                |  4 ++--
 docs-xml/smbdotconf/security/checkpasswordscript.xml        |  2 +-
 docs-xml/smbdotconf/security/clientlanmanauth.xml           |  2 +-
 docs-xml/smbdotconf/security/clientntlmv2auth.xml           |  2 +-
 docs-xml/smbdotconf/security/clientplaintextauth.xml        |  4 ++--
 docs-xml/smbdotconf/security/clientschannel.xml             |  4 ++--
 docs-xml/smbdotconf/security/clientsigning.xml              |  4 ++--
 docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml   |  2 +-
 docs-xml/smbdotconf/security/createmask.xml                 |  2 +-
 docs-xml/smbdotconf/security/dedicatedkeytabfile.xml        |  4 +++-
 docs-xml/smbdotconf/security/directorymask.xml              |  4 ++--
 docs-xml/smbdotconf/security/directorysecuritymask.xml      |  8 ++++----
 docs-xml/smbdotconf/security/encryptpasswords.xml           |  4 ++--
 docs-xml/smbdotconf/security/forcedirectorymode.xml         |  2 +-
 docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml |  8 ++++----
 docs-xml/smbdotconf/security/forcegroup.xml                 |  2 +-
 docs-xml/smbdotconf/security/forceunknownacluser.xml        |  2 +-
 docs-xml/smbdotconf/security/forceuser.xml                  |  2 +-
 docs-xml/smbdotconf/security/guestaccount.xml               |  4 ++--
 docs-xml/smbdotconf/security/guestok.xml                    |  4 ++--
 docs-xml/smbdotconf/security/guestonly.xml                  |  2 +-
 docs-xml/smbdotconf/security/hostsallow.xml                 |  2 +-
 docs-xml/smbdotconf/security/hostsdeny.xml                  |  2 +-
 docs-xml/smbdotconf/security/inheritacls.xml                |  2 +-
 docs-xml/smbdotconf/security/inheritowner.xml               |  2 +-
 docs-xml/smbdotconf/security/inheritpermissions.xml         |  2 +-
 docs-xml/smbdotconf/security/invalidusers.xml               |  2 +-
 docs-xml/smbdotconf/security/kerberosmethod.xml             |  4 +++-
 docs-xml/smbdotconf/security/kpasswdport.xml                |  2 +-
 docs-xml/smbdotconf/security/krb5port.xml                   |  2 +-
 docs-xml/smbdotconf/security/lanmanauth.xml                 |  2 +-
 docs-xml/smbdotconf/security/maptoguest.xml                 |  4 ++--
 docs-xml/smbdotconf/security/mapuntrustedtodomain.xml       |  4 ++--
 docs-xml/smbdotconf/security/ntlmauth.xml                   |  2 +-
 docs-xml/smbdotconf/security/nullpasswords.xml              |  4 ++--
 docs-xml/smbdotconf/security/obeypamrestrictions.xml        |  4 ++--
 docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml   |  4 ++--
 docs-xml/smbdotconf/security/onlyuser.xml                   |  2 +-
 docs-xml/smbdotconf/security/pampasswordchange.xml          |  4 ++--
 docs-xml/smbdotconf/security/passdbbackend.xml              |  4 ++--
 docs-xml/smbdotconf/security/passdbexpandexplicit.xml       |  4 ++--
 docs-xml/smbdotconf/security/passwdchatdebug.xml            |  2 +-
 docs-xml/smbdotconf/security/passwdchattimeout.xml          |  2 +-
 docs-xml/smbdotconf/security/passwdprogram.xml              |  4 ++--
 docs-xml/smbdotconf/security/passwordserver.xml             |  4 ++--
 docs-xml/smbdotconf/security/preloadmodules.xml             |  6 +++---
 docs-xml/smbdotconf/security/privatedir.xml                 |  4 ++--
 docs-xml/smbdotconf/security/readlist.xml                   |  2 +-
 docs-xml/smbdotconf/security/readonly.xml                   |  2 +-
 docs-xml/smbdotconf/security/renameuserscript.xml           |  4 ++--
 docs-xml/smbdotconf/security/restrictanonymous.xml          |  2 +-
 docs-xml/smbdotconf/security/rootdirectory.xml              |  6 +++---
 docs-xml/smbdotconf/security/security.xml                   | 10 +++++-----
 docs-xml/smbdotconf/security/serverrole.xml                 |  4 ++--
 docs-xml/smbdotconf/security/serverschannel.xml             |  4 ++--
 docs-xml/smbdotconf/security/serversigning.xml              |  4 ++--
 docs-xml/smbdotconf/security/smbencrypt.xml                 |  4 ++--
 docs-xml/smbdotconf/security/smbpasswdfile.xml              |  4 ++--
 docs-xml/smbdotconf/security/unixpasswordsync.xml           |  2 +-
 docs-xml/smbdotconf/security/username.xml                   |  4 ++--
 docs-xml/smbdotconf/security/usernamelevel.xml              |  2 +-
 docs-xml/smbdotconf/security/usernamemap.xml                |  2 +-
 docs-xml/smbdotconf/security/usernamemapcachetime.xml       |  2 +-
 docs-xml/smbdotconf/security/usernamemapscript.xml          |  2 +-
 docs-xml/smbdotconf/security/validusers.xml                 |  2 +-
 docs-xml/smbdotconf/security/writeable.xml                  |  2 +-
 docs-xml/smbdotconf/security/writelist.xml                  |  2 +-
 docs-xml/smbdotconf/winbind/createkrb5conf.xml              |  4 ++--
 docs-xml/smbdotconf/winbind/idmapbackend.xml                |  2 +-
 docs-xml/smbdotconf/winbind/idmapcachetime.xml              |  2 +-
 docs-xml/smbdotconf/winbind/idmapgid.xml                    |  4 ++--
 docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml      |  2 +-
 docs-xml/smbdotconf/winbind/idmapuid.xml                    |  2 +-
 docs-xml/smbdotconf/winbind/templatehomedir.xml             |  2 +-
 docs-xml/smbdotconf/winbind/templateshell.xml               |  2 +-
 docs-xml/smbdotconf/winbind/winbindcachetime.xml            |  2 +-
 docs-xml/smbdotconf/winbind/winbindenumgroups.xml           |  2 +-
 docs-xml/smbdotconf/winbind/winbindexpandgroups.xml         |  2 +-
 docs-xml/smbdotconf/winbind/winbindmaxclients.xml           |  2 +-
 docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml |  6 +++---
 docs-xml/smbdotconf/winbind/winbindnestedgroups.xml         |  2 +-
 docs-xml/smbdotconf/winbind/winbindnormalizenames.xml       |  2 +-
 docs-xml/smbdotconf/winbind/winbindnssinfo.xml              |  2 +-
 docs-xml/smbdotconf/winbind/winbindofflinelogon.xml         |  2 +-
 docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml       |  2 +-
 docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml       |  2 +-
 docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml       |  2 +-
 docs-xml/smbdotconf/winbind/winbindrpconly.xml              |  4 ++--
 docs-xml/smbdotconf/winbind/winbindseparator.xml            |  2 +-
 docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml   |  2 +-
 docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml     |  2 +-
 docs-xml/smbdotconf/wins/dnsproxy.xml                       |  2 +-
 337 files changed, 556 insertions(+), 544 deletions(-)

diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index 31b462c..9a148f3 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="bind interfaces only"
-				type="boolean"
+                 type="boolean"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/comment.xml b/docs-xml/smbdotconf/base/comment.xml
index 3c2c3b1..b0dd91c 100644
--- a/docs-xml/smbdotconf/base/comment.xml
+++ b/docs-xml/smbdotconf/base/comment.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="comment"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a text field that is seen next to a share 
diff --git a/docs-xml/smbdotconf/base/configbackend.xml b/docs-xml/smbdotconf/base/configbackend.xml
index 864ec3c..35379ed 100644
--- a/docs-xml/smbdotconf/base/configbackend.xml
+++ b/docs-xml/smbdotconf/base/configbackend.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="config backend"
                  context="G"
-				 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/base/doscharset.xml b/docs-xml/smbdotconf/base/doscharset.xml
index 8a18c93..e0939d2 100644
--- a/docs-xml/smbdotconf/base/doscharset.xml
+++ b/docs-xml/smbdotconf/base/doscharset.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="dos charset"
-				 type="string"
+                 type="string"
                  context="G"
                  constant="1"
-				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>DOS SMB clients assume the server has 
 	the same charset as they do. This option specifies which 
diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index 39c90b9..ba36cc4 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="interfaces"
                  context="G"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>This option allows you to override the default 
diff --git a/docs-xml/smbdotconf/base/multicastdnsregister.xml b/docs-xml/smbdotconf/base/multicastdnsregister.xml
index 87559e5..2c330ab 100644
--- a/docs-xml/smbdotconf/base/multicastdnsregister.xml
+++ b/docs-xml/smbdotconf/base/multicastdnsregister.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="multicast dns register"
-				type="boolean"
+                 type="boolean"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/netbiosaliases.xml b/docs-xml/smbdotconf/base/netbiosaliases.xml
index 46f97e2..3f33463 100644
--- a/docs-xml/smbdotconf/base/netbiosaliases.xml
+++ b/docs-xml/smbdotconf/base/netbiosaliases.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="netbios aliases"
                  context="G"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
         <para>This is a list of NetBIOS names that nmbd will 
diff --git a/docs-xml/smbdotconf/base/netbiosscope.xml b/docs-xml/smbdotconf/base/netbiosscope.xml
index 811e1c6..1b84aae 100644
--- a/docs-xml/smbdotconf/base/netbiosscope.xml
+++ b/docs-xml/smbdotconf/base/netbiosscope.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="netbios scope"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/realm.xml b/docs-xml/smbdotconf/base/realm.xml
index ab56ec5..e28909c 100644
--- a/docs-xml/smbdotconf/base/realm.xml
+++ b/docs-xml/smbdotconf/base/realm.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="realm"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/sharebackend.xml b/docs-xml/smbdotconf/base/sharebackend.xml
index fc8b6d4..08124cd 100644
--- a/docs-xml/smbdotconf/base/sharebackend.xml
+++ b/docs-xml/smbdotconf/base/sharebackend.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="share backend"
                  context="G"
                  type="string"
-		 constant="1"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/base/unixcharset.xml b/docs-xml/smbdotconf/base/unixcharset.xml
index ff8f6bb..3122f11 100644
--- a/docs-xml/smbdotconf/base/unixcharset.xml
+++ b/docs-xml/smbdotconf/base/unixcharset.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="unix charset"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/workgroup.xml b/docs-xml/smbdotconf/base/workgroup.xml
index 49aec41..bf650ff 100644
--- a/docs-xml/smbdotconf/base/workgroup.xml
+++ b/docs-xml/smbdotconf/base/workgroup.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="workgroup"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/browse/browseable.xml b/docs-xml/smbdotconf/browse/browseable.xml
index c56d3fc..64dfcf0 100644
--- a/docs-xml/smbdotconf/browse/browseable.xml
+++ b/docs-xml/smbdotconf/browse/browseable.xml
@@ -1,4 +1,6 @@
-<samba:parameter name="browseable" context="S" type="boolean"
+<samba:parameter name="browseable"
+                 context="S"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>browsable</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/browse/browselist.xml b/docs-xml/smbdotconf/browse/browselist.xml
index adf7454..f053e81 100644
--- a/docs-xml/smbdotconf/browse/browselist.xml
+++ b/docs-xml/smbdotconf/browse/browselist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="browse list"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/domainmaster.xml b/docs-xml/smbdotconf/browse/domainmaster.xml
index a47800b..7a75865 100644
--- a/docs-xml/smbdotconf/browse/domainmaster.xml
+++ b/docs-xml/smbdotconf/browse/domainmaster.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="domain master"
-				 type="enum"
+                 type="enum"
                  context="G"
                  function="_domain_master"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
index 8b1b531..7ad8930 100644
--- a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
+++ b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="enhanced browsing"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option enables a couple of enhancements to 
diff --git a/docs-xml/smbdotconf/browse/lmannounce.xml b/docs-xml/smbdotconf/browse/lmannounce.xml
index 6d712c4..8c9e981 100644
--- a/docs-xml/smbdotconf/browse/lmannounce.xml
+++ b/docs-xml/smbdotconf/browse/lmannounce.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lm announce"
                  context="G"
-				 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/lminterval.xml b/docs-xml/smbdotconf/browse/lminterval.xml
index 8a68e09..da33658 100644
--- a/docs-xml/smbdotconf/browse/lminterval.xml
+++ b/docs-xml/smbdotconf/browse/lminterval.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lm interval"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>If Samba is set to produce Lanman announce 
diff --git a/docs-xml/smbdotconf/browse/oslevel.xml b/docs-xml/smbdotconf/browse/oslevel.xml
index fc386d2..43ba861 100644
--- a/docs-xml/smbdotconf/browse/oslevel.xml
+++ b/docs-xml/smbdotconf/browse/oslevel.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="os level"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index e32ca52..30a59e8 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="preferred master"
                  context="G"
-				 type="boolean-auto"
+                 type="boolean-auto"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>prefered master</synonym>
diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
index b53ee3c..e7d8d44 100644
--- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
+++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="machine password timeout"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 	 <description>
 
diff --git a/docs-xml/smbdotconf/filename/casesensitive.xml b/docs-xml/smbdotconf/filename/casesensitive.xml
index 8c0995c..3b2b70b 100644
--- a/docs-xml/smbdotconf/filename/casesensitive.xml
+++ b/docs-xml/smbdotconf/filename/casesensitive.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="case sensitive"
                  context="S"
-		 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>casesignames</synonym>
 
diff --git a/docs-xml/smbdotconf/filename/defaultcase.xml b/docs-xml/smbdotconf/filename/defaultcase.xml
index d167ae3..ccf8dad 100644
--- a/docs-xml/smbdotconf/filename/defaultcase.xml
+++ b/docs-xml/smbdotconf/filename/defaultcase.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="default case"
-	context="S"
-	type="enum" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>See the section on <smbconfoption name="name mangling"/>.
 	Also note the <smbconfoption name="short preserve case"/> parameter.</para>
diff --git a/docs-xml/smbdotconf/filename/deletevetofiles.xml b/docs-xml/smbdotconf/filename/deletevetofiles.xml
index 31138aa..581dc05 100644
--- a/docs-xml/smbdotconf/filename/deletevetofiles.xml
+++ b/docs-xml/smbdotconf/filename/deletevetofiles.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="delete veto files"
-				 type="boolean"
+                 type="boolean"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/filename/hidedotfiles.xml b/docs-xml/smbdotconf/filename/hidedotfiles.xml
index 9f31f2c..54e0b0a 100644
--- a/docs-xml/smbdotconf/filename/hidedotfiles.xml
+++ b/docs-xml/smbdotconf/filename/hidedotfiles.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hide dot files"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a boolean parameter that controls whether 
diff --git a/docs-xml/smbdotconf/filename/hidespecialfiles.xml b/docs-xml/smbdotconf/filename/hidespecialfiles.xml
index ea2b68a..904fd3a 100644
--- a/docs-xml/smbdotconf/filename/hidespecialfiles.xml
+++ b/docs-xml/smbdotconf/filename/hidespecialfiles.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hide special files"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/filename/hideunreadable.xml b/docs-xml/smbdotconf/filename/hideunreadable.xml
index 992f135..361320c 100644
--- a/docs-xml/smbdotconf/filename/hideunreadable.xml
+++ b/docs-xml/smbdotconf/filename/hideunreadable.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hide unreadable"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>This parameter prevents clients from seeing the
diff --git a/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml b/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
index 6665860..97a44f0 100644
--- a/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
+++ b/docs-xml/smbdotconf/filename/hideunwriteablefiles.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hide unwriteable files"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/filename/manglednames.xml b/docs-xml/smbdotconf/filename/manglednames.xml
index dfd85c4..bd5d97f 100644
--- a/docs-xml/smbdotconf/filename/manglednames.xml
+++ b/docs-xml/smbdotconf/filename/manglednames.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="mangled names"
-				 type="boolean"
+                 type="boolean"
                  context="S"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/filename/mangleprefix.xml b/docs-xml/smbdotconf/filename/mangleprefix.xml
index 96ff963..8cb7dea 100644
--- a/docs-xml/smbdotconf/filename/mangleprefix.xml
+++ b/docs-xml/smbdotconf/filename/mangleprefix.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="mangle prefix"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> controls the number of prefix
diff --git a/docs-xml/smbdotconf/filename/manglingchar.xml b/docs-xml/smbdotconf/filename/manglingchar.xml
index e40a12e..374d1ee 100644
--- a/docs-xml/smbdotconf/filename/manglingchar.xml
+++ b/docs-xml/smbdotconf/filename/manglingchar.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="mangling char"
                  context="S"
-		 type="char"
+                 type="char"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml
index 4b68067..559ed6c 100644
--- a/docs-xml/smbdotconf/filename/manglingmethod.xml
+++ b/docs-xml/smbdotconf/filename/manglingmethod.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="mangling method"
-			 context="G"
-				 type="string"
+                 context="G"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> controls the algorithm used for the generating
diff --git a/docs-xml/smbdotconf/filename/maparchive.xml b/docs-xml/smbdotconf/filename/maparchive.xml
index 33ff876..44f49cd 100644
--- a/docs-xml/smbdotconf/filename/maparchive.xml
+++ b/docs-xml/smbdotconf/filename/maparchive.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="map archive"
                  context="S"
-				 type="boolean"
-				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This controls whether the DOS archive attribute 
diff --git a/docs-xml/smbdotconf/filename/maphidden.xml b/docs-xml/smbdotconf/filename/maphidden.xml
index cbf9c10..3ad05a6 100644
--- a/docs-xml/smbdotconf/filename/maphidden.xml
+++ b/docs-xml/smbdotconf/filename/maphidden.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="map hidden"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml
index f4ac7c8..d467ec6 100644
--- a/docs-xml/smbdotconf/filename/mapreadonly.xml
+++ b/docs-xml/smbdotconf/filename/mapreadonly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="map readonly"
                  context="S"
-		 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/mapsystem.xml b/docs-xml/smbdotconf/filename/mapsystem.xml
index 5605d88..53c11bd 100644
--- a/docs-xml/smbdotconf/filename/mapsystem.xml
+++ b/docs-xml/smbdotconf/filename/mapsystem.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="map system"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/maxstatcachesize.xml b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
index 40790df..63f91e7 100644
--- a/docs-xml/smbdotconf/filename/maxstatcachesize.xml
+++ b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max stat cache size"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter limits the size in memory of any 
diff --git a/docs-xml/smbdotconf/filename/preservecase.xml b/docs-xml/smbdotconf/filename/preservecase.xml
index 875900d..a7eae26 100644
--- a/docs-xml/smbdotconf/filename/preservecase.xml
+++ b/docs-xml/smbdotconf/filename/preservecase.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="preserve case"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/shortpreservecase.xml b/docs-xml/smbdotconf/filename/shortpreservecase.xml
index 90188a0..ecb5652 100644
--- a/docs-xml/smbdotconf/filename/shortpreservecase.xml
+++ b/docs-xml/smbdotconf/filename/shortpreservecase.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="short preserve case"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/statcache.xml b/docs-xml/smbdotconf/filename/statcache.xml
index ec1ee25..2b19777 100644
--- a/docs-xml/smbdotconf/filename/statcache.xml
+++ b/docs-xml/smbdotconf/filename/statcache.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="stat cache"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter determines if <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/filename/storedosattributes.xml b/docs-xml/smbdotconf/filename/storedosattributes.xml
index acd78b0..30665eb 100644
--- a/docs-xml/smbdotconf/filename/storedosattributes.xml
+++ b/docs-xml/smbdotconf/filename/storedosattributes.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="store dos attributes"
                  context="S"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/vetofiles.xml b/docs-xml/smbdotconf/filename/vetofiles.xml
index 8065dcf..acbc3dc 100644
--- a/docs-xml/smbdotconf/filename/vetofiles.xml
+++ b/docs-xml/smbdotconf/filename/vetofiles.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="veto files"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/docs-xml/smbdotconf/filename/vetooplockfiles.xml b/docs-xml/smbdotconf/filename/vetooplockfiles.xml
index b99ab00..dde3705 100644
--- a/docs-xml/smbdotconf/filename/vetooplockfiles.xml
+++ b/docs-xml/smbdotconf/filename/vetooplockfiles.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="veto oplock files"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
index 92ea541..5ada783 100644
--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="client ldap sasl wrapping"
                  context="G"
-		 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
index 3f50799..f993742 100644
--- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="ldap admin dn"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-				 <description>
+<description>
 
 	 <para>
 	The <smbconfoption name="ldap admin dn"/> defines the Distinguished  Name (DN) name used by Samba to contact
diff --git a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
index 7c77fe3..b176897 100644
--- a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap connection timeout"
-		 context="G"
-			type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter tells the LDAP library calls which timeout in seconds
diff --git a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
index a9518d1..47ffad8 100644
--- a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap delete dn"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> This parameter specifies whether a delete
diff --git a/docs-xml/smbdotconf/ldap/ldapderef.xml b/docs-xml/smbdotconf/ldap/ldapderef.xml
index 23ad3e7..9bddabc 100644
--- a/docs-xml/smbdotconf/ldap/ldapderef.xml
+++ b/docs-xml/smbdotconf/ldap/ldapderef.xml
@@ -1,5 +1,7 @@
-<samba:parameter name="ldap deref" context="G" type="enum"
-	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<samba:parameter name="ldap deref"
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
 
diff --git a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index ebdfb89..0bbdcc6 100644
--- a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,5 +1,7 @@
-<samba:parameter name="ldap follow referral" context="G" type="enum"
-	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<samba:parameter name="ldap follow referral"
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
 
diff --git a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
index bb18832..f80a069 100644
--- a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap group suffix"
                  context="G"
-				 type="string"
+                 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
index aac09df..3897c9e 100644
--- a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap idmap suffix"
                  context="G"
-		 type="string"
+                 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
index 2572246..5651c63 100644
--- a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="ldap machine suffix"
-		context="G"
-		type="string"
+                 context="G"
+                 type="string"
                  generated_function="0"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
index 311eba1..81cd98a 100644
--- a/docs-xml/smbdotconf/ldap/ldappagesize.xml
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap page size"
-	context="G"
-	type="integer"
-        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter specifies the number of entries per page.
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index 7166e9b..e3c3c2e 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap passwd sync"
-			context="G"
-			type="enum"
-			xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <synonym>ldap password sync</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
index a8236d8..059c77e 100644
--- a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
+++ b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap replication sleep"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
index 6496bfb..e7f36e6 100644
--- a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldapsam:editposix"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml b/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
index 4556679..1d593e6 100644
--- a/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldapsam:trusted"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index eade027..ca9b5cb 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap ssl"
                  context="G"
-				 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option is used to define whether or not Samba should
diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml
index 4f1771a..4fdf4dc 100644
--- a/docs-xml/smbdotconf/ldap/ldapsslads.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap ssl ads"
-		 context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option is used to define whether or not Samba should
 	use SSL when connecting to the ldap server using
diff --git a/docs-xml/smbdotconf/ldap/ldapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
index 7db13c2..aeff0dd 100644
--- a/docs-xml/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap suffix"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies the base for all ldap suffixes and for storing the sambaDomain object.</para>
diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
index e920ddc..f421eeb 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ldap timeout"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
index 71fdc9e..f0f1c37 100644
--- a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="ldap user suffix"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  generated_function="0"
-        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter specifies where users are added to the tree. If this parameter is unset, 
diff --git a/docs-xml/smbdotconf/locking/blockinglocks.xml b/docs-xml/smbdotconf/locking/blockinglocks.xml
index 493f281..2794124 100644
--- a/docs-xml/smbdotconf/locking/blockinglocks.xml
+++ b/docs-xml/smbdotconf/locking/blockinglocks.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="blocking locks"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls the behavior 
diff --git a/docs-xml/smbdotconf/locking/cscpolicy.xml b/docs-xml/smbdotconf/locking/cscpolicy.xml
index 6131e12..596529e 100644
--- a/docs-xml/smbdotconf/locking/cscpolicy.xml
+++ b/docs-xml/smbdotconf/locking/cscpolicy.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="csc policy"
                  context="S"
-				 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/fakeoplocks.xml b/docs-xml/smbdotconf/locking/fakeoplocks.xml
index fa004d7..c5622ae 100644
--- a/docs-xml/smbdotconf/locking/fakeoplocks.xml
+++ b/docs-xml/smbdotconf/locking/fakeoplocks.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="fake oplocks"
-				 type="boolean"
+                 type="boolean"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml
index d8fe223..a22cdf2 100644
--- a/docs-xml/smbdotconf/locking/kerneloplocks.xml
+++ b/docs-xml/smbdotconf/locking/kerneloplocks.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="kernel oplocks"
-				 type="boolean"
-		 context="S"
+                 type="boolean"
+                 context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>For UNIXes that support kernel based <smbconfoption name="oplocks"/>
diff --git a/docs-xml/smbdotconf/locking/kernelsharemodes.xml b/docs-xml/smbdotconf/locking/kernelsharemodes.xml
index 5b64b77..134fffc 100644
--- a/docs-xml/smbdotconf/locking/kernelsharemodes.xml
+++ b/docs-xml/smbdotconf/locking/kernelsharemodes.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="kernel share modes"
-		 type="boolean"
-		 context="S"
+                 type="boolean"
+                 context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/level2oplocks.xml b/docs-xml/smbdotconf/locking/level2oplocks.xml
index 496701b..f411449 100644
--- a/docs-xml/smbdotconf/locking/level2oplocks.xml
+++ b/docs-xml/smbdotconf/locking/level2oplocks.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="level2 oplocks"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether Samba supports
diff --git a/docs-xml/smbdotconf/locking/locking.xml b/docs-xml/smbdotconf/locking/locking.xml
index 0021c50..15bc98d 100644
--- a/docs-xml/smbdotconf/locking/locking.xml
+++ b/docs-xml/smbdotconf/locking/locking.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="locking"
-				 type="boolean"
+                 type="boolean"
                  context="S"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/locking/lockspintime.xml b/docs-xml/smbdotconf/locking/lockspintime.xml
index 8e40877b..689d7dd 100644
--- a/docs-xml/smbdotconf/locking/lockspintime.xml
+++ b/docs-xml/smbdotconf/locking/lockspintime.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="lock spin time"
-				 type="integer"
+                 type="integer"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/locking/oplockbreakwaittime.xml b/docs-xml/smbdotconf/locking/oplockbreakwaittime.xml
index bede040..f07b6c9 100644
--- a/docs-xml/smbdotconf/locking/oplockbreakwaittime.xml
+++ b/docs-xml/smbdotconf/locking/oplockbreakwaittime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="oplock break wait time"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml b/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml
index 3ee3c45..edaa7d7 100644
--- a/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml
+++ b/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="oplock contention limit"
                  context="S"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/oplocks.xml b/docs-xml/smbdotconf/locking/oplocks.xml
index a5e163b..1d72649 100644
--- a/docs-xml/smbdotconf/locking/oplocks.xml
+++ b/docs-xml/smbdotconf/locking/oplocks.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="oplocks"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/posixlocking.xml b/docs-xml/smbdotconf/locking/posixlocking.xml
index 2136047..f38b2bd 100644
--- a/docs-xml/smbdotconf/locking/posixlocking.xml
+++ b/docs-xml/smbdotconf/locking/posixlocking.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="posix locking"
-				 type="boolean"
+                 type="boolean"
                  context="S"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml b/docs-xml/smbdotconf/locking/smb2leases.xml
index 9241bc8..5ca13d2 100644
--- a/docs-xml/smbdotconf/locking/smb2leases.xml
+++ b/docs-xml/smbdotconf/locking/smb2leases.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="smb2 leases"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/strictlocking.xml b/docs-xml/smbdotconf/locking/strictlocking.xml
index 29ace66..563042a 100644
--- a/docs-xml/smbdotconf/locking/strictlocking.xml
+++ b/docs-xml/smbdotconf/locking/strictlocking.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="strict locking"
                  context="S"
-				 type="enum"
+                 type="enum"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logging/debugclass.xml b/docs-xml/smbdotconf/logging/debugclass.xml
index b9ffbe3..eee3cc5 100644
--- a/docs-xml/smbdotconf/logging/debugclass.xml
+++ b/docs-xml/smbdotconf/logging/debugclass.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug class"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
index 5c9e468..72598d7 100644
--- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug hires timestamp"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/debugpid.xml b/docs-xml/smbdotconf/logging/debugpid.xml
index 5c81625..8e6436c 100644
--- a/docs-xml/smbdotconf/logging/debugpid.xml
+++ b/docs-xml/smbdotconf/logging/debugpid.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug pid"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
index e894142..0a004d4 100644
--- a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug prefix timestamp"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/debugtimestamp.xml b/docs-xml/smbdotconf/logging/debugtimestamp.xml
index 205eac8..87c88ca 100644
--- a/docs-xml/smbdotconf/logging/debugtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugtimestamp.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug timestamp"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  function="timestamp_logs"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>timestamp logs</synonym>
diff --git a/docs-xml/smbdotconf/logging/debuguid.xml b/docs-xml/smbdotconf/logging/debuguid.xml
index cc715ec..1dd1dbf 100644
--- a/docs-xml/smbdotconf/logging/debuguid.xml
+++ b/docs-xml/smbdotconf/logging/debuguid.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="debug uid"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
index 1b51767..1b75bb9 100644
--- a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap debug level"
-		 type="integer"
-		context="G"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 		This parameter controls the debug level of the LDAP library
diff --git a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
index ab69cc5..2783ac9 100644
--- a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="ldap debug threshold"
-		type="integer"
-		context="G"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 		This parameter controls the Samba debug level at which
diff --git a/docs-xml/smbdotconf/logging/logfile.xml b/docs-xml/smbdotconf/logging/logfile.xml
index 4a7be66..9b258cc 100644
--- a/docs-xml/smbdotconf/logging/logfile.xml
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="log file"
                  context="G"
-				 type="string"
+                 type="string"
                  function="logfile"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logging/logging.xml b/docs-xml/smbdotconf/logging/logging.xml
index f779d8f..8524884 100644
--- a/docs-xml/smbdotconf/logging/logging.xml
+++ b/docs-xml/smbdotconf/logging/logging.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="logging"
-		 type="string"
-		 context="G"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="string"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
   <para>This parameter configures logging backends. Multiple
diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
index 6a22554..d642b50 100644
--- a/docs-xml/smbdotconf/logging/loglevel.xml
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="log level"
-				 type="string"
+                 type="string"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>debuglevel</synonym>
diff --git a/docs-xml/smbdotconf/logging/maxlogsize.xml b/docs-xml/smbdotconf/logging/maxlogsize.xml
index 3373f16..35c2add 100644
--- a/docs-xml/smbdotconf/logging/maxlogsize.xml
+++ b/docs-xml/smbdotconf/logging/maxlogsize.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="max log size"
-				 type="integer"
+                 type="integer"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logging/syslog.xml b/docs-xml/smbdotconf/logging/syslog.xml
index 23ca499..03dc02e 100644
--- a/docs-xml/smbdotconf/logging/syslog.xml
+++ b/docs-xml/smbdotconf/logging/syslog.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="syslog"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/syslogonly.xml b/docs-xml/smbdotconf/logging/syslogonly.xml
index 9847f0c..7c65daa 100644
--- a/docs-xml/smbdotconf/logging/syslogonly.xml
+++ b/docs-xml/smbdotconf/logging/syslogonly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="syslog only"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logon/domainlogons.xml b/docs-xml/smbdotconf/logon/domainlogons.xml
index 0a1d11d..7ee419e 100644
--- a/docs-xml/smbdotconf/logon/domainlogons.xml
+++ b/docs-xml/smbdotconf/logon/domainlogons.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="domain logons"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  function="_domain_logons"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index 3beb8de..6bbdef6 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="add share command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/afsshare.xml b/docs-xml/smbdotconf/misc/afsshare.xml
index d2c3d1e..fe97b58 100644
--- a/docs-xml/smbdotconf/misc/afsshare.xml
+++ b/docs-xml/smbdotconf/misc/afsshare.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="afs share"
-	         context="S"
-			 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether special AFS features are enabled
 	for this share. If enabled, it assumes that the directory exported via
diff --git a/docs-xml/smbdotconf/misc/afsusernamemap.xml b/docs-xml/smbdotconf/misc/afsusernamemap.xml
index 94f0cee..4dc3d46 100644
--- a/docs-xml/smbdotconf/misc/afsusernamemap.xml
+++ b/docs-xml/smbdotconf/misc/afsusernamemap.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="afs username map"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
diff --git a/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml b/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
index a8a0991..6b60108 100644
--- a/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
+++ b/docs-xml/smbdotconf/misc/allowinsecurewidelinks.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="allow insecure wide links"
-		context="G"
-		type="boolean"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	In normal operation the option <smbconfoption name="wide links"/>
diff --git a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
index 84e2f1a..2b6eeb3 100644
--- a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
+++ b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="async smb echo handler"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether Samba should fork the
diff --git a/docs-xml/smbdotconf/misc/available.xml b/docs-xml/smbdotconf/misc/available.xml
index 343c6fd..6e3b70c 100644
--- a/docs-xml/smbdotconf/misc/available.xml
+++ b/docs-xml/smbdotconf/misc/available.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="available"
-	         context="S"
-		 type="boolean"
+                 context="S"
+                 type="boolean"
                  generated_function="0"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter lets you "turn off" a service. If 
 	<parameter moreinfo="none">available = no</parameter>, then <emphasis>ALL</emphasis> 
diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml
index b0731f9..6ffda0b 100644
--- a/docs-xml/smbdotconf/misc/cachedirectory.xml
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="cache directory"
                  context="G"
-		 type="string"
-		 constant="1"
+                 type="string"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Usually, most of the TDB files are stored in the <parameter
diff --git a/docs-xml/smbdotconf/misc/changenotify.xml b/docs-xml/smbdotconf/misc/changenotify.xml
index 70793d6..9ded7ec 100644
--- a/docs-xml/smbdotconf/misc/changenotify.xml
+++ b/docs-xml/smbdotconf/misc/changenotify.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="change notify"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether Samba should reply
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index fbfc440..9f805b1 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="change share command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/clusteraddresses.xml b/docs-xml/smbdotconf/misc/clusteraddresses.xml
index b489ed4..b1116d3 100644
--- a/docs-xml/smbdotconf/misc/clusteraddresses.xml
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="cluster addresses"
-	         context="G"
-			 type="list"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="list"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>With this parameter you can add additional addresses
 	nmbd will register with a WINS server. These addresses are not
diff --git a/docs-xml/smbdotconf/misc/clustering.xml b/docs-xml/smbdotconf/misc/clustering.xml
index 3613670..cf426ec 100644
--- a/docs-xml/smbdotconf/misc/clustering.xml
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="clustering"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether Samba should contact
diff --git a/docs-xml/smbdotconf/misc/configfile.xml b/docs-xml/smbdotconf/misc/configfile.xml
index 450be18..566d430 100644
--- a/docs-xml/smbdotconf/misc/configfile.xml
+++ b/docs-xml/smbdotconf/misc/configfile.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="config file"
                  context="G"
-				 type="string"
+                 type="string"
                  function="next_configfile"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
index 283de6b..f9da01f 100644
--- a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
+++ b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ctdb locktime warn threshold"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/misc/ctdbtimeout.xml b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
index 1bff098..b02b2c8 100644
--- a/docs-xml/smbdotconf/misc/ctdbtimeout.xml
+++ b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ctdb timeout"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a timeout in milliseconds for the
diff --git a/docs-xml/smbdotconf/misc/defaultservice.xml b/docs-xml/smbdotconf/misc/defaultservice.xml
index c0942f5..788506f 100644
--- a/docs-xml/smbdotconf/misc/defaultservice.xml
+++ b/docs-xml/smbdotconf/misc/defaultservice.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="default service"
                  context="G"
-				 type="string"
+                 type="string"
                  function="defaultservice"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>default</synonym>
diff --git a/docs-xml/smbdotconf/misc/deletereadonly.xml b/docs-xml/smbdotconf/misc/deletereadonly.xml
index de4f566..84390ed 100644
--- a/docs-xml/smbdotconf/misc/deletereadonly.xml
+++ b/docs-xml/smbdotconf/misc/deletereadonly.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="delete readonly"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter allows readonly files to be deleted.  
 	This is not normal DOS semantics, but is allowed by UNIX.</para>
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 4e20523..b5942b6 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="delete share command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/dfreecachetime.xml b/docs-xml/smbdotconf/misc/dfreecachetime.xml
index b21535e..9679763 100644
--- a/docs-xml/smbdotconf/misc/dfreecachetime.xml
+++ b/docs-xml/smbdotconf/misc/dfreecachetime.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="dfree cache time"
-	         context="S"
-			 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
 	<para>
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
index e9f974b..7a89bf2 100644
--- a/docs-xml/smbdotconf/misc/directorynamecachesize.xml
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="directory name cache size"
-		 context="S"
-		 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter specifies the size of the directory name cache.
diff --git a/docs-xml/smbdotconf/misc/dmapisupport.xml b/docs-xml/smbdotconf/misc/dmapisupport.xml
index 6ff85dd..de284ee 100644
--- a/docs-xml/smbdotconf/misc/dmapisupport.xml
+++ b/docs-xml/smbdotconf/misc/dmapisupport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="dmapi support"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether Samba should use DMAPI to
diff --git a/docs-xml/smbdotconf/misc/dontdescend.xml b/docs-xml/smbdotconf/misc/dontdescend.xml
index d9f41da..fe6686b 100644
--- a/docs-xml/smbdotconf/misc/dontdescend.xml
+++ b/docs-xml/smbdotconf/misc/dontdescend.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="dont descend"
-	         context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>There are certain directories on some systems 
 	(e.g., the <filename moreinfo="none">/proc</filename> tree under Linux) that are either not 
diff --git a/docs-xml/smbdotconf/misc/dosfilemode.xml b/docs-xml/smbdotconf/misc/dosfilemode.xml
index cf53192..353f4bb 100644
--- a/docs-xml/smbdotconf/misc/dosfilemode.xml
+++ b/docs-xml/smbdotconf/misc/dosfilemode.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="dos filemode"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> The default behavior in Samba is to provide
 	UNIX-like behavior where only the owner of a file/directory is
diff --git a/docs-xml/smbdotconf/misc/dosfiletimeresolution.xml b/docs-xml/smbdotconf/misc/dosfiletimeresolution.xml
index 130f0fd..ccdfa6d 100644
--- a/docs-xml/smbdotconf/misc/dosfiletimeresolution.xml
+++ b/docs-xml/smbdotconf/misc/dosfiletimeresolution.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="dos filetime resolution"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Under the DOS and Windows FAT filesystem, the finest 
 	granularity on time resolution is two seconds. Setting this parameter 
diff --git a/docs-xml/smbdotconf/misc/dosfiletimes.xml b/docs-xml/smbdotconf/misc/dosfiletimes.xml
index 423b13c..9877830 100644
--- a/docs-xml/smbdotconf/misc/dosfiletimes.xml
+++ b/docs-xml/smbdotconf/misc/dosfiletimes.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="dos filetimes"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Under DOS and Windows, if a user can write to a 
 	file they can change the timestamp on it. Under POSIX semantics, 
diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
index 54e7b87..49f54a9 100644
--- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
+++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="fake directory create times"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>NTFS and Windows VFAT file systems keep a create 
 	time for all files and directories. This is not the same as the 
diff --git a/docs-xml/smbdotconf/misc/followsymlinks.xml b/docs-xml/smbdotconf/misc/followsymlinks.xml
index c0fd920..deca634 100644
--- a/docs-xml/smbdotconf/misc/followsymlinks.xml
+++ b/docs-xml/smbdotconf/misc/followsymlinks.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="follow symlinks"
-	         context="S"
-			 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter allows the Samba administrator to stop <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/fssprunestale.xml b/docs-xml/smbdotconf/misc/fssprunestale.xml
index a8287b0..226a973 100644
--- a/docs-xml/smbdotconf/misc/fssprunestale.xml
+++ b/docs-xml/smbdotconf/misc/fssprunestale.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="fss: prune stale"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/fsssequencetimeout.xml b/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
index 300ff6c..67afac5 100644
--- a/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
+++ b/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="fss: sequence timeout"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/fstype.xml b/docs-xml/smbdotconf/misc/fstype.xml
index d210c10..822b451 100644
--- a/docs-xml/smbdotconf/misc/fstype.xml
+++ b/docs-xml/smbdotconf/misc/fstype.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="fstype"
-	         context="S"
-			 type="string"
+                 context="S"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter allows the administrator to configure the string that specifies the type of filesystem a share 
diff --git a/docs-xml/smbdotconf/misc/homedirmap.xml b/docs-xml/smbdotconf/misc/homedirmap.xml
index e50f64f..279b0b6 100644
--- a/docs-xml/smbdotconf/misc/homedirmap.xml
+++ b/docs-xml/smbdotconf/misc/homedirmap.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="homedir map"
-	         context="G"
-			 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
 	If <smbconfoption name="nis homedir"/> is <constant>yes</constant>, and <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index bfd7b3f..a674ade 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="include"
-	         context="G"
-		 type="string"
+                 context="G"
+                 type="string"
                  generated_function="0"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This allows you to include one config file inside another.  The file is included literally, as though typed 
diff --git a/docs-xml/smbdotconf/misc/kernelchangenotify.xml b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
index 6a41dcb..d5551a9 100644
--- a/docs-xml/smbdotconf/misc/kernelchangenotify.xml
+++ b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="kernel change notify"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether Samba should ask the 
diff --git a/docs-xml/smbdotconf/misc/lockdirectory.xml b/docs-xml/smbdotconf/misc/lockdirectory.xml
index 7a9cdf8..738de2e 100644
--- a/docs-xml/smbdotconf/misc/lockdirectory.xml
+++ b/docs-xml/smbdotconf/misc/lockdirectory.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lock directory"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>lock dir</synonym>
diff --git a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
index 320abfc..d95471a 100644
--- a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
+++ b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="log writeable files on exit"
-		 context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	When the network connection between a CIFS client and Samba
diff --git a/docs-xml/smbdotconf/misc/magicoutput.xml b/docs-xml/smbdotconf/misc/magicoutput.xml
index ce62099..784d090 100644
--- a/docs-xml/smbdotconf/misc/magicoutput.xml
+++ b/docs-xml/smbdotconf/misc/magicoutput.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="magic output"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter specifies the name of a file which will contain output created by a magic script (see the 
diff --git a/docs-xml/smbdotconf/misc/magicscript.xml b/docs-xml/smbdotconf/misc/magicscript.xml
index b621f00..cbc4209 100644
--- a/docs-xml/smbdotconf/misc/magicscript.xml
+++ b/docs-xml/smbdotconf/misc/magicscript.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="magic script"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the name of a file which, 
 	if opened, will be executed by the server when the file is closed. 
diff --git a/docs-xml/smbdotconf/misc/messagecommand.xml b/docs-xml/smbdotconf/misc/messagecommand.xml
index ee0db13..1025452 100644
--- a/docs-xml/smbdotconf/misc/messagecommand.xml
+++ b/docs-xml/smbdotconf/misc/messagecommand.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="message command"
-	         context="G"
-			 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This specifies what command to run when the 
 	server receives a WinPopup style message.</para>
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index 4651c19..1049d9b 100644
--- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="nbt client socket address"
-	         context="G"
-			 type="string"
+                 context="G"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>socket address</synonym>
 <description>
 	<para>This option allows you to control what address Samba
diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
index 1d84d60..2fa1019 100644
--- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="ncalrpc dir"
-		 context="G"
-		 type="string"
+                 context="G"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This directory will hold a series of named pipes to allow RPC over inter-process communication.</para>
 	<para>This will allow Samba and other unix processes to interact over DCE/RPC without using TCP/IP. Additionally a sub-directory 'np' has restricted permissions, and allows a trusted communication channel between Samba processes</para>
diff --git a/docs-xml/smbdotconf/misc/nishomedir.xml b/docs-xml/smbdotconf/misc/nishomedir.xml
index 4e66e71..ace8475 100644
--- a/docs-xml/smbdotconf/misc/nishomedir.xml
+++ b/docs-xml/smbdotconf/misc/nishomedir.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="NIS homedir"
-	         context="G"
-			 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Get the home share server from a NIS map. For 
 	UNIX systems that use an automounter, the user's home directory 
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index 91f69a4..fd72f06 100644
--- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
+++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="nmbd bind explicit broadcast"
-	         context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This option causes <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/panicaction.xml b/docs-xml/smbdotconf/misc/panicaction.xml
index ce4c15f..d6e1517 100644
--- a/docs-xml/smbdotconf/misc/panicaction.xml
+++ b/docs-xml/smbdotconf/misc/panicaction.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="panic action"
-		 context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a Samba developer option that allows a 
 	system command to be called when either <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/perfcountmodule.xml b/docs-xml/smbdotconf/misc/perfcountmodule.xml
index 50da2c67..e1c0948 100644
--- a/docs-xml/smbdotconf/misc/perfcountmodule.xml
+++ b/docs-xml/smbdotconf/misc/perfcountmodule.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="perfcount module"
-		 context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the perfcount backend to be used when monitoring SMB
 	operations.  Only one perfcount module may be used, and it must implement all of the
diff --git a/docs-xml/smbdotconf/misc/piddirectory.xml b/docs-xml/smbdotconf/misc/piddirectory.xml
index 56206cb..b53730d 100644
--- a/docs-xml/smbdotconf/misc/piddirectory.xml
+++ b/docs-xml/smbdotconf/misc/piddirectory.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="pid directory"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/postexec.xml b/docs-xml/smbdotconf/misc/postexec.xml
index db6d88f..c65ee1b 100644
--- a/docs-xml/smbdotconf/misc/postexec.xml
+++ b/docs-xml/smbdotconf/misc/postexec.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="postexec"
-	         context="S"
-			 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option specifies a command to be run 
 	whenever the service is disconnected. It takes the usual 
diff --git a/docs-xml/smbdotconf/misc/preexec.xml b/docs-xml/smbdotconf/misc/preexec.xml
index bbcee49..e5d07ef 100644
--- a/docs-xml/smbdotconf/misc/preexec.xml
+++ b/docs-xml/smbdotconf/misc/preexec.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="preexec"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <synonym>exec</synonym>
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>exec</synonym>
 <description>
 	<para>This option specifies a command to be run whenever 
 	the service is connected to. It takes the usual substitutions.</para>
diff --git a/docs-xml/smbdotconf/misc/preload.xml b/docs-xml/smbdotconf/misc/preload.xml
index 70d7ca6..d535ed2 100644
--- a/docs-xml/smbdotconf/misc/preload.xml
+++ b/docs-xml/smbdotconf/misc/preload.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="preload"
                  context="G"
-				 type="string"
+                 type="string"
                  function="auto_services"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>auto services</synonym>
diff --git a/docs-xml/smbdotconf/misc/registryshares.xml b/docs-xml/smbdotconf/misc/registryshares.xml
index bb25005..0bdb1f6 100644
--- a/docs-xml/smbdotconf/misc/registryshares.xml
+++ b/docs-xml/smbdotconf/misc/registryshares.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="registry shares"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml
index 5d442ea..ad537c8 100644
--- a/docs-xml/smbdotconf/misc/remoteannounce.xml
+++ b/docs-xml/smbdotconf/misc/remoteannounce.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="remote announce"
-	         context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/remotebrowsesync.xml b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
index 2c7547d..91a8c8f 100644
--- a/docs-xml/smbdotconf/misc/remotebrowsesync.xml
+++ b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="remote browse sync"
-	         context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/misc/resetonzerovc.xml b/docs-xml/smbdotconf/misc/resetonzerovc.xml
index 1fa3023..f2ad85d 100644
--- a/docs-xml/smbdotconf/misc/resetonzerovc.xml
+++ b/docs-xml/smbdotconf/misc/resetonzerovc.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="reset on zero vc"
-		 context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This boolean option controls whether an incoming session setup
diff --git a/docs-xml/smbdotconf/misc/rootpostexec.xml b/docs-xml/smbdotconf/misc/rootpostexec.xml
index 5a9613c..d50ca7f 100644
--- a/docs-xml/smbdotconf/misc/rootpostexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpostexec.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="root postexec"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This is the same as the <parameter moreinfo="none">postexec</parameter>
diff --git a/docs-xml/smbdotconf/misc/rootpreexec.xml b/docs-xml/smbdotconf/misc/rootpreexec.xml
index f0fff73..32bfe44 100644
--- a/docs-xml/smbdotconf/misc/rootpreexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexec.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="root preexec"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This is the same as the <parameter moreinfo="none">preexec</parameter>
diff --git a/docs-xml/smbdotconf/misc/rootpreexecclose.xml b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
index 3bce915..35fd883 100644
--- a/docs-xml/smbdotconf/misc/rootpreexecclose.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="root preexec close"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is the same as the <parameter moreinfo="none">preexec close
 	</parameter> parameter except that the command is run as root.</para>
diff --git a/docs-xml/smbdotconf/misc/rpcdaemon.xml b/docs-xml/smbdotconf/misc/rpcdaemon.xml
index 72f057d..ac12469 100644
--- a/docs-xml/smbdotconf/misc/rpcdaemon.xml
+++ b/docs-xml/smbdotconf/misc/rpcdaemon.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="rpc_daemon:DAEMON"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml b/docs-xml/smbdotconf/misc/rpcserver.xml
index fafedaf..a48c51c 100644
--- a/docs-xml/smbdotconf/misc/rpcserver.xml
+++ b/docs-xml/smbdotconf/misc/rpcserver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="rpc_server:SERVER"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml b/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
index d92e5dc..e9f70a2 100644
--- a/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
+++ b/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="smbd profiling level"
-	         context="G"
-		 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	  This parameter allows the administrator to enable profiling support.
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml
index 71200ea..084f145 100644
--- a/docs-xml/smbdotconf/misc/statedirectory.xml
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="state directory"
                  context="G"
-		 type="string"
-		 constant="1"
+                 type="string"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Usually, most of the TDB files are stored in the
diff --git a/docs-xml/smbdotconf/misc/usershareallowguests.xml b/docs-xml/smbdotconf/misc/usershareallowguests.xml
index 6fd75d1..be210bf 100644
--- a/docs-xml/smbdotconf/misc/usershareallowguests.xml
+++ b/docs-xml/smbdotconf/misc/usershareallowguests.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare allow guests"
-	         context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether user defined shares are allowed
 	to be accessed by non-authenticated users or not. It is the equivalent
diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
index 1d2bab7..0d69bb8 100644
--- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare max shares"
-	         context="G"
-		 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of user defined shares
 	that are allowed to be created by users belonging to the group owning the
diff --git a/docs-xml/smbdotconf/misc/usershareowneronly.xml b/docs-xml/smbdotconf/misc/usershareowneronly.xml
index acfb1df..5b33492 100644
--- a/docs-xml/smbdotconf/misc/usershareowneronly.xml
+++ b/docs-xml/smbdotconf/misc/usershareowneronly.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare owner only"
-	         context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether the pathname exported by
 	a user defined shares must be owned by the user creating the
diff --git a/docs-xml/smbdotconf/misc/usersharepath.xml b/docs-xml/smbdotconf/misc/usersharepath.xml
index a1b2841..446b1fd 100644
--- a/docs-xml/smbdotconf/misc/usersharepath.xml
+++ b/docs-xml/smbdotconf/misc/usersharepath.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare path"
-	         context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the absolute path of the directory on the
 	filesystem used to store the user defined share definition files.
diff --git a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index 481431e..50ea168 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare prefix allow list"
-	         context="G"
-		 type="list"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="list"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a list of absolute pathnames
 	the root of which are allowed to be exported by user defined share definitions.
diff --git a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
index 396e8c1..85e17ff 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare prefix deny list"
-	         context="G"
-		 type="list"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="list"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a list of absolute pathnames
 	the root of which are NOT allowed to be exported by user defined share definitions.
diff --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
index dd50f43..3a74dcb 100644
--- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
+++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="usershare template share"
-	         context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>User defined shares only have limited possible parameters
 	such as path, guest ok, etc. This parameter allows usershares to
diff --git a/docs-xml/smbdotconf/misc/utmpdirectory.xml b/docs-xml/smbdotconf/misc/utmpdirectory.xml
index b962ff3..82c8f10 100644
--- a/docs-xml/smbdotconf/misc/utmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/utmpdirectory.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="utmp directory"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/valid.xml b/docs-xml/smbdotconf/misc/valid.xml
index c8b5d62..fcd9dbc 100644
--- a/docs-xml/smbdotconf/misc/valid.xml
+++ b/docs-xml/smbdotconf/misc/valid.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="-valid"
-		 context="S"
-		 type="boolean"
+                 context="S"
+                 type="boolean"
                  generated_function="0"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> This parameter indicates whether a share is 
 	valid and thus can be used. When this parameter is set to false, 
diff --git a/docs-xml/smbdotconf/misc/volume.xml b/docs-xml/smbdotconf/misc/volume.xml
index d3385e7..02129f1 100644
--- a/docs-xml/smbdotconf/misc/volume.xml
+++ b/docs-xml/smbdotconf/misc/volume.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="volume"
-		 context="S"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This allows you to override the volume label 
 	returned for a share. Useful for CDROMs with installation programs 
diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml
index b507ae9..cb1389a 100644
--- a/docs-xml/smbdotconf/misc/widelinks.xml
+++ b/docs-xml/smbdotconf/misc/widelinks.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="wide links"
-		 context="S"
-		 type="boolean"
+                 context="S"
+                 type="boolean"
                  generated_function="0"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether or not links 
 	in the UNIX file system may be followed by the server. Links 
diff --git a/docs-xml/smbdotconf/misc/wtmpdirectory.xml b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
index 4652153..eb9d876 100644
--- a/docs-xml/smbdotconf/misc/wtmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="wtmp directory"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/addportcommand.xml b/docs-xml/smbdotconf/printing/addportcommand.xml
index 8a44a97..7a35c52 100644
--- a/docs-xml/smbdotconf/printing/addportcommand.xml
+++ b/docs-xml/smbdotconf/printing/addportcommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="addport command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Samba 3.0.23 introduced support for adding printer ports
diff --git a/docs-xml/smbdotconf/printing/addprintercommand.xml b/docs-xml/smbdotconf/printing/addprintercommand.xml
index 36d0f85..c39296d 100644
--- a/docs-xml/smbdotconf/printing/addprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/addprintercommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="addprinter command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>With the introduction of MS-RPC based printing
diff --git a/docs-xml/smbdotconf/printing/cupsencrypt.xml b/docs-xml/smbdotconf/printing/cupsencrypt.xml
index cba55d2..f4fc507 100644
--- a/docs-xml/smbdotconf/printing/cupsencrypt.xml
+++ b/docs-xml/smbdotconf/printing/cupsencrypt.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="cups encrypt"
-	context="G"
-	type="enum"
+                 context="G"
+                 type="enum"
                  generated_function="0"
-	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter is only applicable if <smbconfoption name="printing"/>
diff --git a/docs-xml/smbdotconf/printing/cupsoptions.xml b/docs-xml/smbdotconf/printing/cupsoptions.xml
index 6079b19..7e6b07d 100644
--- a/docs-xml/smbdotconf/printing/cupsoptions.xml
+++ b/docs-xml/smbdotconf/printing/cupsoptions.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="cups options"
                  context="S"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/printing/cupsserver.xml b/docs-xml/smbdotconf/printing/cupsserver.xml
index a301985..19bb769 100644
--- a/docs-xml/smbdotconf/printing/cupsserver.xml
+++ b/docs-xml/smbdotconf/printing/cupsserver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="cups server"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/printing/defaultdevmode.xml b/docs-xml/smbdotconf/printing/defaultdevmode.xml
index c2c7d3e..f86de9b 100644
--- a/docs-xml/smbdotconf/printing/defaultdevmode.xml
+++ b/docs-xml/smbdotconf/printing/defaultdevmode.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="default devmode"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter is only applicable to <smbconfoption name="printable"/> services.
diff --git a/docs-xml/smbdotconf/printing/deleteprintercommand.xml b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
index f26fc00..f9a9a47 100644
--- a/docs-xml/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="deleteprinter command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>With the introduction of MS-RPC based printer
diff --git a/docs-xml/smbdotconf/printing/disablespoolss.xml b/docs-xml/smbdotconf/printing/disablespoolss.xml
index 63c2e19..4710002 100644
--- a/docs-xml/smbdotconf/printing/disablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/disablespoolss.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="disable spoolss"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  function="_disable_spoolss"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/enablespoolss.xml b/docs-xml/smbdotconf/printing/enablespoolss.xml
index f2335d8..e721cdf 100644
--- a/docs-xml/smbdotconf/printing/enablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/enablespoolss.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="enable spoolss"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  synonym="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/enumportscommand.xml b/docs-xml/smbdotconf/printing/enumportscommand.xml
index 17880c6..cb85cd0 100644
--- a/docs-xml/smbdotconf/printing/enumportscommand.xml
+++ b/docs-xml/smbdotconf/printing/enumportscommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="enumports command"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The concept of a "port" is fairly foreign
diff --git a/docs-xml/smbdotconf/printing/forceprintername.xml b/docs-xml/smbdotconf/printing/forceprintername.xml
index 7503494..607d176 100644
--- a/docs-xml/smbdotconf/printing/forceprintername.xml
+++ b/docs-xml/smbdotconf/printing/forceprintername.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force printername"
                  context="S"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>When printing from Windows NT (or later), 
diff --git a/docs-xml/smbdotconf/printing/iprintserver.xml b/docs-xml/smbdotconf/printing/iprintserver.xml
index 55a0594..82bf9e9 100644
--- a/docs-xml/smbdotconf/printing/iprintserver.xml
+++ b/docs-xml/smbdotconf/printing/iprintserver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="iprint server"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/printing/loadprinters.xml b/docs-xml/smbdotconf/printing/loadprinters.xml
index 2072745..83e0f4c 100644
--- a/docs-xml/smbdotconf/printing/loadprinters.xml
+++ b/docs-xml/smbdotconf/printing/loadprinters.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="load printers"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>A boolean variable that controls whether all 
diff --git a/docs-xml/smbdotconf/printing/lppausecommand.xml b/docs-xml/smbdotconf/printing/lppausecommand.xml
index 0ca8f4d..3aa134c 100644
--- a/docs-xml/smbdotconf/printing/lppausecommand.xml
+++ b/docs-xml/smbdotconf/printing/lppausecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lppause command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/lpqcachetime.xml b/docs-xml/smbdotconf/printing/lpqcachetime.xml
index dcced48..0b3670a 100644
--- a/docs-xml/smbdotconf/printing/lpqcachetime.xml
+++ b/docs-xml/smbdotconf/printing/lpqcachetime.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="lpq cache time"
-		 context="G"
-		 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This controls how long lpq info will be cached 
 	for to prevent the <command moreinfo="none">lpq</command> command being called too 
diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml
index ee2c3d0..f3c17f2 100644
--- a/docs-xml/smbdotconf/printing/lpqcommand.xml
+++ b/docs-xml/smbdotconf/printing/lpqcommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lpq command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/lpresumecommand.xml b/docs-xml/smbdotconf/printing/lpresumecommand.xml
index e769fe3..153ba76 100644
--- a/docs-xml/smbdotconf/printing/lpresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lpresume command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/lprmcommand.xml b/docs-xml/smbdotconf/printing/lprmcommand.xml
index d542868..4b7f3dd 100644
--- a/docs-xml/smbdotconf/printing/lprmcommand.xml
+++ b/docs-xml/smbdotconf/printing/lprmcommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lprm command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/maxprintjobs.xml b/docs-xml/smbdotconf/printing/maxprintjobs.xml
index 0b3db05..8ca8c90 100644
--- a/docs-xml/smbdotconf/printing/maxprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxprintjobs.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max print jobs"
                  context="S"
-		 type="integer"
+                 type="integer"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
index e5e9570..5cfd21f 100644
--- a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max reported print jobs"
                  context="S"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/printing/os2drivermap.xml b/docs-xml/smbdotconf/printing/os2drivermap.xml
index c06002c..166cec2 100644
--- a/docs-xml/smbdotconf/printing/os2drivermap.xml
+++ b/docs-xml/smbdotconf/printing/os2drivermap.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="os2 driver map"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The parameter is used to define the absolute
diff --git a/docs-xml/smbdotconf/printing/printable.xml b/docs-xml/smbdotconf/printing/printable.xml
index ab8b5de..870d888 100644
--- a/docs-xml/smbdotconf/printing/printable.xml
+++ b/docs-xml/smbdotconf/printing/printable.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printable"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>print ok</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/printing/printcapcachetime.xml b/docs-xml/smbdotconf/printing/printcapcachetime.xml
index 4bbcb2d..d5a4c80 100644
--- a/docs-xml/smbdotconf/printing/printcapcachetime.xml
+++ b/docs-xml/smbdotconf/printing/printcapcachetime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printcap cache time"
-	context="G"
-	type="integer"
+                 context="G"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option specifies the number of seconds before the printing
diff --git a/docs-xml/smbdotconf/printing/printcapname.xml b/docs-xml/smbdotconf/printing/printcapname.xml
index edb47d7..a6c4c75 100644
--- a/docs-xml/smbdotconf/printing/printcapname.xml
+++ b/docs-xml/smbdotconf/printing/printcapname.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printcap name"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>printcap</synonym>
diff --git a/docs-xml/smbdotconf/printing/printcommand.xml b/docs-xml/smbdotconf/printing/printcommand.xml
index 18881e9..c84e45f 100644
--- a/docs-xml/smbdotconf/printing/printcommand.xml
+++ b/docs-xml/smbdotconf/printing/printcommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="print command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>After a print job has finished spooling to 
diff --git a/docs-xml/smbdotconf/printing/printername.xml b/docs-xml/smbdotconf/printing/printername.xml
index 1d3f79e..abe2b24 100644
--- a/docs-xml/smbdotconf/printing/printername.xml
+++ b/docs-xml/smbdotconf/printing/printername.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printer name"
                  context="S"
-		 type="string"
+                 type="string"
                  function="_printername"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <synonym>printer</synonym>
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index 14ec2b0..95d5da7 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printing"
                  context="S"
-				 type="enum"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameters controls how printer status  information is
diff --git a/docs-xml/smbdotconf/printing/printjobusername.xml b/docs-xml/smbdotconf/printing/printjobusername.xml
index 71d143c..872a2e5 100644
--- a/docs-xml/smbdotconf/printing/printjobusername.xml
+++ b/docs-xml/smbdotconf/printing/printjobusername.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="printjob username"
                  context="S"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/printnotifybackchannel.xml b/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
index b9d32ec..576bf75 100644
--- a/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
+++ b/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="print notify backchannel"
-		 context="S"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>Windows print clients can update print queue status by expecting
 	the server to open a backchannel SMB connection to them. Due to
diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml
index c396a67..5dca456 100644
--- a/docs-xml/smbdotconf/printing/queuepausecommand.xml
+++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="queuepause command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/queueresumecommand.xml b/docs-xml/smbdotconf/printing/queueresumecommand.xml
index ec1fb97..4a57333 100644
--- a/docs-xml/smbdotconf/printing/queueresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="queueresume command"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies the command to be 
diff --git a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
index 542ca0b..14687b8 100644
--- a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
+++ b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="show add printer wizard"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>With the introduction of MS-RPC based printing support
diff --git a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
index a0739d5..1eccf9f 100644
--- a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
+++ b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="spoolss: architecture"
-		 context="G"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows spoolss print clients only allow association of server-side drivers
 	with printers when the driver architecture matches the advertised print server
diff --git a/docs-xml/smbdotconf/printing/spoolssosversion.xml b/docs-xml/smbdotconf/printing/spoolssosversion.xml
index cd568e7..0ef4489 100644
--- a/docs-xml/smbdotconf/printing/spoolssosversion.xml
+++ b/docs-xml/smbdotconf/printing/spoolssosversion.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="spoolss: os_major"
-		 context="G"
-		 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows might require a new os version number. This option allows
 		to modify the build number. The complete default version number is:
diff --git a/docs-xml/smbdotconf/printing/useclientdriver.xml b/docs-xml/smbdotconf/printing/useclientdriver.xml
index 47fbb3e..4d07604 100644
--- a/docs-xml/smbdotconf/printing/useclientdriver.xml
+++ b/docs-xml/smbdotconf/printing/useclientdriver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="use client driver"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter applies only to Windows NT/2000
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 91d2b3f..667455a 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="acl check permissions"
                  context="S"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Please note this parameter is now deprecated in Samba 3.6.2 and will be removed
diff --git a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
index 33b6e51..9bb1e7d 100644
--- a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
+++ b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="acl map full control"
-		context="S"
-		type="boolean"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/cldapport.xml b/docs-xml/smbdotconf/protocol/cldapport.xml
index ed41f11..3fcb2b3 100644
--- a/docs-xml/smbdotconf/protocol/cldapport.xml
+++ b/docs-xml/smbdotconf/protocol/cldapport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="cldap port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option controls the port used by the CLDAP protocol.
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index e68226f..449ab18 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="client max protocol"
-		 context="G"
-		 type="enum"
-		 function="_client_max_protocol"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 function="_client_max_protocol"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The value of the parameter (a string) is the highest 
     protocol level that will be supported by the client.</para>
diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index c906a15..a02cb0e 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="client min protocol"
-		 context="G"
-		 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This setting controls the minimum protocol version that the
 	client will attempt to use.</para>
diff --git a/docs-xml/smbdotconf/protocol/clientusespnego.xml b/docs-xml/smbdotconf/protocol/clientusespnego.xml
index b95ad0e..f5a3512 100644
--- a/docs-xml/smbdotconf/protocol/clientusespnego.xml
+++ b/docs-xml/smbdotconf/protocol/clientusespnego.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="client use spnego"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para> This variable controls whether Samba clients will try 
diff --git a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
index 7fc172b..feecf62 100644
--- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
+++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="dcerpc endpoint servers"
                  context="G"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which DCE/RPC endpoint servers should be run.</para>
diff --git a/docs-xml/smbdotconf/protocol/defersharingviolations.xml b/docs-xml/smbdotconf/protocol/defersharingviolations.xml
index bf3b524..353dd9d 100644
--- a/docs-xml/smbdotconf/protocol/defersharingviolations.xml
+++ b/docs-xml/smbdotconf/protocol/defersharingviolations.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="defer sharing violations"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/protocol/dgramport.xml b/docs-xml/smbdotconf/protocol/dgramport.xml
index cac7243..b68c81f 100644
--- a/docs-xml/smbdotconf/protocol/dgramport.xml
+++ b/docs-xml/smbdotconf/protocol/dgramport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="dgram port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which ports the server should listen on for NetBIOS datagram traffic.</para>
diff --git a/docs-xml/smbdotconf/protocol/disablenetbios.xml b/docs-xml/smbdotconf/protocol/disablenetbios.xml
index a7b5759..ce39834 100644
--- a/docs-xml/smbdotconf/protocol/disablenetbios.xml
+++ b/docs-xml/smbdotconf/protocol/disablenetbios.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="disable netbios"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Enabling this parameter will disable netbios support
diff --git a/docs-xml/smbdotconf/protocol/easupport.xml b/docs-xml/smbdotconf/protocol/easupport.xml
index fc37f71..4c98267 100644
--- a/docs-xml/smbdotconf/protocol/easupport.xml
+++ b/docs-xml/smbdotconf/protocol/easupport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ea support"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>                                       
diff --git a/docs-xml/smbdotconf/protocol/enableasusupport.xml b/docs-xml/smbdotconf/protocol/enableasusupport.xml
index f938ed80..3c60b9b 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="enable asu support"
-		 context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Hosts running the "Advanced Server for Unix (ASU)" product
     require some special accomodations such as creating a builtin [ADMIN$]
diff --git a/docs-xml/smbdotconf/protocol/eventloglist.xml b/docs-xml/smbdotconf/protocol/eventloglist.xml
index ba90661..7429f03 100644
--- a/docs-xml/smbdotconf/protocol/eventloglist.xml
+++ b/docs-xml/smbdotconf/protocol/eventloglist.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="eventlog list"
-		 type="list"
+                 type="list"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/largereadwrite.xml b/docs-xml/smbdotconf/protocol/largereadwrite.xml
index 5a34bfd..e7142d1 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="large readwrite"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not
diff --git a/docs-xml/smbdotconf/protocol/mapaclinherit.xml b/docs-xml/smbdotconf/protocol/mapaclinherit.xml
index 5b2de34..3409232 100644
--- a/docs-xml/smbdotconf/protocol/mapaclinherit.xml
+++ b/docs-xml/smbdotconf/protocol/mapaclinherit.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="map acl inherit"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>                                       
diff --git a/docs-xml/smbdotconf/protocol/maxmux.xml b/docs-xml/smbdotconf/protocol/maxmux.xml
index 8281722..ab50001 100644
--- a/docs-xml/smbdotconf/protocol/maxmux.xml
+++ b/docs-xml/smbdotconf/protocol/maxmux.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max mux"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option controls the maximum number of 
diff --git a/docs-xml/smbdotconf/protocol/maxttl.xml b/docs-xml/smbdotconf/protocol/maxttl.xml
index 8813b40..c340ad1 100644
--- a/docs-xml/smbdotconf/protocol/maxttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxttl.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max ttl"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/maxwinsttl.xml b/docs-xml/smbdotconf/protocol/maxwinsttl.xml
index 6c37a03..2427eec 100644
--- a/docs-xml/smbdotconf/protocol/maxwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxwinsttl.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="max wins ttl"
-				 type="integer"
+                 type="integer"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/maxxmit.xml b/docs-xml/smbdotconf/protocol/maxxmit.xml
index 875efa0..c589659 100644
--- a/docs-xml/smbdotconf/protocol/maxxmit.xml
+++ b/docs-xml/smbdotconf/protocol/maxxmit.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="max xmit"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option controls the maximum packet size 
diff --git a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
index 4f40ecf..c5fed6a 100644
--- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
+++ b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="min receivefile size"
-		type="integer"
-		context="G"
+                 type="integer"
+                 context="G"
                  generated_function="0"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option changes the behavior of <citerefentry><refentrytitle>smbd</refentrytitle>
 <manvolnum>8</manvolnum></citerefentry> when processing SMBwriteX calls. Any incoming
diff --git a/docs-xml/smbdotconf/protocol/minwinsttl.xml b/docs-xml/smbdotconf/protocol/minwinsttl.xml
index dbeb6d1..8991757 100644
--- a/docs-xml/smbdotconf/protocol/minwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/minwinsttl.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="min wins ttl"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option tells <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/nameresolveorder.xml b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
index 17a4d95..282bcbe 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="name resolve order"
                  context="G"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> 
 <description>
     <para>This option is used by the programs in the Samba 
diff --git a/docs-xml/smbdotconf/protocol/nbtport.xml b/docs-xml/smbdotconf/protocol/nbtport.xml
index 0c06d7ca..7070b98 100644
--- a/docs-xml/smbdotconf/protocol/nbtport.xml
+++ b/docs-xml/smbdotconf/protocol/nbtport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="nbt port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which port the server should use for NetBIOS over IP name
diff --git a/docs-xml/smbdotconf/protocol/ntaclsupport.xml b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
index 7938110..1b1f947 100644
--- a/docs-xml/smbdotconf/protocol/ntaclsupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="nt acl support"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>                                       
diff --git a/docs-xml/smbdotconf/protocol/ntpipesupport.xml b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
index 9acfeda..907dee1 100644
--- a/docs-xml/smbdotconf/protocol/ntpipesupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="nt pipe support"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether 
diff --git a/docs-xml/smbdotconf/protocol/ntstatussupport.xml b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
index 961e2ae..07d3462 100644
--- a/docs-xml/smbdotconf/protocol/ntstatussupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="nt status support"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>                                       
diff --git a/docs-xml/smbdotconf/protocol/profileacls.xml b/docs-xml/smbdotconf/protocol/profileacls.xml
index 956e41f..ade906c 100644
--- a/docs-xml/smbdotconf/protocol/profileacls.xml
+++ b/docs-xml/smbdotconf/protocol/profileacls.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="profile acls"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/protocol/readraw.xml b/docs-xml/smbdotconf/protocol/readraw.xml
index f660b01..3b7c6c4 100644
--- a/docs-xml/smbdotconf/protocol/readraw.xml
+++ b/docs-xml/smbdotconf/protocol/readraw.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="read raw"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is ignored if <smbconfoption name="async echo handler"/> is set,
diff --git a/docs-xml/smbdotconf/protocol/rpcbigendian.xml b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
index 1933054..5f7c5b6 100644
--- a/docs-xml/smbdotconf/protocol/rpcbigendian.xml
+++ b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="rpc big endian"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Setting this option will force the RPC client and server to
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 7321d22..217e75a 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="server max protocol"
-		 context="G"
-		 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The value of the parameter (a string) is the highest 
     protocol level that will be supported by the server.</para>
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 25457d9..57a3f7b 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="server min protocol"
-		 context="G"
-		 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>min protocol</synonym>
 <description>
 	<para>This setting controls the minimum protocol version that the server
diff --git a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
index 8709a28..11f4955 100644
--- a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
+++ b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="share:fake_fscaps"
-	context="G"
-	type="string"
+                 context="G"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index ef2ad48..572e961 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="smb2 max credits"
-		type="integer"
-		context="G"
+                 type="integer"
+                 context="G"
                  generated_function="0"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option controls the maximum number of outstanding simultaneous SMB2 operations
 that Samba tells the client it will allow. This is similar to the <smbconfoption name="max mux"/>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index 9d05290..a262ce1 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="smb2 max read"
-		type="integer"
-		context="G"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
 <manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index a1998c9..4c28372 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="smb2 max trans"
-		type="integer"
-		context="G"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
 <manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index 5048d47..4105fa7 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="smb2 max write"
-		type="integer"
-		context="G"
-		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
 <manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
diff --git a/docs-xml/smbdotconf/protocol/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml
index f21fe7f..d46a5ed 100644
--- a/docs-xml/smbdotconf/protocol/smbports.xml
+++ b/docs-xml/smbdotconf/protocol/smbports.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="smb ports"
                  context="G"
-				 type="list"
+                 type="list"
+                 handler="handle_smb_ports"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which ports the server should listen on for SMB traffic.</para>
diff --git a/docs-xml/smbdotconf/protocol/svcctllist.xml b/docs-xml/smbdotconf/protocol/svcctllist.xml
index ecd8184..53577b3 100644
--- a/docs-xml/smbdotconf/protocol/svcctllist.xml
+++ b/docs-xml/smbdotconf/protocol/svcctllist.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="svcctl list"
-		 type="list"
+                 type="list"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/timeserver.xml b/docs-xml/smbdotconf/protocol/timeserver.xml
index f907fba..ceefbd3 100644
--- a/docs-xml/smbdotconf/protocol/timeserver.xml
+++ b/docs-xml/smbdotconf/protocol/timeserver.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="time server"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/unicode.xml b/docs-xml/smbdotconf/protocol/unicode.xml
index f7a2350..86fb06c 100644
--- a/docs-xml/smbdotconf/protocol/unicode.xml
+++ b/docs-xml/smbdotconf/protocol/unicode.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="unicode"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies whether the server and client should support unicode.</para>
diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index 9bcf01d..61ae361 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="unix extensions"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
     <para>This boolean parameter controls whether Samba
diff --git a/docs-xml/smbdotconf/protocol/usespnego.xml b/docs-xml/smbdotconf/protocol/usespnego.xml
index 1bdb4ba..aee75f3 100644
--- a/docs-xml/smbdotconf/protocol/usespnego.xml
+++ b/docs-xml/smbdotconf/protocol/usespnego.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="use spnego"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This deprecated variable controls whether samba will try 
diff --git a/docs-xml/smbdotconf/protocol/webport.xml b/docs-xml/smbdotconf/protocol/webport.xml
index 7cc55b0..b9f49ef 100644
--- a/docs-xml/smbdotconf/protocol/webport.xml
+++ b/docs-xml/smbdotconf/protocol/webport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="web port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which port the Samba web server should listen on.</para>
diff --git a/docs-xml/smbdotconf/protocol/writeraw.xml b/docs-xml/smbdotconf/protocol/writeraw.xml
index 599104e..f6ad7ba 100644
--- a/docs-xml/smbdotconf/protocol/writeraw.xml
+++ b/docs-xml/smbdotconf/protocol/writeraw.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="write raw"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is ignored if <smbconfoption name="async echo handler"/> is set, 
diff --git a/docs-xml/smbdotconf/security/accessbasedshareenum.xml b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
index b33c4a5..4557465 100644
--- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml
+++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="access based share enum"
-		 type="boolean"
+                 type="boolean"
                  context="S"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
      <para>If this parameter is <constant>yes</constant> for a
     service, then the share hosted by the service will only be visible
diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index 279a57b..a519e39 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="acl group control"
                  context="S"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/security/adminusers.xml b/docs-xml/smbdotconf/security/adminusers.xml
index 30adea9..654e1d5 100644
--- a/docs-xml/smbdotconf/security/adminusers.xml
+++ b/docs-xml/smbdotconf/security/adminusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="admin users"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a list of users who will be granted 
diff --git a/docs-xml/smbdotconf/security/algorithmicridbase.xml b/docs-xml/smbdotconf/security/algorithmicridbase.xml
index 4df3c3d..a5eba3c 100644
--- a/docs-xml/smbdotconf/security/algorithmicridbase.xml
+++ b/docs-xml/smbdotconf/security/algorithmicridbase.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="algorithmic rid base"
                  context="G"
-				 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This determines how Samba will use its
     algorithmic mapping from uids/gid to the RIDs needed to construct
diff --git a/docs-xml/smbdotconf/security/allowtrusteddomains.xml b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
index 806bab72..3617210 100644
--- a/docs-xml/smbdotconf/security/allowtrusteddomains.xml
+++ b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="allow trusted domains"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
     This option only takes effect when the <smbconfoption name="security"/> option is set to 
diff --git a/docs-xml/smbdotconf/security/authmethods.xml b/docs-xml/smbdotconf/security/authmethods.xml
index 813c4cb..a5e3a11 100644
--- a/docs-xml/smbdotconf/security/authmethods.xml
+++ b/docs-xml/smbdotconf/security/authmethods.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="auth methods"
                  context="G"
-				 type="list"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="list"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
     <para>
diff --git a/docs-xml/smbdotconf/security/checkpasswordscript.xml b/docs-xml/smbdotconf/security/checkpasswordscript.xml
index 7399744..e2079c2 100644
--- a/docs-xml/smbdotconf/security/checkpasswordscript.xml
+++ b/docs-xml/smbdotconf/security/checkpasswordscript.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="check password script"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The name of a program that can be used to check password
diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 4147f34..c026b8f 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="client lanman auth"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not <citerefentry><refentrytitle>smbclient</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/clientntlmv2auth.xml b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
index d0f0a37..531c8fc 100644
--- a/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+++ b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="client NTLMv2 auth"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not <citerefentry><refentrytitle>smbclient</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/clientplaintextauth.xml b/docs-xml/smbdotconf/security/clientplaintextauth.xml
index f640416..1c4d356 100644
--- a/docs-xml/smbdotconf/security/clientplaintextauth.xml
+++ b/docs-xml/smbdotconf/security/clientplaintextauth.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="client plaintext auth"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies whether a client should send a plaintext 
 		password if the server does not support encrypted passwords.</para>
diff --git a/docs-xml/smbdotconf/security/clientschannel.xml b/docs-xml/smbdotconf/security/clientschannel.xml
index 62a47fe..2946a07 100644
--- a/docs-xml/smbdotconf/security/clientschannel.xml
+++ b/docs-xml/smbdotconf/security/clientschannel.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="client schannel"
                  context="G"
-				 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
     <para>
diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
index 60b8ffe..aa5b04c 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="client signing"
                  context="G"
-				 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
     are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
diff --git a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
index 1d8214e..c067f35 100644
--- a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
+++ b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="client use spnego principal"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not
diff --git a/docs-xml/smbdotconf/security/createmask.xml b/docs-xml/smbdotconf/security/createmask.xml
index 22dc5eb..8b38be4 100644
--- a/docs-xml/smbdotconf/security/createmask.xml
+++ b/docs-xml/smbdotconf/security/createmask.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="create mask"
                  context="S"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <synonym>create mode</synonym>
diff --git a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
index c8d6c2d..d516315 100644
--- a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
+++ b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
@@ -1,4 +1,6 @@
-<samba:parameter name="dedicated keytab file" context="G" type="string"
+<samba:parameter name="dedicated keytab file"
+                 context="G"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/directorymask.xml b/docs-xml/smbdotconf/security/directorymask.xml
index 6a3d2f7..50305d9 100644
--- a/docs-xml/smbdotconf/security/directorymask.xml
+++ b/docs-xml/smbdotconf/security/directorymask.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="directory mask"
-	context="S"
-	type="integer"
+                 context="S"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>directory mode</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/directorysecuritymask.xml b/docs-xml/smbdotconf/security/directorysecuritymask.xml
index ad208f4..f02e4ff 100644
--- a/docs-xml/smbdotconf/security/directorysecuritymask.xml
+++ b/docs-xml/smbdotconf/security/directorysecuritymask.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="directory security mask"
-		 context="S"
-		 removed="1"
-		 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 removed="1"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This parameter has been removed for Samba 4.0.0.
diff --git a/docs-xml/smbdotconf/security/encryptpasswords.xml b/docs-xml/smbdotconf/security/encryptpasswords.xml
index 4b7d50e..4bd9780 100644
--- a/docs-xml/smbdotconf/security/encryptpasswords.xml
+++ b/docs-xml/smbdotconf/security/encryptpasswords.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="encrypt passwords"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean controls whether encrypted passwords 
     will be negotiated with the client. Note that Windows NT 4.0 SP3 and 
diff --git a/docs-xml/smbdotconf/security/forcedirectorymode.xml b/docs-xml/smbdotconf/security/forcedirectorymode.xml
index c28f84a..9d2fdfc 100644
--- a/docs-xml/smbdotconf/security/forcedirectorymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorymode.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force directory mode"
                  context="S"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter specifies a set of UNIX mode bit 
diff --git a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
index a45395d..fbd8e16 100644
--- a/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
+++ b/docs-xml/smbdotconf/security/forcedirectorysecuritymode.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="force directory security mode"
-		 context="S"
-		 type="string"
-		 removed="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="S"
+                 type="string"
+                 removed="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This parameter has been removed for Samba 4.0.0.
diff --git a/docs-xml/smbdotconf/security/forcegroup.xml b/docs-xml/smbdotconf/security/forcegroup.xml
index f6c9974..d101f1c 100644
--- a/docs-xml/smbdotconf/security/forcegroup.xml
+++ b/docs-xml/smbdotconf/security/forcegroup.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force group"
                  context="S"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>group</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/forceunknownacluser.xml b/docs-xml/smbdotconf/security/forceunknownacluser.xml
index 4c0949f..c5aec53 100644
--- a/docs-xml/smbdotconf/security/forceunknownacluser.xml
+++ b/docs-xml/smbdotconf/security/forceunknownacluser.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="force unknown acl user"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
diff --git a/docs-xml/smbdotconf/security/forceuser.xml b/docs-xml/smbdotconf/security/forceuser.xml
index f1ec5d4..ff5c7a2 100644
--- a/docs-xml/smbdotconf/security/forceuser.xml
+++ b/docs-xml/smbdotconf/security/forceuser.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="force user"
-				 type="string"
+                 type="string"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/guestaccount.xml b/docs-xml/smbdotconf/security/guestaccount.xml
index 905e795..c5dbbd9 100644
--- a/docs-xml/smbdotconf/security/guestaccount.xml
+++ b/docs-xml/smbdotconf/security/guestaccount.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="guest account"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a username which will be used for access 
     to services which are specified as <smbconfoption name="guest ok"/> (see below). Whatever privileges this 
diff --git a/docs-xml/smbdotconf/security/guestok.xml b/docs-xml/smbdotconf/security/guestok.xml
index 7a07ff1..390f1c3 100644
--- a/docs-xml/smbdotconf/security/guestok.xml
+++ b/docs-xml/smbdotconf/security/guestok.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="guest ok"
-				 type="boolean"
+                 type="boolean"
                  context="S"
-				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>public</synonym>
 <description>
     <para>If this parameter is <constant>yes</constant> for 
diff --git a/docs-xml/smbdotconf/security/guestonly.xml b/docs-xml/smbdotconf/security/guestonly.xml
index 258eba9..5660162 100644
--- a/docs-xml/smbdotconf/security/guestonly.xml
+++ b/docs-xml/smbdotconf/security/guestonly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="guest only"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>only guest</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/hostsallow.xml b/docs-xml/smbdotconf/security/hostsallow.xml
index 35be404..d210277 100644
--- a/docs-xml/smbdotconf/security/hostsallow.xml
+++ b/docs-xml/smbdotconf/security/hostsallow.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hosts allow"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>allow hosts</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/hostsdeny.xml b/docs-xml/smbdotconf/security/hostsdeny.xml
index 2421a4e..2c8504f 100644
--- a/docs-xml/smbdotconf/security/hostsdeny.xml
+++ b/docs-xml/smbdotconf/security/hostsdeny.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="hosts deny"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>deny hosts</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/inheritacls.xml b/docs-xml/smbdotconf/security/inheritacls.xml
index e2552e3..4c6caef 100644
--- a/docs-xml/smbdotconf/security/inheritacls.xml
+++ b/docs-xml/smbdotconf/security/inheritacls.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="inherit acls"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter can be used to ensure that if default acls
diff --git a/docs-xml/smbdotconf/security/inheritowner.xml b/docs-xml/smbdotconf/security/inheritowner.xml
index 0ed8285..ab7da57 100644
--- a/docs-xml/smbdotconf/security/inheritowner.xml
+++ b/docs-xml/smbdotconf/security/inheritowner.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="inherit owner"
                  context="S"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>The ownership of new files and directories 
diff --git a/docs-xml/smbdotconf/security/inheritpermissions.xml b/docs-xml/smbdotconf/security/inheritpermissions.xml
index 6e09f4f..9dda734 100644
--- a/docs-xml/smbdotconf/security/inheritpermissions.xml
+++ b/docs-xml/smbdotconf/security/inheritpermissions.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="inherit permissions"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/invalidusers.xml b/docs-xml/smbdotconf/security/invalidusers.xml
index f4ed66f..9674465 100644
--- a/docs-xml/smbdotconf/security/invalidusers.xml
+++ b/docs-xml/smbdotconf/security/invalidusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="invalid users"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a list of users that should not be allowed 
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
index a4948f2..c529e14 100644
--- a/docs-xml/smbdotconf/security/kerberosmethod.xml
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -1,4 +1,6 @@
-<samba:parameter name="kerberos method" context="G" type="enum"
+<samba:parameter name="kerberos method"
+                 context="G"
+                 type="enum"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/security/kpasswdport.xml b/docs-xml/smbdotconf/security/kpasswdport.xml
index 0555e78..71cd337 100644
--- a/docs-xml/smbdotconf/security/kpasswdport.xml
+++ b/docs-xml/smbdotconf/security/kpasswdport.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="kpasswd port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which ports the Kerberos server should listen on for
diff --git a/docs-xml/smbdotconf/security/krb5port.xml b/docs-xml/smbdotconf/security/krb5port.xml
index 6c4f0a8..06c7988 100644
--- a/docs-xml/smbdotconf/security/krb5port.xml
+++ b/docs-xml/smbdotconf/security/krb5port.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="krb5 port"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies which port the KDC should listen on for Kerberos traffic.</para>
diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index 44d18c4..ca34067 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="lanman auth"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/maptoguest.xml b/docs-xml/smbdotconf/security/maptoguest.xml
index 2e4c634..a3033fa 100644
--- a/docs-xml/smbdotconf/security/maptoguest.xml
+++ b/docs-xml/smbdotconf/security/maptoguest.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="map to guest"
-				 type="enum"
+                 type="enum"
                  context="G"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter can take four different values, which tell
     <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
index 69f4d82..126411a 100644
--- a/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
+++ b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="map untrusted to domain"
                  context="G"
-		 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
     If a client connects to smbd using an untrusted domain name, such as
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml b/docs-xml/smbdotconf/security/ntlmauth.xml
index a39f9e5..6af1908 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="ntlm auth"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/nullpasswords.xml b/docs-xml/smbdotconf/security/nullpasswords.xml
index 3d7b2ad..36f66c2 100644
--- a/docs-xml/smbdotconf/security/nullpasswords.xml
+++ b/docs-xml/smbdotconf/security/nullpasswords.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="null passwords"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Allow or disallow client access to accounts that have null passwords. </para>
 
diff --git a/docs-xml/smbdotconf/security/obeypamrestrictions.xml b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
index e4b2b6c..92708ef 100644
--- a/docs-xml/smbdotconf/security/obeypamrestrictions.xml
+++ b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="obey pam restrictions"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>When Samba 3.0 is configured to enable PAM support
     (i.e. --with-pam), this parameter will control whether or not Samba
diff --git a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
index 718cd32..9cb607b 100644
--- a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
+++ b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="old password allowed period"
                  context="G"
-				 type="integer"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="integer"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Number of minutes to permit an NTLM login after a password change or reset using the old password.  This allows the user to re-cache the new password on multiple clients without disrupting a network reconnection in the meantime. </para>
 
diff --git a/docs-xml/smbdotconf/security/onlyuser.xml b/docs-xml/smbdotconf/security/onlyuser.xml
index ed1bbd5..c18608e 100644
--- a/docs-xml/smbdotconf/security/onlyuser.xml
+++ b/docs-xml/smbdotconf/security/onlyuser.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="only user"
-					type="boolean"
+                 type="boolean"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/pampasswordchange.xml b/docs-xml/smbdotconf/security/pampasswordchange.xml
index 973a10b..92ab4ad 100644
--- a/docs-xml/smbdotconf/security/pampasswordchange.xml
+++ b/docs-xml/smbdotconf/security/pampasswordchange.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="pam password change"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>With the addition of better PAM support in Samba 2.2, 
     this parameter, it is possible to use PAM's password change control 
diff --git a/docs-xml/smbdotconf/security/passdbbackend.xml b/docs-xml/smbdotconf/security/passdbbackend.xml
index 4f5321d..3e378bd 100644
--- a/docs-xml/smbdotconf/security/passdbbackend.xml
+++ b/docs-xml/smbdotconf/security/passdbbackend.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="passdb backend"
                  context="G"
-		 type="string"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
     <para>This option allows the administrator to chose which backend
diff --git a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
index 778a390..41c8ea0 100644
--- a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
+++ b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="passdb expand explicit"
                  context="G"
-				 type="boolean"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This parameter controls whether Samba substitutes %-macros in the passdb fields if they are explicitly set. We
diff --git a/docs-xml/smbdotconf/security/passwdchatdebug.xml b/docs-xml/smbdotconf/security/passwdchatdebug.xml
index 9046f20..0c3481e 100644
--- a/docs-xml/smbdotconf/security/passwdchatdebug.xml
+++ b/docs-xml/smbdotconf/security/passwdchatdebug.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="passwd chat debug"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean specifies if the passwd chat script 
diff --git a/docs-xml/smbdotconf/security/passwdchattimeout.xml b/docs-xml/smbdotconf/security/passwdchattimeout.xml
index 07374ff..74e8688 100644
--- a/docs-xml/smbdotconf/security/passwdchattimeout.xml
+++ b/docs-xml/smbdotconf/security/passwdchattimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="passwd chat timeout"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This integer specifies the number of seconds smbd will wait for an initial
diff --git a/docs-xml/smbdotconf/security/passwdprogram.xml b/docs-xml/smbdotconf/security/passwdprogram.xml
index 94649e2..8141048 100644
--- a/docs-xml/smbdotconf/security/passwdprogram.xml
+++ b/docs-xml/smbdotconf/security/passwdprogram.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="passwd program"
                  context="G"
-				 type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
     <para>The name of a program that can be used to set 
     UNIX user passwords.  Any occurrences of <parameter moreinfo="none">%u</parameter> 
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index e01adb6..a62494b 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="password server"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>By specifying the name of a domain controller with this option,
     and using <command moreinfo="none">security = [ads|domain]</command>
diff --git a/docs-xml/smbdotconf/security/preloadmodules.xml b/docs-xml/smbdotconf/security/preloadmodules.xml
index 44eb467..ad0df45 100644
--- a/docs-xml/smbdotconf/security/preloadmodules.xml
+++ b/docs-xml/smbdotconf/security/preloadmodules.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="preload modules"
-		type="list"
-		 context="G"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="list"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a list of paths to modules that should
 	be loaded into smbd before a client connects. This improves
diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml
index 4189f6b..58be372 100644
--- a/docs-xml/smbdotconf/security/privatedir.xml
+++ b/docs-xml/smbdotconf/security/privatedir.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="private dir"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>private directory</synonym>
 <description>
     <para>This parameters defines the directory
diff --git a/docs-xml/smbdotconf/security/readlist.xml b/docs-xml/smbdotconf/security/readlist.xml
index c874fef..6ac0b3c 100644
--- a/docs-xml/smbdotconf/security/readlist.xml
+++ b/docs-xml/smbdotconf/security/readlist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="read list"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/readonly.xml b/docs-xml/smbdotconf/security/readonly.xml
index f587f67..b6fdda6 100644
--- a/docs-xml/smbdotconf/security/readonly.xml
+++ b/docs-xml/smbdotconf/security/readonly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="read only"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>write ok</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/renameuserscript.xml b/docs-xml/smbdotconf/security/renameuserscript.xml
index 472a4a3..1a15eba 100644
--- a/docs-xml/smbdotconf/security/renameuserscript.xml
+++ b/docs-xml/smbdotconf/security/renameuserscript.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="rename user script"
                  context="G"
-				 type="string"
-				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This is the full pathname to a script that will be run as root by <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/security/restrictanonymous.xml b/docs-xml/smbdotconf/security/restrictanonymous.xml
index ffea693..78cafd2 100644
--- a/docs-xml/smbdotconf/security/restrictanonymous.xml
+++ b/docs-xml/smbdotconf/security/restrictanonymous.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="restrict anonymous"
-	type="integer"
+                 type="integer"
                  context="G"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/rootdirectory.xml b/docs-xml/smbdotconf/security/rootdirectory.xml
index d5a071e..e795af2 100644
--- a/docs-xml/smbdotconf/security/rootdirectory.xml
+++ b/docs-xml/smbdotconf/security/rootdirectory.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="root directory"
-	context="G"
-	type="string"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 context="G"
+                 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>root</synonym>
 <synonym>root dir</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index ac248d0..2e6ec63 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -1,11 +1,11 @@
 <samba:parameter name="security"
                  context="G"
-				 type="enum"
+                 type="enum"
                  function="_security"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-		 <when_value value="security">
-			 <requires option="encrypted passwords">/(yes|true)/</requires>
-		 </when_value>
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<when_value value="security">
+    <requires option="encrypted passwords">/(yes|true)/</requires>
+</when_value>
 <description>
     <para>This option affects how clients respond to 
     Samba and is one of the most important settings in the <filename moreinfo="none">
diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml
index e6ff399..fc3d183 100644
--- a/docs-xml/smbdotconf/security/serverrole.xml
+++ b/docs-xml/smbdotconf/security/serverrole.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="server role"
                  context="G"
-				 type="enum"
+                 type="enum"
                  function="_server_role"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option determines the basic operating mode of a Samba
     server and is one of the most important settings in the <filename
diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index aee63cc..6ed6c4d 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="server schannel"
                  context="G"
-				 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
 	This controls whether the server offers or even demands the use of the netlogon schannel.
diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
index 9fdb833..e52214b 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="server signing"
                  context="G"
-				 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
     <para>This controls whether the client is allowed or required to use SMB1 and SMB2 signing. Possible values
diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index b44ed9a..6236562 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="smb encrypt"
                  context="S"
-				 type="enum"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 type="enum"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
 	This parameter controls whether a remote client is allowed or required
diff --git a/docs-xml/smbdotconf/security/smbpasswdfile.xml b/docs-xml/smbdotconf/security/smbpasswdfile.xml
index 7ca8584..a906403 100644
--- a/docs-xml/smbdotconf/security/smbpasswdfile.xml
+++ b/docs-xml/smbdotconf/security/smbpasswdfile.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="smb passwd file"
-	type="string"
+                 type="string"
                  context="G"
                  constant="1"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option sets the path to the encrypted smbpasswd file. By
     default the path to the smbpasswd file  is compiled into Samba.</para>
diff --git a/docs-xml/smbdotconf/security/unixpasswordsync.xml b/docs-xml/smbdotconf/security/unixpasswordsync.xml
index d88254b..321ece5 100644
--- a/docs-xml/smbdotconf/security/unixpasswordsync.xml
+++ b/docs-xml/smbdotconf/security/unixpasswordsync.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="unix password sync"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean parameter controls whether Samba 
diff --git a/docs-xml/smbdotconf/security/username.xml b/docs-xml/smbdotconf/security/username.xml
index a85076c..ec064bd 100644
--- a/docs-xml/smbdotconf/security/username.xml
+++ b/docs-xml/smbdotconf/security/username.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="username"
-	context="S"
-	type="string"
+                 context="S"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>user</synonym>
 <synonym>users</synonym>
diff --git a/docs-xml/smbdotconf/security/usernamelevel.xml b/docs-xml/smbdotconf/security/usernamelevel.xml
index d2cdb5b..f5248c0 100644
--- a/docs-xml/smbdotconf/security/usernamelevel.xml
+++ b/docs-xml/smbdotconf/security/usernamelevel.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="username level"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option helps Samba to try and 'guess' at 
diff --git a/docs-xml/smbdotconf/security/usernamemap.xml b/docs-xml/smbdotconf/security/usernamemap.xml
index c5a15d0..8867ea6 100644
--- a/docs-xml/smbdotconf/security/usernamemap.xml
+++ b/docs-xml/smbdotconf/security/usernamemap.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="username map"
                  context="G"
-				 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/usernamemapcachetime.xml b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
index 16aaaaf..974026c 100644
--- a/docs-xml/smbdotconf/security/usernamemapcachetime.xml
+++ b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="username map cache time"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 2e43a78..0edd4eb 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="username map script"
                  context="G"
-		 type="string"
+                 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This script is a mutually exclusive alternative to the 
diff --git a/docs-xml/smbdotconf/security/validusers.xml b/docs-xml/smbdotconf/security/validusers.xml
index ec3e11e..713c466 100644
--- a/docs-xml/smbdotconf/security/validusers.xml
+++ b/docs-xml/smbdotconf/security/validusers.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="valid users"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index 8c0e12e..d065842 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="writeable"
                  context="S"
-				 type="boolean"
+                 type="boolean"
                  synonym="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>writable</synonym>
diff --git a/docs-xml/smbdotconf/security/writelist.xml b/docs-xml/smbdotconf/security/writelist.xml
index c17db81..08ce2fa 100644
--- a/docs-xml/smbdotconf/security/writelist.xml
+++ b/docs-xml/smbdotconf/security/writelist.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="write list"
                  context="S"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/winbind/createkrb5conf.xml b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
index bb2d300..4054034 100644
--- a/docs-xml/smbdotconf/winbind/createkrb5conf.xml
+++ b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="create krb5 conf"
-	context="G"
-	type="boolean"
+                 context="G"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml
index a554741..9743f5d 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="idmap backend"
                  context="G"
-		 type="string"
+                 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
index 4fe6536..87c6c56 100644
--- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="idmap cache time"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of seconds that Winbind's
diff --git a/docs-xml/smbdotconf/winbind/idmapgid.xml b/docs-xml/smbdotconf/winbind/idmapgid.xml
index b5652b8..24e5fcd 100644
--- a/docs-xml/smbdotconf/winbind/idmapgid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapgid.xml
@@ -1,9 +1,9 @@
 <samba:parameter name="idmap gid"
                  context="G"
-		 type="string"
+                 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-		<synonym>winbind gid</synonym>
+<synonym>winbind gid</synonym>
 <description>
 	<para>
 	The idmap gid parameter specifies the range of group ids
diff --git a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
index 76f538a..32c4e1f 100644
--- a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="idmap negative cache time"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of seconds that Winbind's
diff --git a/docs-xml/smbdotconf/winbind/idmapuid.xml b/docs-xml/smbdotconf/winbind/idmapuid.xml
index f72929c..e85cb9b 100644
--- a/docs-xml/smbdotconf/winbind/idmapuid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapuid.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="idmap uid"
-			 type="string"
+                 type="string"
                  context="G"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/winbind/templatehomedir.xml b/docs-xml/smbdotconf/winbind/templatehomedir.xml
index 2afa6b3..cbf391c 100644
--- a/docs-xml/smbdotconf/winbind/templatehomedir.xml
+++ b/docs-xml/smbdotconf/winbind/templatehomedir.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="template homedir"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/templateshell.xml b/docs-xml/smbdotconf/winbind/templateshell.xml
index 0844bdf..21e44e6 100644
--- a/docs-xml/smbdotconf/winbind/templateshell.xml
+++ b/docs-xml/smbdotconf/winbind/templateshell.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="template shell"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/winbindcachetime.xml b/docs-xml/smbdotconf/winbind/winbindcachetime.xml
index 3ff8089..2f69de3 100644
--- a/docs-xml/smbdotconf/winbind/winbindcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/winbindcachetime.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind cache time"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of 
diff --git a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
index 4d7b5e6..c3339e1 100644
--- a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind enum groups"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>On large installations using <citerefentry><refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
index 73c1464..941ba04 100644
--- a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind expand groups"
                  context="G"
-		 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls the maximum depth that winbindd
diff --git a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
index c11d0b6..847a588 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind max clients"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the maximum number of clients
diff --git a/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml b/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
index c279244..c764267 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
@@ -1,8 +1,8 @@
 <samba:parameter name="winbind max domain connections"
-		 context="G"
-		 type="integer"
+                 context="G"
+                 type="integer"
                  generated_function="0"
-		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the maximum number of simultaneous
 	connections that the <citerefentry><refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
index 8a8bc54..a4a03eb 100644
--- a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind nested groups"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>If set to yes, this parameter activates the support for nested
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index 8339cbf..362f488 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind normalize names"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether winbindd will replace
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index 6b09be0..5ec9ed6 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind nss info"
                  context="G"
-				 type="list"
+                 type="list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml b/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
index 1a5b522..33fb318 100644
--- a/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
+++ b/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind offline logon"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
index 11d105c..f26fd5e 100644
--- a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
+++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind reconnect delay"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of
diff --git a/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml b/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
index 00c65df..f6bb738 100644
--- a/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind refresh tickets"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml b/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
index d6c9e08..8c7ec56 100644
--- a/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind request timeout"
                  context="G"
-				 type="integer"
+                 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the number of
diff --git a/docs-xml/smbdotconf/winbind/winbindrpconly.xml b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
index 3019e71..50795ac 100644
--- a/docs-xml/smbdotconf/winbind/winbindrpconly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind rpc only"
-	context="G"
-	type="boolean"
+                 context="G"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindseparator.xml b/docs-xml/smbdotconf/winbind/winbindseparator.xml
index 8c4a11a..1c1632f 100644
--- a/docs-xml/smbdotconf/winbind/winbindseparator.xml
+++ b/docs-xml/smbdotconf/winbind/winbindseparator.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind separator"
                  context="G"
-				 type="string"
+                 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
index 629832c..3d420c7 100644
--- a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind trusted domains only"
                  context="G"
-		 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
index 8278aa5..186398e 100644
--- a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
+++ b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="winbind use default domain"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies whether the
diff --git a/docs-xml/smbdotconf/wins/dnsproxy.xml b/docs-xml/smbdotconf/wins/dnsproxy.xml
index 6b3c198..75d4446 100644
--- a/docs-xml/smbdotconf/wins/dnsproxy.xml
+++ b/docs-xml/smbdotconf/wins/dnsproxy.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="dns proxy"
                  context="G"
-				 type="boolean"
+                 type="boolean"
                  function="wins_dns_proxy"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-- 
2.4.3


From 265504d28fa8f8527ebbfe981212a44561bdbec6 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 13 May 2015 11:49:39 +0200
Subject: [PATCH 05/12] docs:smbdotconf: fix type of "preferred master"
 parameter.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/browse/preferredmaster.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index 30a59e8..d30c7f5 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="preferred master"
                  context="G"
-                 type="boolean-auto"
+                 type="enum"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>prefered master</synonym>
-- 
2.4.3


From 50323ab622d33a240fb2aa0d8625a2f00e67d05c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 14 May 2015 16:31:52 +0200
Subject: [PATCH 06/12] docs:smbdotconf: fix context of 'include' in doc

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/misc/include.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index a674ade..79c2e6c 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="include"
-                 context="G"
+                 context="S"
                  type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-- 
2.4.3


From 81b5dcb931e13050f2499f3c789b3c06d727e69c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 20 May 2015 10:44:17 +0200
Subject: [PATCH 07/12] docs:smbdotconf: fix type to bool-rev for reverse
 synonyms.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/printing/enablespoolss.xml | 2 +-
 docs-xml/smbdotconf/security/writeable.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs-xml/smbdotconf/printing/enablespoolss.xml b/docs-xml/smbdotconf/printing/enablespoolss.xml
index e721cdf..d69f8f4 100644
--- a/docs-xml/smbdotconf/printing/enablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/enablespoolss.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="enable spoolss"
                  context="G"
-                 type="boolean"
+                 type="boolean-rev"
                  synonym="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index d065842..2bf7070 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="writeable"
                  context="S"
-                 type="boolean"
+                 type="boolean-rev"
                  synonym="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>writable</synonym>
-- 
2.4.3


From 93b7d49d95e2511ad4a0231a2c2d37e1824bcca2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Wed, 29 Apr 2015 01:33:03 +0200
Subject: [PATCH 08/12] docs:smbdotconf: add param flag 'synonym' to the DTD

It is already used in the param_table.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/build/DTD/samba-doc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index 06aa02a..43b01d3 100644
--- a/docs-xml/build/DTD/samba-doc
+++ b/docs-xml/build/DTD/samba-doc
@@ -42,6 +42,7 @@
 	name CDATA #REQUIRED
 	type CDATA #REQUIRED
 	context CDATA #REQUIRED
+	synonym CDATA #IMPLIED
 >
 <!ELEMENT description ANY>
 <!ELEMENT synonym (#PCDATA)>
-- 
2.4.3


From d8c0c94ee971f526f71087fb1e31d89e5a7e93de Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 12 May 2015 12:24:46 +0200
Subject: [PATCH 09/12] docs:smbdotconf: add param flags 'handler' and
 'deprecated' to the DTD

These are already used in the docs.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/build/DTD/samba-doc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index 43b01d3..d23a686 100644
--- a/docs-xml/build/DTD/samba-doc
+++ b/docs-xml/build/DTD/samba-doc
@@ -43,6 +43,8 @@
 	type CDATA #REQUIRED
 	context CDATA #REQUIRED
 	synonym CDATA #IMPLIED
+	handler CDATA #IMPLIED
+	deprecated CDATA #IMPLIED
 >
 <!ELEMENT description ANY>
 <!ELEMENT synonym (#PCDATA)>
-- 
2.4.3


From fc94eab8f3cbb6bdbf8db60ccd5078ba13ada1ab Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 12 May 2015 10:07:10 +0200
Subject: [PATCH 10/12] docs:smbdotconf: add handler info to smbdotconf docs
 where missing

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/base/doscharset.xml        | 1 +
 docs-xml/smbdotconf/base/netbiosaliases.xml    | 1 +
 docs-xml/smbdotconf/base/realm.xml             | 1 +
 docs-xml/smbdotconf/base/unixcharset.xml       | 1 +
 docs-xml/smbdotconf/logging/ldapdebuglevel.xml | 1 +
 docs-xml/smbdotconf/logging/logfile.xml        | 1 +
 docs-xml/smbdotconf/logging/loglevel.xml       | 1 +
 docs-xml/smbdotconf/misc/copy.xml              | 1 +
 docs-xml/smbdotconf/misc/include.xml           | 1 +
 docs-xml/smbdotconf/printing/printing.xml      | 1 +
 docs-xml/smbdotconf/winbind/idmapbackend.xml   | 1 +
 docs-xml/smbdotconf/winbind/idmapgid.xml       | 1 +
 docs-xml/smbdotconf/winbind/idmapuid.xml       | 1 +
 13 files changed, 13 insertions(+)

diff --git a/docs-xml/smbdotconf/base/doscharset.xml b/docs-xml/smbdotconf/base/doscharset.xml
index e0939d2..c99b840 100644
--- a/docs-xml/smbdotconf/base/doscharset.xml
+++ b/docs-xml/smbdotconf/base/doscharset.xml
@@ -2,6 +2,7 @@
                  type="string"
                  context="G"
                  constant="1"
+                 handler="handle_dos_charset"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>DOS SMB clients assume the server has 
diff --git a/docs-xml/smbdotconf/base/netbiosaliases.xml b/docs-xml/smbdotconf/base/netbiosaliases.xml
index 3f33463..089cff8 100644
--- a/docs-xml/smbdotconf/base/netbiosaliases.xml
+++ b/docs-xml/smbdotconf/base/netbiosaliases.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="netbios aliases"
                  context="G"
                  type="list"
+                 handler="handle_netbios_aliases"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
         <para>This is a list of NetBIOS names that nmbd will 
diff --git a/docs-xml/smbdotconf/base/realm.xml b/docs-xml/smbdotconf/base/realm.xml
index e28909c..8499c78 100644
--- a/docs-xml/smbdotconf/base/realm.xml
+++ b/docs-xml/smbdotconf/base/realm.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  constant="1"
+                 handler="handle_realm"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>This option specifies the kerberos realm to use. The realm is 
diff --git a/docs-xml/smbdotconf/base/unixcharset.xml b/docs-xml/smbdotconf/base/unixcharset.xml
index 3122f11..06754a4 100644
--- a/docs-xml/smbdotconf/base/unixcharset.xml
+++ b/docs-xml/smbdotconf/base/unixcharset.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  constant="1"
+                 handler="handle_charset"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>Specifies the charset the unix machine 
diff --git a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
index 1b75bb9..2092b7d 100644
--- a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap debug level"
                  type="integer"
                  context="G"
+                 handler="handle_ldap_debug_level"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logging/logfile.xml b/docs-xml/smbdotconf/logging/logfile.xml
index 9b258cc..eb751cb 100644
--- a/docs-xml/smbdotconf/logging/logfile.xml
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  function="logfile"
+                 handler="handle_logfile"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
index d642b50..07b9b8c 100644
--- a/docs-xml/smbdotconf/logging/loglevel.xml
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="log level"
                  type="string"
                  context="G"
+                 handler="handle_debug_list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>debuglevel</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/misc/copy.xml b/docs-xml/smbdotconf/misc/copy.xml
index 945f2c9..53e899e 100644
--- a/docs-xml/smbdotconf/misc/copy.xml
+++ b/docs-xml/smbdotconf/misc/copy.xml
@@ -2,6 +2,7 @@
                  type="string"
                  context="S"
                  generated_function="0"
+                 handler="handle_copy"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter allows you to "clone" service 
diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index 79c2e6c..cbda1ed 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -2,6 +2,7 @@
                  context="S"
                  type="string"
                  generated_function="0"
+                 handler="handle_include"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index 95d5da7..86f8efb 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="printing"
                  context="S"
                  type="enum"
+                 handler="handle_printing"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameters controls how printer status  information is
diff --git a/docs-xml/smbdotconf/winbind/idmapbackend.xml b/docs-xml/smbdotconf/winbind/idmapbackend.xml
index 9743f5d..410be8e 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  generated_function="0"
+                 handler="handle_idmap_backend"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/winbind/idmapgid.xml b/docs-xml/smbdotconf/winbind/idmapgid.xml
index 24e5fcd..62dcd58 100644
--- a/docs-xml/smbdotconf/winbind/idmapgid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapgid.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  generated_function="0"
+                 handler="handle_idmap_gid"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>winbind gid</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/winbind/idmapuid.xml b/docs-xml/smbdotconf/winbind/idmapuid.xml
index e85cb9b..1e7bc35 100644
--- a/docs-xml/smbdotconf/winbind/idmapuid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapuid.xml
@@ -2,6 +2,7 @@
                  type="string"
                  context="G"
                  generated_function="0"
+                 handler="handle_idmap_uid"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>winbind uid</synonym>
 <description>
-- 
2.4.3


From 5d765bf29fb57d5e90034bd33b1257799c01c5c4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 21 Jul 2015 09:43:23 +0200
Subject: [PATCH 11/12] docs:smbdotconf: add param flag 'enumlist' to the DTD

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/build/DTD/samba-doc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs-xml/build/DTD/samba-doc b/docs-xml/build/DTD/samba-doc
index d23a686..afde348 100644
--- a/docs-xml/build/DTD/samba-doc
+++ b/docs-xml/build/DTD/samba-doc
@@ -45,6 +45,7 @@
 	synonym CDATA #IMPLIED
 	handler CDATA #IMPLIED
 	deprecated CDATA #IMPLIED
+	enumlist CDATA #IMPLIED
 >
 <!ELEMENT description ANY>
 <!ELEMENT synonym (#PCDATA)>
-- 
2.4.3


From 9414b9d893706d8a9f3abaf9ba6ec6bef9bcd0e5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Tue, 28 Apr 2015 11:46:21 +0200
Subject: [PATCH 12/12] docs:smbdotconf: add enumlist property to parameters
 where missing

Signed-off-by: Michael Adam <obnox at samba.org>
---
 docs-xml/smbdotconf/base/configbackend.xml          | 1 +
 docs-xml/smbdotconf/browse/domainmaster.xml         | 1 +
 docs-xml/smbdotconf/browse/lmannounce.xml           | 1 +
 docs-xml/smbdotconf/browse/preferredmaster.xml      | 1 +
 docs-xml/smbdotconf/domain/allowdnsupdates.xml      | 1 +
 docs-xml/smbdotconf/filename/casesensitive.xml      | 1 +
 docs-xml/smbdotconf/filename/defaultcase.xml        | 1 +
 docs-xml/smbdotconf/filename/mapreadonly.xml        | 1 +
 docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml | 1 +
 docs-xml/smbdotconf/ldap/ldapderef.xml              | 1 +
 docs-xml/smbdotconf/ldap/ldapfollowreferral.xml     | 1 +
 docs-xml/smbdotconf/ldap/ldappasswdsync.xml         | 1 +
 docs-xml/smbdotconf/ldap/ldapssl.xml                | 1 +
 docs-xml/smbdotconf/locking/cscpolicy.xml           | 1 +
 docs-xml/smbdotconf/locking/strictlocking.xml       | 1 +
 docs-xml/smbdotconf/misc/smbdprofilinglevel.xml     | 1 +
 docs-xml/smbdotconf/printing/cupsencrypt.xml        | 1 +
 docs-xml/smbdotconf/printing/printing.xml           | 1 +
 docs-xml/smbdotconf/protocol/clientmaxprotocol.xml  | 1 +
 docs-xml/smbdotconf/protocol/clientminprotocol.xml  | 1 +
 docs-xml/smbdotconf/protocol/servermaxprotocol.xml  | 1 +
 docs-xml/smbdotconf/protocol/serverminprotocol.xml  | 1 +
 docs-xml/smbdotconf/security/clientschannel.xml     | 1 +
 docs-xml/smbdotconf/security/clientsigning.xml      | 1 +
 docs-xml/smbdotconf/security/kerberosmethod.xml     | 1 +
 docs-xml/smbdotconf/security/maptoguest.xml         | 1 +
 docs-xml/smbdotconf/security/security.xml           | 1 +
 docs-xml/smbdotconf/security/serverrole.xml         | 1 +
 docs-xml/smbdotconf/security/serverschannel.xml     | 1 +
 docs-xml/smbdotconf/security/serversigning.xml      | 1 +
 docs-xml/smbdotconf/security/smbencrypt.xml         | 1 +
 31 files changed, 31 insertions(+)

diff --git a/docs-xml/smbdotconf/base/configbackend.xml b/docs-xml/smbdotconf/base/configbackend.xml
index 35379ed..2237569 100644
--- a/docs-xml/smbdotconf/base/configbackend.xml
+++ b/docs-xml/smbdotconf/base/configbackend.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="config backend"
                  context="G"
                  type="enum"
+                 enumlist="enum_config_backend"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/browse/domainmaster.xml b/docs-xml/smbdotconf/browse/domainmaster.xml
index 7a75865..8817f2b 100644
--- a/docs-xml/smbdotconf/browse/domainmaster.xml
+++ b/docs-xml/smbdotconf/browse/domainmaster.xml
@@ -1,5 +1,6 @@
 <samba:parameter name="domain master"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  context="G"
                  function="_domain_master"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/browse/lmannounce.xml b/docs-xml/smbdotconf/browse/lmannounce.xml
index 8c9e981..1ec5052 100644
--- a/docs-xml/smbdotconf/browse/lmannounce.xml
+++ b/docs-xml/smbdotconf/browse/lmannounce.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="lm announce"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter determines if <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index d30c7f5..0392564 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="preferred master"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>prefered master</synonym>
diff --git a/docs-xml/smbdotconf/domain/allowdnsupdates.xml b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
index 1563d29..6c0a0d0 100644
--- a/docs-xml/smbdotconf/domain/allowdnsupdates.xml
+++ b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="allow dns updates"
                  context="G"
                  type="enum"
+                 enumlist="enum_dns_update_settings"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option determines what kind of updates to the DNS are allowed.
diff --git a/docs-xml/smbdotconf/filename/casesensitive.xml b/docs-xml/smbdotconf/filename/casesensitive.xml
index 3b2b70b..f0e53be 100644
--- a/docs-xml/smbdotconf/filename/casesensitive.xml
+++ b/docs-xml/smbdotconf/filename/casesensitive.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="case sensitive"
                  context="S"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>casesignames</synonym>
 
diff --git a/docs-xml/smbdotconf/filename/defaultcase.xml b/docs-xml/smbdotconf/filename/defaultcase.xml
index ccf8dad..988bad9 100644
--- a/docs-xml/smbdotconf/filename/defaultcase.xml
+++ b/docs-xml/smbdotconf/filename/defaultcase.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="default case"
                  context="S"
                  type="enum"
+                 enumlist="enum_case"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>See the section on <smbconfoption name="name mangling"/>.
diff --git a/docs-xml/smbdotconf/filename/mapreadonly.xml b/docs-xml/smbdotconf/filename/mapreadonly.xml
index d467ec6..54a5e01 100644
--- a/docs-xml/smbdotconf/filename/mapreadonly.xml
+++ b/docs-xml/smbdotconf/filename/mapreadonly.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="map readonly"
                  context="S"
                  type="enum"
+                 enumlist="enum_map_readonly"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
index 5ada783..3152f06 100644
--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="client ldap sasl wrapping"
                  context="G"
                  type="enum"
+                 enumlist="enum_ldap_sasl_wrapping"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldapderef.xml b/docs-xml/smbdotconf/ldap/ldapderef.xml
index 9bddabc..920d1ae 100644
--- a/docs-xml/smbdotconf/ldap/ldapderef.xml
+++ b/docs-xml/smbdotconf/ldap/ldapderef.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap deref"
                  context="G"
                  type="enum"
+                 enumlist="enum_ldap_deref"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
index 0bbdcc6..3130a7b 100644
--- a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap follow referral"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index e3c3c2e..42bc916 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap passwd sync"
                  context="G"
                  type="enum"
+                 enumlist="enum_ldap_passwd_sync"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <synonym>ldap password sync</synonym>
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index ca9b5cb..a50c88e 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap ssl"
                  context="G"
                  type="enum"
+                 enumlist="enum_ldap_ssl"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option is used to define whether or not Samba should
diff --git a/docs-xml/smbdotconf/locking/cscpolicy.xml b/docs-xml/smbdotconf/locking/cscpolicy.xml
index 596529e..511639e 100644
--- a/docs-xml/smbdotconf/locking/cscpolicy.xml
+++ b/docs-xml/smbdotconf/locking/cscpolicy.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="csc policy"
                  context="S"
                  type="enum"
+                 enumlist="enum_csc_policy"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/locking/strictlocking.xml b/docs-xml/smbdotconf/locking/strictlocking.xml
index 563042a..89a1bf7 100644
--- a/docs-xml/smbdotconf/locking/strictlocking.xml
+++ b/docs-xml/smbdotconf/locking/strictlocking.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="strict locking"
                  context="S"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml b/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
index e9f70a2..54dccf0 100644
--- a/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
+++ b/docs-xml/smbdotconf/misc/smbdprofilinglevel.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="smbd profiling level"
                  context="G"
                  type="enum"
+                 enumlist="enum_smbd_profiling_level"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/printing/cupsencrypt.xml b/docs-xml/smbdotconf/printing/cupsencrypt.xml
index f4fc507..db7bf51 100644
--- a/docs-xml/smbdotconf/printing/cupsencrypt.xml
+++ b/docs-xml/smbdotconf/printing/cupsencrypt.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="cups encrypt"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index 86f8efb..2e25621 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="printing"
                  context="S"
                  type="enum"
+                 enumlist="enum_printing"
                  handler="handle_printing"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 449ab18..240ba1a 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="enum"
                  function="_client_max_protocol"
+                 enumlist="enum_protocol"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The value of the parameter (a string) is the highest 
diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index a02cb0e..ac0d460 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="client min protocol"
                  context="G"
                  type="enum"
+                 enumlist="enum_protocol"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This setting controls the minimum protocol version that the
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 217e75a..1dbe602 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="server max protocol"
                  context="G"
                  type="enum"
+                 enumlist="enum_protocol"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The value of the parameter (a string) is the highest 
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 57a3f7b..4765f5b 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="server min protocol"
                  context="G"
                  type="enum"
+                 enumlist="enum_protocol"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>min protocol</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/clientschannel.xml b/docs-xml/smbdotconf/security/clientschannel.xml
index 2946a07..6ab3558 100644
--- a/docs-xml/smbdotconf/security/clientschannel.xml
+++ b/docs-xml/smbdotconf/security/clientschannel.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="client schannel"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
index aa5b04c..2af5ada 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="client signing"
                  context="G"
                  type="enum"
+                 enumlist="enum_smb_signing_vals"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
index c529e14..b7cd988 100644
--- a/docs-xml/smbdotconf/security/kerberosmethod.xml
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="kerberos method"
                  context="G"
                  type="enum"
+                 enumlist="enum_kerberos_method"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/security/maptoguest.xml b/docs-xml/smbdotconf/security/maptoguest.xml
index a3033fa..c98086a 100644
--- a/docs-xml/smbdotconf/security/maptoguest.xml
+++ b/docs-xml/smbdotconf/security/maptoguest.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="map to guest"
                  type="enum"
                  context="G"
+                 enumlist="enum_map_to_guest"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter can take four different values, which tell
diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index 2e6ec63..89e6a45 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="enum"
                  function="_security"
+                 enumlist="enum_security"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <when_value value="security">
     <requires option="encrypted passwords">/(yes|true)/</requires>
diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml
index fc3d183..ce3ef13 100644
--- a/docs-xml/smbdotconf/security/serverrole.xml
+++ b/docs-xml/smbdotconf/security/serverrole.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="enum"
                  function="_server_role"
+                 enumlist="enum_server_role"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option determines the basic operating mode of a Samba
diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index 6ed6c4d..a2dca1b 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="server schannel"
                  context="G"
                  type="enum"
+                 enumlist="enum_bool_auto"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
index e52214b..21b79f0 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="server signing"
                  context="G"
                  type="enum"
+                 enumlist="enum_smb_signing_vals"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index 6236562..0f08966 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="smb encrypt"
                  context="S"
                  type="enum"
+                 enumlist="enum_smb_signing_vals"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
-- 
2.4.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150722/e26806b3/attachment-0001.sig>


More information about the samba-technical mailing list