From 4a6a010e78721624813a84bfefa7a1b80eaf0abb Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 28 Apr 2015 13:59:01 +0200
Subject: [PATCH] docs:smbdotconf: remove swat-specific flags.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
---
 docs-xml/smbdotconf/base/bindinterfacesonly.xml             | 1 -
 docs-xml/smbdotconf/base/comment.xml                        | 1 -
 docs-xml/smbdotconf/base/configbackend.xml                  | 1 -
 docs-xml/smbdotconf/base/doscharset.xml                     | 1 -
 docs-xml/smbdotconf/base/enablecorefiles.xml                | 1 -
 docs-xml/smbdotconf/base/interfaces.xml                     | 1 -
 docs-xml/smbdotconf/base/multicastdnsregister.xml           | 1 -
 docs-xml/smbdotconf/base/netbiosaliases.xml                 | 1 -
 docs-xml/smbdotconf/base/netbiosname.xml                    | 1 -
 docs-xml/smbdotconf/base/netbiosscope.xml                   | 1 -
 docs-xml/smbdotconf/base/path.xml                           | 1 -
 docs-xml/smbdotconf/base/realm.xml                          | 1 -
 docs-xml/smbdotconf/base/serverservices.xml                 | 1 -
 docs-xml/smbdotconf/base/serverstring.xml                   | 1 -
 docs-xml/smbdotconf/base/unixcharset.xml                    | 1 -
 docs-xml/smbdotconf/base/workgroup.xml                      | 1 -
 docs-xml/smbdotconf/browse/browseable.xml                   | 1 -
 docs-xml/smbdotconf/browse/browselist.xml                   | 1 -
 docs-xml/smbdotconf/browse/domainmaster.xml                 | 1 -
 docs-xml/smbdotconf/browse/enhancedbrowsing.xml             | 1 -
 docs-xml/smbdotconf/browse/lmannounce.xml                   | 1 -
 docs-xml/smbdotconf/browse/lminterval.xml                   | 1 -
 docs-xml/smbdotconf/browse/localmaster.xml                  | 1 -
 docs-xml/smbdotconf/browse/oslevel.xml                      | 1 -
 docs-xml/smbdotconf/browse/preferredmaster.xml              | 1 -
 docs-xml/smbdotconf/domain/dnsupdatecommand.xml             | 1 -
 docs-xml/smbdotconf/domain/machinepasswordtimeout.xml       | 1 -
 docs-xml/smbdotconf/domain/nsupdatecommand.xml              | 1 -
 docs-xml/smbdotconf/domain/rndccommand.xml                  | 1 -
 docs-xml/smbdotconf/domain/spnupdatecommand.xml             | 1 -
 docs-xml/smbdotconf/filename/mangleprefix.xml               | 1 -
 docs-xml/smbdotconf/filename/manglingmethod.xml             | 1 -
 docs-xml/smbdotconf/filename/maxstatcachesize.xml           | 1 -
 docs-xml/smbdotconf/filename/statcache.xml                  | 1 -
 docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml         | 1 -
 docs-xml/smbdotconf/ldap/ldapadmindn.xml                    | 1 -
 docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml          | 1 -
 docs-xml/smbdotconf/ldap/ldapdeletedn.xml                   | 1 -
 docs-xml/smbdotconf/ldap/ldapderef.xml                      | 1 -
 docs-xml/smbdotconf/ldap/ldapfollowreferral.xml             | 1 -
 docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml                | 1 -
 docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml                | 1 -
 docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml              | 2 --
 docs-xml/smbdotconf/ldap/ldappagesize.xml                   | 1 -
 docs-xml/smbdotconf/ldap/ldappasswdsync.xml                 | 2 --
 docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml           | 1 -
 docs-xml/smbdotconf/ldap/ldapsameditposix.xml               | 1 -
 docs-xml/smbdotconf/ldap/ldapsamtrusted.xml                 | 1 -
 docs-xml/smbdotconf/ldap/ldapssl.xml                        | 1 -
 docs-xml/smbdotconf/ldap/ldapsslads.xml                     | 1 -
 docs-xml/smbdotconf/ldap/ldapsuffix.xml                     | 1 -
 docs-xml/smbdotconf/ldap/ldaptimeout.xml                    | 1 -
 docs-xml/smbdotconf/ldap/ldapusersuffix.xml                 | 1 -
 docs-xml/smbdotconf/logging/debugclass.xml                  | 1 -
 docs-xml/smbdotconf/logging/debughirestimestamp.xml         | 1 -
 docs-xml/smbdotconf/logging/debugpid.xml                    | 1 -
 docs-xml/smbdotconf/logging/debugprefixtimestamp.xml        | 1 -
 docs-xml/smbdotconf/logging/debugtimestamp.xml              | 1 -
 docs-xml/smbdotconf/logging/debuguid.xml                    | 1 -
 docs-xml/smbdotconf/logging/ldapdebuglevel.xml              | 1 -
 docs-xml/smbdotconf/logging/ldapdebugthreshold.xml          | 1 -
 docs-xml/smbdotconf/logging/logfile.xml                     | 1 -
 docs-xml/smbdotconf/logging/logging.xml                     | 1 -
 docs-xml/smbdotconf/logging/loglevel.xml                    | 1 -
 docs-xml/smbdotconf/logging/maxlogsize.xml                  | 1 -
 docs-xml/smbdotconf/logging/syslog.xml                      | 1 -
 docs-xml/smbdotconf/logging/syslogonly.xml                  | 1 -
 docs-xml/smbdotconf/logon/abortshutdownscript.xml           | 1 -
 docs-xml/smbdotconf/logon/addgroupscript.xml                | 1 -
 docs-xml/smbdotconf/logon/addmachinescript.xml              | 1 -
 docs-xml/smbdotconf/logon/adduserscript.xml                 | 1 -
 docs-xml/smbdotconf/logon/addusertogroupscript.xml          | 1 -
 docs-xml/smbdotconf/logon/allownt4crypto.xml                | 1 -
 docs-xml/smbdotconf/logon/deletegroupscript.xml             | 1 -
 docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml     | 1 -
 docs-xml/smbdotconf/logon/deleteuserscript.xml              | 1 -
 docs-xml/smbdotconf/logon/domainlogons.xml                  | 1 -
 docs-xml/smbdotconf/logon/enableprivileges.xml              | 1 -
 docs-xml/smbdotconf/logon/initlogondelay.xml                | 1 -
 docs-xml/smbdotconf/logon/initlogondelayedhosts.xml         | 1 -
 docs-xml/smbdotconf/logon/logondrive.xml                    | 1 -
 docs-xml/smbdotconf/logon/logonhome.xml                     | 1 -
 docs-xml/smbdotconf/logon/logonpath.xml                     | 1 -
 docs-xml/smbdotconf/logon/logonscript.xml                   | 1 -
 docs-xml/smbdotconf/logon/rejectmd5clients.xml              | 1 -
 docs-xml/smbdotconf/logon/setprimarygroupscript.xml         | 1 -
 docs-xml/smbdotconf/logon/shutdownscript.xml                | 1 -
 docs-xml/smbdotconf/misc/addsharecommand.xml                | 1 -
 docs-xml/smbdotconf/misc/afsshare.xml                       | 1 -
 docs-xml/smbdotconf/misc/afstokenlifetime.xml               | 1 -
 docs-xml/smbdotconf/misc/afsusernamemap.xml                 | 1 -
 docs-xml/smbdotconf/misc/asyncsmbechohandler.xml            | 1 -
 docs-xml/smbdotconf/misc/available.xml                      | 1 -
 docs-xml/smbdotconf/misc/cachedirectory.xml                 | 1 -
 docs-xml/smbdotconf/misc/changenotify.xml                   | 1 -
 docs-xml/smbdotconf/misc/changesharecommand.xml             | 1 -
 docs-xml/smbdotconf/misc/clusteraddresses.xml               | 1 -
 docs-xml/smbdotconf/misc/clustering.xml                     | 1 -
 docs-xml/smbdotconf/misc/configfile.xml                     | 1 -
 docs-xml/smbdotconf/misc/copy.xml                           | 2 +-
 docs-xml/smbdotconf/misc/ctdbdsocket.xml                    | 1 -
 docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml      | 1 -
 docs-xml/smbdotconf/misc/ctdbtimeout.xml                    | 1 -
 docs-xml/smbdotconf/misc/defaultservice.xml                 | 1 -
 docs-xml/smbdotconf/misc/deletesharecommand.xml             | 1 -
 docs-xml/smbdotconf/misc/dfreecachetime.xml                 | 1 -
 docs-xml/smbdotconf/misc/dfreecommand.xml                   | 1 -
 docs-xml/smbdotconf/misc/directorynamecachesize.xml         | 1 -
 docs-xml/smbdotconf/misc/dmapisupport.xml                   | 1 -
 docs-xml/smbdotconf/misc/fssprunestale.xml                  | 1 -
 docs-xml/smbdotconf/misc/fsssequencetimeout.xml             | 1 -
 docs-xml/smbdotconf/misc/homedirmap.xml                     | 1 -
 docs-xml/smbdotconf/misc/include.xml                        | 1 -
 docs-xml/smbdotconf/misc/kernelchangenotify.xml             | 1 -
 docs-xml/smbdotconf/misc/lockdirectory.xml                  | 1 -
 docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml        | 1 -
 docs-xml/smbdotconf/misc/messagecommand.xml                 | 1 -
 docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml         | 1 -
 docs-xml/smbdotconf/misc/ncalrpcdir.xml                     | 1 -
 docs-xml/smbdotconf/misc/nishomedir.xml                     | 1 -
 docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml      | 1 -
 docs-xml/smbdotconf/misc/panicaction.xml                    | 1 -
 docs-xml/smbdotconf/misc/perfcountmodule.xml                | 1 -
 docs-xml/smbdotconf/misc/piddirectory.xml                   | 1 -
 docs-xml/smbdotconf/misc/postexec.xml                       | 1 -
 docs-xml/smbdotconf/misc/preexec.xml                        | 1 -
 docs-xml/smbdotconf/misc/preexecclose.xml                   | 1 -
 docs-xml/smbdotconf/misc/preload.xml                        | 1 -
 docs-xml/smbdotconf/misc/registryshares.xml                 | 1 -
 docs-xml/smbdotconf/misc/remoteannounce.xml                 | 1 -
 docs-xml/smbdotconf/misc/remotebrowsesync.xml               | 1 -
 docs-xml/smbdotconf/misc/resetonzerovc.xml                  | 1 -
 docs-xml/smbdotconf/misc/rootpostexec.xml                   | 1 -
 docs-xml/smbdotconf/misc/rootpreexec.xml                    | 1 -
 docs-xml/smbdotconf/misc/rootpreexecclose.xml               | 1 -
 docs-xml/smbdotconf/misc/rpcdaemon.xml                      | 1 -
 docs-xml/smbdotconf/misc/rpcserver.xml                      | 1 -
 docs-xml/smbdotconf/misc/statedirectory.xml                 | 1 -
 docs-xml/smbdotconf/misc/usershareallowguests.xml           | 1 -
 docs-xml/smbdotconf/misc/usersharemaxshares.xml             | 1 -
 docs-xml/smbdotconf/misc/usershareowneronly.xml             | 1 -
 docs-xml/smbdotconf/misc/usersharepath.xml                  | 1 -
 docs-xml/smbdotconf/misc/usershareprefixallowlist.xml       | 1 -
 docs-xml/smbdotconf/misc/usershareprefixdenylist.xml        | 1 -
 docs-xml/smbdotconf/misc/usersharetemplateshare.xml         | 1 -
 docs-xml/smbdotconf/misc/utmp.xml                           | 1 -
 docs-xml/smbdotconf/misc/utmpdirectory.xml                  | 1 -
 docs-xml/smbdotconf/misc/wtmpdirectory.xml                  | 1 -
 docs-xml/smbdotconf/printing/addportcommand.xml             | 1 -
 docs-xml/smbdotconf/printing/addprintercommand.xml          | 1 -
 docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml      | 1 -
 docs-xml/smbdotconf/printing/cupsencrypt.xml                | 1 -
 docs-xml/smbdotconf/printing/cupsoptions.xml                | 1 -
 docs-xml/smbdotconf/printing/cupsserver.xml                 | 1 -
 docs-xml/smbdotconf/printing/defaultdevmode.xml             | 1 -
 docs-xml/smbdotconf/printing/deleteprintercommand.xml       | 1 -
 docs-xml/smbdotconf/printing/disablespoolss.xml             | 1 -
 docs-xml/smbdotconf/printing/enumportscommand.xml           | 1 -
 docs-xml/smbdotconf/printing/forceprintername.xml           | 1 -
 docs-xml/smbdotconf/printing/iprintserver.xml               | 1 -
 docs-xml/smbdotconf/printing/loadprinters.xml               | 1 -
 docs-xml/smbdotconf/printing/lppausecommand.xml             | 1 -
 docs-xml/smbdotconf/printing/lpqcachetime.xml               | 1 -
 docs-xml/smbdotconf/printing/lpqcommand.xml                 | 1 -
 docs-xml/smbdotconf/printing/lpresumecommand.xml            | 1 -
 docs-xml/smbdotconf/printing/lprmcommand.xml                | 1 -
 docs-xml/smbdotconf/printing/maxprintjobs.xml               | 1 -
 docs-xml/smbdotconf/printing/maxreportedprintjobs.xml       | 1 -
 docs-xml/smbdotconf/printing/os2drivermap.xml               | 1 -
 docs-xml/smbdotconf/printing/printable.xml                  | 1 -
 docs-xml/smbdotconf/printing/printcapcachetime.xml          | 1 -
 docs-xml/smbdotconf/printing/printcapname.xml               | 1 -
 docs-xml/smbdotconf/printing/printcommand.xml               | 1 -
 docs-xml/smbdotconf/printing/printername.xml                | 1 -
 docs-xml/smbdotconf/printing/printing.xml                   | 1 -
 docs-xml/smbdotconf/printing/printjobusername.xml           | 1 -
 docs-xml/smbdotconf/printing/printnotifybackchannel.xml     | 1 -
 docs-xml/smbdotconf/printing/queuepausecommand.xml          | 1 -
 docs-xml/smbdotconf/printing/queueresumecommand.xml         | 1 -
 docs-xml/smbdotconf/printing/showaddprinterwizard.xml       | 1 -
 docs-xml/smbdotconf/printing/spoolssarchitecture.xml        | 2 --
 docs-xml/smbdotconf/printing/spoolssosversion.xml           | 6 ------
 docs-xml/smbdotconf/printing/useclientdriver.xml            | 1 -
 docs-xml/smbdotconf/protocol/aclallowexecutealways.xml      | 1 -
 docs-xml/smbdotconf/protocol/aclcheckpermissions.xml        | 1 -
 docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml          | 1 -
 docs-xml/smbdotconf/protocol/cldapport.xml                  | 1 -
 docs-xml/smbdotconf/protocol/clientmaxprotocol.xml          | 1 -
 docs-xml/smbdotconf/protocol/clientminprotocol.xml          | 1 -
 docs-xml/smbdotconf/protocol/clientusespnego.xml            | 1 -
 docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml      | 1 -
 docs-xml/smbdotconf/protocol/defersharingviolations.xml     | 1 -
 docs-xml/smbdotconf/protocol/dgramport.xml                  | 1 -
 docs-xml/smbdotconf/protocol/disablenetbios.xml             | 1 -
 docs-xml/smbdotconf/protocol/durablehandles.xml             | 1 -
 docs-xml/smbdotconf/protocol/easupport.xml                  | 1 -
 docs-xml/smbdotconf/protocol/enableasusupport.xml           | 1 -
 docs-xml/smbdotconf/protocol/largereadwrite.xml             | 1 -
 docs-xml/smbdotconf/protocol/mapaclinherit.xml              | 1 -
 docs-xml/smbdotconf/protocol/maxmux.xml                     | 1 -
 docs-xml/smbdotconf/protocol/maxttl.xml                     | 1 -
 docs-xml/smbdotconf/protocol/maxwinsttl.xml                 | 1 -
 docs-xml/smbdotconf/protocol/maxxmit.xml                    | 1 -
 docs-xml/smbdotconf/protocol/minreceivefilesize.xml         | 1 -
 docs-xml/smbdotconf/protocol/minwinsttl.xml                 | 1 -
 docs-xml/smbdotconf/protocol/nameresolveorder.xml           | 1 -
 docs-xml/smbdotconf/protocol/nbtport.xml                    | 1 -
 docs-xml/smbdotconf/protocol/ntaclsupport.xml               | 1 -
 docs-xml/smbdotconf/protocol/ntpipesupport.xml              | 1 -
 docs-xml/smbdotconf/protocol/ntstatussupport.xml            | 1 -
 docs-xml/smbdotconf/protocol/profileacls.xml                | 1 -
 docs-xml/smbdotconf/protocol/readraw.xml                    | 1 -
 docs-xml/smbdotconf/protocol/rpcbigendian.xml               | 1 -
 docs-xml/smbdotconf/protocol/servermaxprotocol.xml          | 1 -
 docs-xml/smbdotconf/protocol/serverminprotocol.xml          | 1 -
 docs-xml/smbdotconf/protocol/sharefakefscaps.xml            | 1 -
 docs-xml/smbdotconf/protocol/smb2maxcredits.xml             | 1 -
 docs-xml/smbdotconf/protocol/smb2maxread.xml                | 1 -
 docs-xml/smbdotconf/protocol/smb2maxtrans.xml               | 1 -
 docs-xml/smbdotconf/protocol/smb2maxwrite.xml               | 1 -
 docs-xml/smbdotconf/protocol/smbports.xml                   | 1 -
 docs-xml/smbdotconf/protocol/timeserver.xml                 | 1 -
 docs-xml/smbdotconf/protocol/unicode.xml                    | 1 -
 docs-xml/smbdotconf/protocol/unixextensions.xml             | 1 -
 docs-xml/smbdotconf/protocol/usespnego.xml                  | 1 -
 docs-xml/smbdotconf/protocol/webport.xml                    | 1 -
 docs-xml/smbdotconf/protocol/writeraw.xml                   | 1 -
 docs-xml/smbdotconf/security/accessbasedshareenum.xml       | 1 -
 docs-xml/smbdotconf/security/algorithmicridbase.xml         | 1 -
 docs-xml/smbdotconf/security/allowtrusteddomains.xml        | 1 -
 docs-xml/smbdotconf/security/authmethods.xml                | 1 -
 docs-xml/smbdotconf/security/checkpasswordscript.xml        | 1 -
 docs-xml/smbdotconf/security/clientlanmanauth.xml           | 1 -
 docs-xml/smbdotconf/security/clientntlmv2auth.xml           | 1 -
 docs-xml/smbdotconf/security/clientplaintextauth.xml        | 1 -
 docs-xml/smbdotconf/security/clientschannel.xml             | 1 -
 docs-xml/smbdotconf/security/clientsigning.xml              | 1 -
 docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml   | 1 -
 docs-xml/smbdotconf/security/dedicatedkeytabfile.xml        | 1 -
 docs-xml/smbdotconf/security/encryptpasswords.xml           | 1 -
 docs-xml/smbdotconf/security/guestaccount.xml               | 1 -
 docs-xml/smbdotconf/security/guestok.xml                    | 1 -
 docs-xml/smbdotconf/security/hostsallow.xml                 | 1 -
 docs-xml/smbdotconf/security/hostsdeny.xml                  | 1 -
 docs-xml/smbdotconf/security/kerberosmethod.xml             | 1 -
 docs-xml/smbdotconf/security/kpasswdport.xml                | 1 -
 docs-xml/smbdotconf/security/krb5port.xml                   | 1 -
 docs-xml/smbdotconf/security/lanmanauth.xml                 | 1 -
 docs-xml/smbdotconf/security/lognttokencommand.xml          | 1 -
 docs-xml/smbdotconf/security/maptoguest.xml                 | 1 -
 docs-xml/smbdotconf/security/mapuntrustedtodomain.xml       | 2 --
 docs-xml/smbdotconf/security/ntlmauth.xml                   | 1 -
 docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml    | 1 -
 docs-xml/smbdotconf/security/nullpasswords.xml              | 1 -
 docs-xml/smbdotconf/security/obeypamrestrictions.xml        | 1 -
 docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml   | 1 -
 docs-xml/smbdotconf/security/pampasswordchange.xml          | 1 -
 docs-xml/smbdotconf/security/passdbbackend.xml              | 1 -
 docs-xml/smbdotconf/security/passdbexpandexplicit.xml       | 1 -
 docs-xml/smbdotconf/security/passwdchat.xml                 | 1 -
 docs-xml/smbdotconf/security/passwdchatdebug.xml            | 1 -
 docs-xml/smbdotconf/security/passwdchattimeout.xml          | 1 -
 docs-xml/smbdotconf/security/passwdprogram.xml              | 1 -
 docs-xml/smbdotconf/security/passwordserver.xml             | 1 -
 docs-xml/smbdotconf/security/preloadmodules.xml             | 1 -
 docs-xml/smbdotconf/security/privatedir.xml                 | 1 -
 docs-xml/smbdotconf/security/readonly.xml                   | 1 -
 docs-xml/smbdotconf/security/renameuserscript.xml           | 1 -
 docs-xml/smbdotconf/security/restrictanonymous.xml          | 1 -
 docs-xml/smbdotconf/security/rootdirectory.xml              | 1 -
 docs-xml/smbdotconf/security/sambakcccommand.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 -
 docs-xml/smbdotconf/security/smbpasswdfile.xml              | 1 -
 docs-xml/smbdotconf/security/tlscafile.xml                  | 1 -
 docs-xml/smbdotconf/security/tlscertfile.xml                | 1 -
 docs-xml/smbdotconf/security/tlscrlfile.xml                 | 1 -
 docs-xml/smbdotconf/security/tlsdhparamsfile.xml            | 1 -
 docs-xml/smbdotconf/security/tlsenabled.xml                 | 1 -
 docs-xml/smbdotconf/security/tlskeyfile.xml                 | 1 -
 docs-xml/smbdotconf/security/unixpasswordsync.xml           | 1 -
 docs-xml/smbdotconf/security/usernamelevel.xml              | 1 -
 docs-xml/smbdotconf/security/usernamemap.xml                | 1 -
 docs-xml/smbdotconf/security/usernamemapcachetime.xml       | 1 -
 docs-xml/smbdotconf/security/usernamemapscript.xml          | 1 -
 docs-xml/smbdotconf/tuning/deadtime.xml                     | 1 -
 docs-xml/smbdotconf/tuning/getwdcache.xml                   | 1 -
 docs-xml/smbdotconf/tuning/hostnamelookups.xml              | 1 -
 docs-xml/smbdotconf/tuning/keepalive.xml                    | 1 -
 docs-xml/smbdotconf/tuning/maxdisksize.xml                  | 1 -
 docs-xml/smbdotconf/tuning/maxopenfiles.xml                 | 1 -
 docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml             | 1 -
 docs-xml/smbdotconf/tuning/minprintspace.xml                | 1 -
 docs-xml/smbdotconf/tuning/namecachetimeout.xml             | 1 -
 docs-xml/smbdotconf/tuning/socketoptions.xml                | 1 -
 docs-xml/smbdotconf/tuning/usemmap.xml                      | 1 -
 docs-xml/smbdotconf/vfs/getquotacommand.xml                 | 1 -
 docs-xml/smbdotconf/vfs/hostmsdfs.xml                       | 1 -
 docs-xml/smbdotconf/vfs/ntvfshandler.xml                    | 1 -
 docs-xml/smbdotconf/vfs/setquotacommand.xml                 | 1 -
 docs-xml/smbdotconf/winbind/createkrb5conf.xml              | 1 -
 docs-xml/smbdotconf/winbind/idmapbackend.xml                | 1 -
 docs-xml/smbdotconf/winbind/idmapcachetime.xml              | 1 -
 docs-xml/smbdotconf/winbind/idmapconfig.xml                 | 1 -
 docs-xml/smbdotconf/winbind/idmapgid.xml                    | 1 -
 docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml      | 1 -
 docs-xml/smbdotconf/winbind/idmapuid.xml                    | 1 -
 docs-xml/smbdotconf/winbind/netutralizent4emulation.xml     | 1 -
 docs-xml/smbdotconf/winbind/rejectmd5servers.xml            | 1 -
 docs-xml/smbdotconf/winbind/requirestrongkey.xml            | 1 -
 docs-xml/smbdotconf/winbind/templatehomedir.xml             | 1 -
 docs-xml/smbdotconf/winbind/templateshell.xml               | 1 -
 docs-xml/smbdotconf/winbind/winbindcachetime.xml            | 1 -
 .../winbind/winbinddprivilegedsocketdirectory.xml           | 1 -
 docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml     | 1 -
 docs-xml/smbdotconf/winbind/winbindenumgroups.xml           | 1 -
 docs-xml/smbdotconf/winbind/winbindenumusers.xml            | 1 -
 docs-xml/smbdotconf/winbind/winbindexpandgroups.xml         | 1 -
 docs-xml/smbdotconf/winbind/winbindmaxclients.xml           | 1 -
 docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml | 1 -
 docs-xml/smbdotconf/winbind/winbindnestedgroups.xml         | 1 -
 docs-xml/smbdotconf/winbind/winbindnormalizenames.xml       | 1 -
 docs-xml/smbdotconf/winbind/winbindnssinfo.xml              | 1 -
 docs-xml/smbdotconf/winbind/winbindofflinelogon.xml         | 1 -
 docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml       | 1 -
 docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml       | 1 -
 docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml       | 1 -
 docs-xml/smbdotconf/winbind/winbindrpconly.xml              | 1 -
 docs-xml/smbdotconf/winbind/winbindsealedpipes.xml          | 1 -
 docs-xml/smbdotconf/winbind/winbindseparator.xml            | 1 -
 docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml   | 1 -
 docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml     | 1 -
 docs-xml/smbdotconf/wins/dnsproxy.xml                       | 1 -
 docs-xml/smbdotconf/wins/winshook.xml                       | 1 -
 docs-xml/smbdotconf/wins/winsproxy.xml                      | 1 -
 docs-xml/smbdotconf/wins/winsserver.xml                     | 1 -
 docs-xml/smbdotconf/wins/winssupport.xml                    | 1 -
 340 files changed, 1 insertion(+), 349 deletions(-)

diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index b9b420de856..31b462cacbd 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="bind interfaces only"
 				type="boolean"
                  context="G"
-                 advanced="1" wizard="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>This global parameter allows the Samba admin 
diff --git a/docs-xml/smbdotconf/base/comment.xml b/docs-xml/smbdotconf/base/comment.xml
index ce3b574ddf6..3c2c3b14d27 100644
--- a/docs-xml/smbdotconf/base/comment.xml
+++ b/docs-xml/smbdotconf/base/comment.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="comment"
                  context="S"
 				 type="string"
-                 basic="1" advanced="1" share="1" print="1" developer="1" 
                  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 f9da1345557..864ec3c8798 100644
--- a/docs-xml/smbdotconf/base/configbackend.xml
+++ b/docs-xml/smbdotconf/base/configbackend.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="config backend"
                  context="G"
 				 type="enum"
-                 advanced="1" developer="1"
                  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 f8d5432b025..8a18c933ffb 100644
--- a/docs-xml/smbdotconf/base/doscharset.xml
+++ b/docs-xml/smbdotconf/base/doscharset.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dos charset"
 				 type="string"
                  context="G"
-                 advanced="1" developer="1"
                  constant="1"
 				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml b/docs-xml/smbdotconf/base/enablecorefiles.xml
index 416dd4504c1..9aa057f6c5c 100644
--- a/docs-xml/smbdotconf/base/enablecorefiles.xml
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="enable core files"
                  context="G"
                  type="boolean"
-                 basic="1" advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
 <description>
diff --git a/docs-xml/smbdotconf/base/interfaces.xml b/docs-xml/smbdotconf/base/interfaces.xml
index 8c3684ff0fe..39c90b9ad00 100644
--- a/docs-xml/smbdotconf/base/interfaces.xml
+++ b/docs-xml/smbdotconf/base/interfaces.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="interfaces"
                  context="G"
 				 type="list"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  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 32d9cfc7704..87559e5fdae 100644
--- a/docs-xml/smbdotconf/base/multicastdnsregister.xml
+++ b/docs-xml/smbdotconf/base/multicastdnsregister.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="multicast dns register"
 				type="boolean"
                  context="G"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>If compiled with proper support for it, Samba will
diff --git a/docs-xml/smbdotconf/base/netbiosaliases.xml b/docs-xml/smbdotconf/base/netbiosaliases.xml
index 5d58fc23976..46f97e2bd0c 100644
--- a/docs-xml/smbdotconf/base/netbiosaliases.xml
+++ b/docs-xml/smbdotconf/base/netbiosaliases.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="netbios aliases"
                  context="G"
 				 type="list"
-                 advanced="1" wizard="1" developer="1"
                  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/netbiosname.xml b/docs-xml/smbdotconf/base/netbiosname.xml
index 60bc08232d6..3369e3ee549 100644
--- a/docs-xml/smbdotconf/base/netbiosname.xml
+++ b/docs-xml/smbdotconf/base/netbiosname.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="netbios name"
                  context="G"
                  type="string"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/netbiosscope.xml b/docs-xml/smbdotconf/base/netbiosscope.xml
index 0590645c8da..811e1c6788c 100644
--- a/docs-xml/smbdotconf/base/netbiosscope.xml
+++ b/docs-xml/smbdotconf/base/netbiosscope.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="netbios scope"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/path.xml b/docs-xml/smbdotconf/base/path.xml
index 49224aff0f9..c84e039875a 100644
--- a/docs-xml/smbdotconf/base/path.xml
+++ b/docs-xml/smbdotconf/base/path.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="path"
                  context="S"
                  type="string"
-                 basic="1" advanced="1" share="1" print="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>directory</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/base/realm.xml b/docs-xml/smbdotconf/base/realm.xml
index 8d56b56e139..ab56ec51e95 100644
--- a/docs-xml/smbdotconf/base/realm.xml
+++ b/docs-xml/smbdotconf/base/realm.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="realm"
                  context="G"
 				 type="string"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/base/serverservices.xml b/docs-xml/smbdotconf/base/serverservices.xml
index e02e29d409c..dba65e9a69b 100644
--- a/docs-xml/smbdotconf/base/serverservices.xml
+++ b/docs-xml/smbdotconf/base/serverservices.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server services"
                  context="G"
                  type="list"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option contains the services that the Samba daemon will
diff --git a/docs-xml/smbdotconf/base/serverstring.xml b/docs-xml/smbdotconf/base/serverstring.xml
index 504ed9cd384..f6bc8089f6e 100644
--- a/docs-xml/smbdotconf/base/serverstring.xml
+++ b/docs-xml/smbdotconf/base/serverstring.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server string"
                  context="G"
                  type="string"
-                 basic="1" advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
         <para>This controls what string will show up in the printer comment box in print 
diff --git a/docs-xml/smbdotconf/base/unixcharset.xml b/docs-xml/smbdotconf/base/unixcharset.xml
index 9fe599664fe..ff8f6bbe2e0 100644
--- a/docs-xml/smbdotconf/base/unixcharset.xml
+++ b/docs-xml/smbdotconf/base/unixcharset.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="unix charset"
 	context="G"
 	type="string"
-                 advanced="1" developer="1"
                  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 9d6f2672f37..49aec413ba7 100644
--- a/docs-xml/smbdotconf/base/workgroup.xml
+++ b/docs-xml/smbdotconf/base/workgroup.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="workgroup"
                  context="G"
 				 type="string"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  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 e58e1912e28..c56d3fc7910 100644
--- a/docs-xml/smbdotconf/browse/browseable.xml
+++ b/docs-xml/smbdotconf/browse/browseable.xml
@@ -1,5 +1,4 @@
 <samba:parameter name="browseable" context="S" type="boolean"
-                 basic="1" advanced="1" print="1" developer="1"
                  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 dd858b7fafb..adf7454cdd0 100644
--- a/docs-xml/smbdotconf/browse/browselist.xml
+++ b/docs-xml/smbdotconf/browse/browselist.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="browse list"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 2325b622c30..a47800bb70b 100644
--- a/docs-xml/smbdotconf/browse/domainmaster.xml
+++ b/docs-xml/smbdotconf/browse/domainmaster.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="domain master"
 				 type="enum"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_domain_master"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
index 7f85616c222..8b1b5315ff5 100644
--- a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
+++ b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="enhanced browsing"
                  context="G"
-                 advanced="1" developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/browse/lmannounce.xml b/docs-xml/smbdotconf/browse/lmannounce.xml
index d0b4b2eb4b7..6d712c48160 100644
--- a/docs-xml/smbdotconf/browse/lmannounce.xml
+++ b/docs-xml/smbdotconf/browse/lmannounce.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lm announce"
                  context="G"
 				 type="enum"
-                 advanced="1" developer="1"
                  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 4f381651477..8a68e09b286 100644
--- a/docs-xml/smbdotconf/browse/lminterval.xml
+++ b/docs-xml/smbdotconf/browse/lminterval.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="lm interval"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/browse/localmaster.xml b/docs-xml/smbdotconf/browse/localmaster.xml
index bdabf6279ba..65a288d0852 100644
--- a/docs-xml/smbdotconf/browse/localmaster.xml
+++ b/docs-xml/smbdotconf/browse/localmaster.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="local master"
                  context="G"
                  type="boolean"
-                 basic="1" advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option allows <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/browse/oslevel.xml b/docs-xml/smbdotconf/browse/oslevel.xml
index 1081597bcd3..fc386d2408d 100644
--- a/docs-xml/smbdotconf/browse/oslevel.xml
+++ b/docs-xml/smbdotconf/browse/oslevel.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="os level"
                  context="G"
 				 type="integer"
-                 basic="1" advanced="1" developer="1"
                  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 88dafd206e2..e32ca527986 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="preferred master"
                  context="G"
 				 type="boolean-auto"
-                 basic="1" advanced="1" developer="1"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>prefered master</synonym>
diff --git a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
index 38fa83181e8..70c311e3bc8 100644
--- a/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/dnsupdatecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dns update command"
                  context="G"
                  type="list"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option sets the command that is called when there are
diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
index a8e312ba363..b53ee3c3fdd 100644
--- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
+++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="machine password timeout"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 	 <description>
 
diff --git a/docs-xml/smbdotconf/domain/nsupdatecommand.xml b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
index 5f55ddf7637..94810584efd 100644
--- a/docs-xml/smbdotconf/domain/nsupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/nsupdatecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="nsupdate command"
                  context="G"
                  type="list"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option sets the path to the <filename>nsupdate</filename>
diff --git a/docs-xml/smbdotconf/domain/rndccommand.xml b/docs-xml/smbdotconf/domain/rndccommand.xml
index 1d88a9b3501..72df82fbe59 100644
--- a/docs-xml/smbdotconf/domain/rndccommand.xml
+++ b/docs-xml/smbdotconf/domain/rndccommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="rndc command"
                  context="G"
                  type="list"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option specifies the path to the name server control utility.
diff --git a/docs-xml/smbdotconf/domain/spnupdatecommand.xml b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
index b1d4a856236..cbeb65755cd 100644
--- a/docs-xml/smbdotconf/domain/spnupdatecommand.xml
+++ b/docs-xml/smbdotconf/domain/spnupdatecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="spn update command"
                  context="G"
                  type="list"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option sets the command that for updating
diff --git a/docs-xml/smbdotconf/filename/mangleprefix.xml b/docs-xml/smbdotconf/filename/mangleprefix.xml
index 192fb6754bb..96ff9633136 100644
--- a/docs-xml/smbdotconf/filename/mangleprefix.xml
+++ b/docs-xml/smbdotconf/filename/mangleprefix.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="mangle prefix"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para> controls the number of prefix
diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml
index 347dc56432d..4b680672c59 100644
--- a/docs-xml/smbdotconf/filename/manglingmethod.xml
+++ b/docs-xml/smbdotconf/filename/manglingmethod.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="mangling method"
 			 context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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/maxstatcachesize.xml b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
index d341beb4f85..40790df70e1 100644
--- a/docs-xml/smbdotconf/filename/maxstatcachesize.xml
+++ b/docs-xml/smbdotconf/filename/maxstatcachesize.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="max stat cache size"
                  context="G"
-                 developer="1"
 		 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/filename/statcache.xml b/docs-xml/smbdotconf/filename/statcache.xml
index c38fb11a888..ec1ee25692c 100644
--- a/docs-xml/smbdotconf/filename/statcache.xml
+++ b/docs-xml/smbdotconf/filename/statcache.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="stat cache"
                  context="G"
-                 developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
index e0ce700079b..92ea54101be 100644
--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client ldap sasl wrapping"
                  context="G"
 		 type="enum"
-		 advanced="1" 
                  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 442d242679d..3f507991bdd 100644
--- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ldap admin dn"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 				 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
index 31713c9cb50..7c77fe34465 100644
--- a/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldapconnectiontimeout.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ldap connection timeout"
 		 context="G"
-		 advanced="1" developer="1"
 			type="integer"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
index 48f5c9b65a1..a9518d1413f 100644
--- a/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapdeletedn.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap delete dn"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 d102f51983f..23ad3e710cc 100644
--- a/docs-xml/smbdotconf/ldap/ldapderef.xml
+++ b/docs-xml/smbdotconf/ldap/ldapderef.xml
@@ -1,5 +1,4 @@
 <samba:parameter name="ldap deref" context="G" type="enum"
-	advanced="1" developer="1"
 	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 4c43b5bb50c..ebdfb8952d8 100644
--- a/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
+++ b/docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
@@ -1,5 +1,4 @@
 <samba:parameter name="ldap follow referral" context="G" type="enum"
-	advanced="1" developer="1"
 	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 a82c870a815..bb1883235e3 100644
--- a/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapgroupsuffix.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap group suffix"
                  context="G"
 				 type="string"
-		 advanced="1" developer="1"
                  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 79c93cbb0d7..aac09df2516 100644
--- a/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapidmapsuffix.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ldap idmap suffix"
                  context="G"
-		 advanced="1" developer="1"
 		 type="string"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
index f4149c78db0..25722469864 100644
--- a/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapmachinesuffix.xml
@@ -1,7 +1,5 @@
 <samba:parameter name="ldap machine suffix"
 		context="G"
-		advanced="1"
-		developer="1"
 		type="string"
                  generated_function="0"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
index bc09b98672d..311eba17b7e 100644
--- a/docs-xml/smbdotconf/ldap/ldappagesize.xml
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap page size"
 	context="G"
 	type="integer"
-	advanced="1" developer="1"
         xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
index 8c7dea666c8..7166e9be43d 100644
--- a/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
+++ b/docs-xml/smbdotconf/ldap/ldappasswdsync.xml
@@ -1,7 +1,5 @@
 <samba:parameter name="ldap passwd sync"
 			context="G"
-			advanced="1"
-			developer="1"
 			type="enum"
 			xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 
diff --git a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
index 4710e2b3b3f..a8236d8af4d 100644
--- a/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
+++ b/docs-xml/smbdotconf/ldap/ldapreplicationsleep.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ldap replication sleep"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
index bf6111945bf..6496bfbf929 100644
--- a/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsameditposix.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldapsam:editposix"
 	context="G"
 	type="string"
-		 advanced="1" developer="0"
                  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 2e4e1dbd7cb..45566793415 100644
--- a/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsamtrusted.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldapsam:trusted"
 	context="G"
 	type="string"
-		 advanced="1" developer="0"
                  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 fa7fea94d06..eade0271b78 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap ssl"
                  context="G"
 				 type="enum"
-                 advanced="1" developer="1"
                  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 e6998cbaf2e..4f1771a540b 100644
--- a/docs-xml/smbdotconf/ldap/ldapsslads.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap ssl ads"
 		 context="G"
 		 type="boolean"
-                 advanced="1" developer="1"
 		 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/ldapsuffix.xml b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
index 48595139a27..7db13c20514 100644
--- a/docs-xml/smbdotconf/ldap/ldapsuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapsuffix.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap suffix"
                  context="G"
 		 type="string"
-		 advanced="1" developer="1"
                  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 5bc2699d00b..e920ddc5fc5 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ldap timeout"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
index 996bb852dbc..71fdc9e42f5 100644
--- a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap user suffix"
 	context="G"
 	type="string"
-	advanced="1" developer="1"
                  generated_function="0"
         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 cc4b84acd7f..b9ffbe31fec 100644
--- a/docs-xml/smbdotconf/logging/debugclass.xml
+++ b/docs-xml/smbdotconf/logging/debugclass.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="debug class"
                  context="G"
 		 type="boolean"
-                 developer="1" advanced="1"
                  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 6cc7b71c986..5c9e468737f 100644
--- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="debug hires timestamp"
                  context="G"
-                 developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logging/debugpid.xml b/docs-xml/smbdotconf/logging/debugpid.xml
index 017d0109406..5c81625706a 100644
--- a/docs-xml/smbdotconf/logging/debugpid.xml
+++ b/docs-xml/smbdotconf/logging/debugpid.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="debug pid"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 62a65746134..e8941428daf 100644
--- a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="debug prefix timestamp"
                  context="G"
-                 developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logging/debugtimestamp.xml b/docs-xml/smbdotconf/logging/debugtimestamp.xml
index b50f4292fe9..205eac82014 100644
--- a/docs-xml/smbdotconf/logging/debugtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugtimestamp.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="debug timestamp"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 5cfa541a45c..cc715ec52ed 100644
--- a/docs-xml/smbdotconf/logging/debuguid.xml
+++ b/docs-xml/smbdotconf/logging/debuguid.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="debug uid"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 a8c47e47255..1b517670452 100644
--- a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap debug level"
 		 type="integer"
 		context="G"
-		developer="1" advanced="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
index e023ff689bc..ab69cc5ed2d 100644
--- a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
+++ b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ldap debug threshold"
 		type="integer"
 		context="G"
-		developer="1" advanced="1"
 		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 a1174546d4f..4a7be662e3d 100644
--- a/docs-xml/smbdotconf/logging/logfile.xml
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="log file"
                  context="G"
 				 type="string"
-                 developer="1" advanced="1"
                  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 a82496b022d..f779d8f5756 100644
--- a/docs-xml/smbdotconf/logging/logging.xml
+++ b/docs-xml/smbdotconf/logging/logging.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="logging"
 		 type="string"
 		 context="G"
-		 developer="1" advanced="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
index d5562f42bbe..6a225543b09 100644
--- a/docs-xml/smbdotconf/logging/loglevel.xml
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="log level"
 				 type="string"
                  context="G"
-                 developer="1" advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>debuglevel</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/logging/maxlogsize.xml b/docs-xml/smbdotconf/logging/maxlogsize.xml
index 3d5239ccdf8..3373f165d31 100644
--- a/docs-xml/smbdotconf/logging/maxlogsize.xml
+++ b/docs-xml/smbdotconf/logging/maxlogsize.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max log size"
 				 type="integer"
                  context="G"
-                 developer="1" advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logging/syslog.xml b/docs-xml/smbdotconf/logging/syslog.xml
index f58a9a5f532..23ca499c78b 100644
--- a/docs-xml/smbdotconf/logging/syslog.xml
+++ b/docs-xml/smbdotconf/logging/syslog.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="syslog"
                  context="G"
 				 type="integer"
-                 developer="1" advanced="1"
                  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 aec40c2431e..9847f0c572e 100644
--- a/docs-xml/smbdotconf/logging/syslogonly.xml
+++ b/docs-xml/smbdotconf/logging/syslogonly.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="syslog only"
                  context="G"
 				 type="boolean"
-                 developer="1" advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/logon/abortshutdownscript.xml b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
index 56bd35f2915..d5f714202fe 100644
--- a/docs-xml/smbdotconf/logon/abortshutdownscript.xml
+++ b/docs-xml/smbdotconf/logon/abortshutdownscript.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="abort shutdown script"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logon/addgroupscript.xml b/docs-xml/smbdotconf/logon/addgroupscript.xml
index 3804e144ffc..18d7230d32c 100644
--- a/docs-xml/smbdotconf/logon/addgroupscript.xml
+++ b/docs-xml/smbdotconf/logon/addgroupscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="add group script"
 		context="G"
 		type="string"
-		advanced="1" developer="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/addmachinescript.xml b/docs-xml/smbdotconf/logon/addmachinescript.xml
index c06a4a964ff..5d88170fc28 100644
--- a/docs-xml/smbdotconf/logon/addmachinescript.xml
+++ b/docs-xml/smbdotconf/logon/addmachinescript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="add machine script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/adduserscript.xml b/docs-xml/smbdotconf/logon/adduserscript.xml
index d8abcdada58..981d6702c15 100644
--- a/docs-xml/smbdotconf/logon/adduserscript.xml
+++ b/docs-xml/smbdotconf/logon/adduserscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="add user script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/addusertogroupscript.xml b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
index f7eb410024c..d871ead05d2 100644
--- a/docs-xml/smbdotconf/logon/addusertogroupscript.xml
+++ b/docs-xml/smbdotconf/logon/addusertogroupscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="add user to group script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/allownt4crypto.xml b/docs-xml/smbdotconf/logon/allownt4crypto.xml
index 4d417c71b3c..03dc8fa93f7 100644
--- a/docs-xml/smbdotconf/logon/allownt4crypto.xml
+++ b/docs-xml/smbdotconf/logon/allownt4crypto.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="allow nt4 crypto"
                  context="G"
                  type="boolean"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether the netlogon server (currently
diff --git a/docs-xml/smbdotconf/logon/deletegroupscript.xml b/docs-xml/smbdotconf/logon/deletegroupscript.xml
index bd265b7fc82..8f284506ff2 100644
--- a/docs-xml/smbdotconf/logon/deletegroupscript.xml
+++ b/docs-xml/smbdotconf/logon/deletegroupscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="delete group script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is the full pathname to a script that will 
diff --git a/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml b/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
index a685ab52906..07a21a732d1 100644
--- a/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
+++ b/docs-xml/smbdotconf/logon/deleteuserfromgroupscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="delete user from group script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Full path to the script that will be called when 
diff --git a/docs-xml/smbdotconf/logon/deleteuserscript.xml b/docs-xml/smbdotconf/logon/deleteuserscript.xml
index b3abe23e4cb..128fa899120 100644
--- a/docs-xml/smbdotconf/logon/deleteuserscript.xml
+++ b/docs-xml/smbdotconf/logon/deleteuserscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="delete user script"
 			     type="string"
                  context="G"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is the full pathname to a script that will 
diff --git a/docs-xml/smbdotconf/logon/domainlogons.xml b/docs-xml/smbdotconf/logon/domainlogons.xml
index 9d2da351b1b..0a1d11d0822 100644
--- a/docs-xml/smbdotconf/logon/domainlogons.xml
+++ b/docs-xml/smbdotconf/logon/domainlogons.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="domain logons"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  function="_domain_logons"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logon/enableprivileges.xml b/docs-xml/smbdotconf/logon/enableprivileges.xml
index 0fbc504c526..be9b5f734da 100644
--- a/docs-xml/smbdotconf/logon/enableprivileges.xml
+++ b/docs-xml/smbdotconf/logon/enableprivileges.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="enable privileges"
                  context="G"
 		 type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/initlogondelay.xml b/docs-xml/smbdotconf/logon/initlogondelay.xml
index de8b19ecf59..0cdbcd03a7f 100644
--- a/docs-xml/smbdotconf/logon/initlogondelay.xml
+++ b/docs-xml/smbdotconf/logon/initlogondelay.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="init logon delay"
                  context="G"
 		 type="integer"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
index 2756a63ef9b..12d91cc7918 100644
--- a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
+++ b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="init logon delayed hosts"
                  context="G"
 		 type="list"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/logon/logondrive.xml b/docs-xml/smbdotconf/logon/logondrive.xml
index 566480baa1a..dc1208060e0 100644
--- a/docs-xml/smbdotconf/logon/logondrive.xml
+++ b/docs-xml/smbdotconf/logon/logondrive.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="logon drive"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logon/logonhome.xml b/docs-xml/smbdotconf/logon/logonhome.xml
index bcab4a86ba7..3e9d15026ca 100644
--- a/docs-xml/smbdotconf/logon/logonhome.xml
+++ b/docs-xml/smbdotconf/logon/logonhome.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="logon home"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logon/logonpath.xml b/docs-xml/smbdotconf/logon/logonpath.xml
index 662a1c1bc11..d9ffbcbff4d 100644
--- a/docs-xml/smbdotconf/logon/logonpath.xml
+++ b/docs-xml/smbdotconf/logon/logonpath.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="logon path"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/logon/logonscript.xml b/docs-xml/smbdotconf/logon/logonscript.xml
index 102fb42c57e..b6d7580ccc0 100644
--- a/docs-xml/smbdotconf/logon/logonscript.xml
+++ b/docs-xml/smbdotconf/logon/logonscript.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="logon script"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/logon/rejectmd5clients.xml b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
index 04a5b4da09d..41684ef1080 100644
--- a/docs-xml/smbdotconf/logon/rejectmd5clients.xml
+++ b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="reject md5 clients"
                  context="G"
                  type="boolean"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether the netlogon server (currently
diff --git a/docs-xml/smbdotconf/logon/setprimarygroupscript.xml b/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
index 3108ac66228..60d2cae1325 100644
--- a/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
+++ b/docs-xml/smbdotconf/logon/setprimarygroupscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="set primary group script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/logon/shutdownscript.xml b/docs-xml/smbdotconf/logon/shutdownscript.xml
index e1cc72494e6..e66ed92193f 100644
--- a/docs-xml/smbdotconf/logon/shutdownscript.xml
+++ b/docs-xml/smbdotconf/logon/shutdownscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="shutdown script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This a full path name to a script called by 
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index de8da7b5cad..3beb8de2d56 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="add share command"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 67d42d491f6..d2c3d1e7e63 100644
--- a/docs-xml/smbdotconf/misc/afsshare.xml
+++ b/docs-xml/smbdotconf/misc/afsshare.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="afs share"
 	         context="S"
 			 type="boolean"
-		 advanced="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls whether special AFS features are enabled
diff --git a/docs-xml/smbdotconf/misc/afstokenlifetime.xml b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
index cbf95742239..9d6e13a9e53 100644
--- a/docs-xml/smbdotconf/misc/afstokenlifetime.xml
+++ b/docs-xml/smbdotconf/misc/afstokenlifetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="afs token lifetime"
                  context="G"
                  type="integer"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter controls the lifetime of tokens that the AFS
diff --git a/docs-xml/smbdotconf/misc/afsusernamemap.xml b/docs-xml/smbdotconf/misc/afsusernamemap.xml
index 992b1ac8398..94f0cee3099 100644
--- a/docs-xml/smbdotconf/misc/afsusernamemap.xml
+++ b/docs-xml/smbdotconf/misc/afsusernamemap.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="afs username map"
                  context="G"
 				 type="string"
-                 advanced="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
diff --git a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
index d10dac90b3e..84e2f1a340d 100644
--- a/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
+++ b/docs-xml/smbdotconf/misc/asyncsmbechohandler.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="async smb echo handler"
                  context="G"
 				 type="boolean"
-                 advanced="1"
                  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 eac0dc513cf..343c6fdd7ed 100644
--- a/docs-xml/smbdotconf/misc/available.xml
+++ b/docs-xml/smbdotconf/misc/available.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="available"
 	         context="S"
-		 basic="1" advanced="1" print="1"
 		 type="boolean"
                  generated_function="0"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml
index e72d852db9b..b0731f9be67 100644
--- a/docs-xml/smbdotconf/misc/cachedirectory.xml
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="cache directory"
                  context="G"
-                 advanced="1" developer="1"
 		 type="string"
 		 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/changenotify.xml b/docs-xml/smbdotconf/misc/changenotify.xml
index 3a2debb5c98..1344dce71b2 100644
--- a/docs-xml/smbdotconf/misc/changenotify.xml
+++ b/docs-xml/smbdotconf/misc/changenotify.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="change notify"
                  context="S"
 				 type="boolean"
-                 advanced="1"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index 909a10cbff5..fbfc4409c6d 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="change share command"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 d34d5503d3d..b489ed43680 100644
--- a/docs-xml/smbdotconf/misc/clusteraddresses.xml
+++ b/docs-xml/smbdotconf/misc/clusteraddresses.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cluster addresses"
 	         context="G"
 			 type="list"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>With this parameter you can add additional addresses
diff --git a/docs-xml/smbdotconf/misc/clustering.xml b/docs-xml/smbdotconf/misc/clustering.xml
index b85934e78e4..3613670f530 100644
--- a/docs-xml/smbdotconf/misc/clustering.xml
+++ b/docs-xml/smbdotconf/misc/clustering.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="clustering"
                  context="G"
 				 type="boolean"
-                 advanced="1"
                  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 abbc80c656c..450be18d9bd 100644
--- a/docs-xml/smbdotconf/misc/configfile.xml
+++ b/docs-xml/smbdotconf/misc/configfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="config file"
                  context="G"
 				 type="string"
-		 hide="1"
                  function="next_configfile"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/copy.xml b/docs-xml/smbdotconf/misc/copy.xml
index 6399e933b14..945f2c9ee6b 100644
--- a/docs-xml/smbdotconf/misc/copy.xml
+++ b/docs-xml/smbdotconf/misc/copy.xml
@@ -1,6 +1,6 @@
 <samba:parameter name="copy"
                  type="string"
-                 context="S" hide="1"
+                 context="S"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/ctdbdsocket.xml b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
index 27e8121bd6f..f852f593c82 100644
--- a/docs-xml/smbdotconf/misc/ctdbdsocket.xml
+++ b/docs-xml/smbdotconf/misc/ctdbdsocket.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ctdbd socket"
                  context="G"
-                 advanced="1"
                  type="string"
                  constant="1"
                  function="_ctdbd_socket"
diff --git a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
index a3289a93bc4..283de6bcfe0 100644
--- a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
+++ b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ctdb locktime warn threshold"
                  context="G"
 		 type="integer"
-                 advanced="1"
                  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 1cc6262b379..90780d6e997 100644
--- a/docs-xml/smbdotconf/misc/ctdbtimeout.xml
+++ b/docs-xml/smbdotconf/misc/ctdbtimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ctdb timeout"
                  context="G"
 				 type="integer"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies a timeout in seconds for the
diff --git a/docs-xml/smbdotconf/misc/defaultservice.xml b/docs-xml/smbdotconf/misc/defaultservice.xml
index 01501634c5b..c0942f50647 100644
--- a/docs-xml/smbdotconf/misc/defaultservice.xml
+++ b/docs-xml/smbdotconf/misc/defaultservice.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="default service"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  function="defaultservice"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 3def6b8013d..4e2052329c4 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="delete share command"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 62d35574cbc..b21535eb2a0 100644
--- a/docs-xml/smbdotconf/misc/dfreecachetime.xml
+++ b/docs-xml/smbdotconf/misc/dfreecachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dfree cache time"
 	         context="S"
 			 type="integer"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/misc/dfreecommand.xml b/docs-xml/smbdotconf/misc/dfreecommand.xml
index de60c5e0767..a678bb44adf 100644
--- a/docs-xml/smbdotconf/misc/dfreecommand.xml
+++ b/docs-xml/smbdotconf/misc/dfreecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dfree command"
 	         context="S"
 			 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
index d02c4f575f9..e9f974b18a3 100644
--- a/docs-xml/smbdotconf/misc/directorynamecachesize.xml
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="directory name cache size"
 		 context="S"
 		 type="integer"
-		 advanced="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/dmapisupport.xml b/docs-xml/smbdotconf/misc/dmapisupport.xml
index fbd145d0480..6ff85dd9d24 100644
--- a/docs-xml/smbdotconf/misc/dmapisupport.xml
+++ b/docs-xml/smbdotconf/misc/dmapisupport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dmapi support"
                  context="S"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/fssprunestale.xml b/docs-xml/smbdotconf/misc/fssprunestale.xml
index d583104bb1f..a8287b06d64 100644
--- a/docs-xml/smbdotconf/misc/fssprunestale.xml
+++ b/docs-xml/smbdotconf/misc/fssprunestale.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="fss: prune stale"
                  context="G"
 		 type="boolean"
-		 advanced="1"
                  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 9419a3332e1..300ff6c739f 100644
--- a/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
+++ b/docs-xml/smbdotconf/misc/fsssequencetimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="fss: sequence timeout"
                  context="G"
 		 type="integer"
-		 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/homedirmap.xml b/docs-xml/smbdotconf/misc/homedirmap.xml
index 37b46ee0b69..e50f64fcc91 100644
--- a/docs-xml/smbdotconf/misc/homedirmap.xml
+++ b/docs-xml/smbdotconf/misc/homedirmap.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="homedir map"
 	         context="G"
 			 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/include.xml b/docs-xml/smbdotconf/misc/include.xml
index 67a84f2b308..bfd7b3fb91a 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="include"
 	         context="G"
 		 type="string"
-		 hide="1"
                  generated_function="0"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/kernelchangenotify.xml b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
index e90f845a45a..1e11bb8dcd2 100644
--- a/docs-xml/smbdotconf/misc/kernelchangenotify.xml
+++ b/docs-xml/smbdotconf/misc/kernelchangenotify.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="kernel change notify"
                  context="S"
 				 type="boolean"
-                 advanced="1"
                  parm="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/lockdirectory.xml b/docs-xml/smbdotconf/misc/lockdirectory.xml
index 7c4f536a8ec..7a9cdf8c023 100644
--- a/docs-xml/smbdotconf/misc/lockdirectory.xml
+++ b/docs-xml/smbdotconf/misc/lockdirectory.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="lock directory"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
index 9d2b7509438..320abfc338e 100644
--- a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
+++ b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="log writeable files on exit"
 		 context="G"
 		 type="boolean"
-		 advanced="1" developer="0"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/messagecommand.xml b/docs-xml/smbdotconf/misc/messagecommand.xml
index 91df58ab5d1..ee0db13e316 100644
--- a/docs-xml/smbdotconf/misc/messagecommand.xml
+++ b/docs-xml/smbdotconf/misc/messagecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="message command"
 	         context="G"
 			 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This specifies what command to run when the 
diff --git a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index c95a180f126..4651c193de9 100644
--- a/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="nbt client socket address"
 	         context="G"
 			 type="string"
-		 developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>socket address</synonym>
diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
index 2e295141920..1d84d60dd64 100644
--- a/docs-xml/smbdotconf/misc/ncalrpcdir.xml
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="ncalrpc dir"
 		 context="G"
-		 advanced="1" developer="1"
 		 type="string"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/nishomedir.xml b/docs-xml/smbdotconf/misc/nishomedir.xml
index c61756394cf..4e66e719791 100644
--- a/docs-xml/smbdotconf/misc/nishomedir.xml
+++ b/docs-xml/smbdotconf/misc/nishomedir.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="NIS homedir"
 	         context="G"
 			 type="boolean"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Get the home share server from a NIS map. For 
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index 3a44a69d543..91f69a4ed86 100644
--- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
+++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="nmbd bind explicit broadcast"
 	         context="G"
-		 advanced="1" developer="1"
 		 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/panicaction.xml b/docs-xml/smbdotconf/misc/panicaction.xml
index b8ffa704589..ce4c15f10c0 100644
--- a/docs-xml/smbdotconf/misc/panicaction.xml
+++ b/docs-xml/smbdotconf/misc/panicaction.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="panic action"
 		 context="G"
 		 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a Samba developer option that allows a 
diff --git a/docs-xml/smbdotconf/misc/perfcountmodule.xml b/docs-xml/smbdotconf/misc/perfcountmodule.xml
index f22c3996420..50da2c67012 100644
--- a/docs-xml/smbdotconf/misc/perfcountmodule.xml
+++ b/docs-xml/smbdotconf/misc/perfcountmodule.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="perfcount module"
 		 context="G"
 		 type="string"
-		 advanced="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This parameter specifies the perfcount backend to be used when monitoring SMB
diff --git a/docs-xml/smbdotconf/misc/piddirectory.xml b/docs-xml/smbdotconf/misc/piddirectory.xml
index 8362df20a6a..56206cb487e 100644
--- a/docs-xml/smbdotconf/misc/piddirectory.xml
+++ b/docs-xml/smbdotconf/misc/piddirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="pid directory"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 3f0cb5073ac..db6d88f315b 100644
--- a/docs-xml/smbdotconf/misc/postexec.xml
+++ b/docs-xml/smbdotconf/misc/postexec.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="postexec"
 	         context="S"
 			 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option specifies a command to be run 
diff --git a/docs-xml/smbdotconf/misc/preexec.xml b/docs-xml/smbdotconf/misc/preexec.xml
index 6608c830501..bbcee49a755 100644
--- a/docs-xml/smbdotconf/misc/preexec.xml
+++ b/docs-xml/smbdotconf/misc/preexec.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="preexec"
 		 context="S"
 		 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <synonym>exec</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/misc/preexecclose.xml b/docs-xml/smbdotconf/misc/preexecclose.xml
index 7a477e16fea..3d184e1fd33 100644
--- a/docs-xml/smbdotconf/misc/preexecclose.xml
+++ b/docs-xml/smbdotconf/misc/preexecclose.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="preexec close"
 		 context="S"
 		 type="boolean"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/preload.xml b/docs-xml/smbdotconf/misc/preload.xml
index 54f5999444c..70d7ca64d7b 100644
--- a/docs-xml/smbdotconf/misc/preload.xml
+++ b/docs-xml/smbdotconf/misc/preload.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="preload"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  function="auto_services"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/registryshares.xml b/docs-xml/smbdotconf/misc/registryshares.xml
index 0c2eddc4c29..bb250052cb8 100644
--- a/docs-xml/smbdotconf/misc/registryshares.xml
+++ b/docs-xml/smbdotconf/misc/registryshares.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="registry shares"
                  context="G"
 		 type="boolean"
-		 advanced="1"
                  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 fa6c04f2ec8..5d442ea60b1 100644
--- a/docs-xml/smbdotconf/misc/remoteannounce.xml
+++ b/docs-xml/smbdotconf/misc/remoteannounce.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="remote announce"
 	         context="G"
-		 advanced="1" developer="1"
 		 type="string"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/remotebrowsesync.xml b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
index d6e66f15eb9..2c7547de387 100644
--- a/docs-xml/smbdotconf/misc/remotebrowsesync.xml
+++ b/docs-xml/smbdotconf/misc/remotebrowsesync.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="remote browse sync"
 	         context="G"
-		 advanced="1" developer="1"
 		 type="string"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/resetonzerovc.xml b/docs-xml/smbdotconf/misc/resetonzerovc.xml
index 3276cf51439..1fa30234ba6 100644
--- a/docs-xml/smbdotconf/misc/resetonzerovc.xml
+++ b/docs-xml/smbdotconf/misc/resetonzerovc.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="reset on zero vc"
 		 context="G"
 		 type="boolean"
-		 advanced="1" developer="0"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/rootpostexec.xml b/docs-xml/smbdotconf/misc/rootpostexec.xml
index 4aff4f03341..5a9613c3606 100644
--- a/docs-xml/smbdotconf/misc/rootpostexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpostexec.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="root postexec"
 		 context="S"
 		 type="string"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/rootpreexec.xml b/docs-xml/smbdotconf/misc/rootpreexec.xml
index 89d10ec53b4..f0fff733a6c 100644
--- a/docs-xml/smbdotconf/misc/rootpreexec.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexec.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="root preexec"
 		 context="S"
 		 type="string"
-		 advanced="1" wizard="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/rootpreexecclose.xml b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
index e0f11b567a8..3bce9156833 100644
--- a/docs-xml/smbdotconf/misc/rootpreexecclose.xml
+++ b/docs-xml/smbdotconf/misc/rootpreexecclose.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="root preexec close"
 		 context="S"
 		 type="boolean"
-		 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is the same as the <parameter moreinfo="none">preexec close
diff --git a/docs-xml/smbdotconf/misc/rpcdaemon.xml b/docs-xml/smbdotconf/misc/rpcdaemon.xml
index a06e91d613e..e9654a010d8 100644
--- a/docs-xml/smbdotconf/misc/rpcdaemon.xml
+++ b/docs-xml/smbdotconf/misc/rpcdaemon.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="rpc_daemon:DAEMON"
                  context="G"
 		 type="string"
-		 advanced="1" print="1"
                  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 9a229396f91..d2858725840 100644
--- a/docs-xml/smbdotconf/misc/rpcserver.xml
+++ b/docs-xml/smbdotconf/misc/rpcserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="rpc_server:SERVER"
                  context="G"
 		 type="string"
-		 advanced="1" print="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml
index 1079868678a..71200eac9bb 100644
--- a/docs-xml/smbdotconf/misc/statedirectory.xml
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="state directory"
                  context="G"
-                 advanced="1" developer="1"
 		 type="string"
 		 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/misc/usershareallowguests.xml b/docs-xml/smbdotconf/misc/usershareallowguests.xml
index a3ae5183b09..6fd75d12b7b 100644
--- a/docs-xml/smbdotconf/misc/usershareallowguests.xml
+++ b/docs-xml/smbdotconf/misc/usershareallowguests.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare allow guests"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usersharemaxshares.xml b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
index ed76283e614..1d2bab76abe 100644
--- a/docs-xml/smbdotconf/misc/usersharemaxshares.xml
+++ b/docs-xml/smbdotconf/misc/usersharemaxshares.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare max shares"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="integer"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usershareowneronly.xml b/docs-xml/smbdotconf/misc/usershareowneronly.xml
index 74e64aadaec..acfb1dfad1d 100644
--- a/docs-xml/smbdotconf/misc/usershareowneronly.xml
+++ b/docs-xml/smbdotconf/misc/usershareowneronly.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare owner only"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usersharepath.xml b/docs-xml/smbdotconf/misc/usersharepath.xml
index a095f17178d..a1b2841fd73 100644
--- a/docs-xml/smbdotconf/misc/usersharepath.xml
+++ b/docs-xml/smbdotconf/misc/usersharepath.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare path"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="string"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index 9fcba9d041a..481431e503f 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare prefix allow list"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="list"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
index bd34f795159..396e8c1a8a1 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixdenylist.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare prefix deny list"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="list"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
index fd8d5730120..dd50f43d4a9 100644
--- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
+++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="usershare template share"
 	         context="G"
-		 basic="1" advanced="1"
 		 type="string"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/utmp.xml b/docs-xml/smbdotconf/misc/utmp.xml
index 67c02cc64c0..6382d46af92 100644
--- a/docs-xml/smbdotconf/misc/utmp.xml
+++ b/docs-xml/smbdotconf/misc/utmp.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="utmp"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/misc/utmpdirectory.xml b/docs-xml/smbdotconf/misc/utmpdirectory.xml
index 9eb5010531d..b962ff39208 100644
--- a/docs-xml/smbdotconf/misc/utmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/utmpdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="utmp directory"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/wtmpdirectory.xml b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
index c6c6eccb1f6..465215321f8 100644
--- a/docs-xml/smbdotconf/misc/wtmpdirectory.xml
+++ b/docs-xml/smbdotconf/misc/wtmpdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="wtmp directory"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 80e56c97ef6..8a44a975443 100644
--- a/docs-xml/smbdotconf/printing/addportcommand.xml
+++ b/docs-xml/smbdotconf/printing/addportcommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="addport command"
                  context="G"
 				 type="string"
-		 advanced="1" developer="1"
                  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 c66f43eb3ff..36d0f850577 100644
--- a/docs-xml/smbdotconf/printing/addprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/addprintercommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="addprinter command"
                  context="G"
 				 type="string"
-		 advanced="1" developer="1"
                  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/cupsconnectiontimeout.xml b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
index 1c7df15c3ce..bcb6985c030 100644
--- a/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
+++ b/docs-xml/smbdotconf/printing/cupsconnectiontimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cups connection timeout"
                  context="G"
 		 type="integer"
-		 print="1"
                  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 27392ea2000..cba55d24164 100644
--- a/docs-xml/smbdotconf/printing/cupsencrypt.xml
+++ b/docs-xml/smbdotconf/printing/cupsencrypt.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cups encrypt"
 	context="G"
 	type="enum"
-	advanced="1" print="1"
                  generated_function="0"
 	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/cupsoptions.xml b/docs-xml/smbdotconf/printing/cupsoptions.xml
index 616e2732669..6079b191433 100644
--- a/docs-xml/smbdotconf/printing/cupsoptions.xml
+++ b/docs-xml/smbdotconf/printing/cupsoptions.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cups options"
                  context="S"
 		 type="string"
-		 print="1"
                  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 b31db33eac5..a301985cfb1 100644
--- a/docs-xml/smbdotconf/printing/cupsserver.xml
+++ b/docs-xml/smbdotconf/printing/cupsserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cups server"
                  context="G"
 		 type="string"
-		 print="1"
                  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 218ddcb3561..c2c7d3e38cf 100644
--- a/docs-xml/smbdotconf/printing/defaultdevmode.xml
+++ b/docs-xml/smbdotconf/printing/defaultdevmode.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="default devmode"
                  context="S"
 				 type="boolean"
-		 print="1"
                  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 597387c9270..f26fc000c09 100644
--- a/docs-xml/smbdotconf/printing/deleteprintercommand.xml
+++ b/docs-xml/smbdotconf/printing/deleteprintercommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="deleteprinter command"
                  context="G"
 				 type="string"
-		 advanced="1" developer="1"
                  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 883e1a8093d..63c2e194862 100644
--- a/docs-xml/smbdotconf/printing/disablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/disablespoolss.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="disable spoolss"
                  context="G"
 				 type="boolean"
-		 print="1"
                  function="_disable_spoolss"
                  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 41db7395446..17880c6a485 100644
--- a/docs-xml/smbdotconf/printing/enumportscommand.xml
+++ b/docs-xml/smbdotconf/printing/enumportscommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="enumports command"
                  context="G"
 				 type="string"
-		 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The concept of a &quot;port&quot; is fairly foreign
diff --git a/docs-xml/smbdotconf/printing/forceprintername.xml b/docs-xml/smbdotconf/printing/forceprintername.xml
index 453feedc781..75034944aaf 100644
--- a/docs-xml/smbdotconf/printing/forceprintername.xml
+++ b/docs-xml/smbdotconf/printing/forceprintername.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="force printername"
                  context="S"
 		 type="boolean"
-		 print="1"
                  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 81c7ca55a24..55a05945271 100644
--- a/docs-xml/smbdotconf/printing/iprintserver.xml
+++ b/docs-xml/smbdotconf/printing/iprintserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="iprint server"
                  context="G"
 		 type="string"
-		 print="1"
                  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 7e40ebee182..207274592c3 100644
--- a/docs-xml/smbdotconf/printing/loadprinters.xml
+++ b/docs-xml/smbdotconf/printing/loadprinters.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="load printers"
                  context="G"
 				 type="boolean"
-		 print="1"
                  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 a165375e042..0ca8f4d0110 100644
--- a/docs-xml/smbdotconf/printing/lppausecommand.xml
+++ b/docs-xml/smbdotconf/printing/lppausecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lppause command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 5a64937906a..dcced48488d 100644
--- a/docs-xml/smbdotconf/printing/lpqcachetime.xml
+++ b/docs-xml/smbdotconf/printing/lpqcachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lpq cache time"
 		 context="G"
 		 type="integer"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This controls how long lpq info will be cached 
diff --git a/docs-xml/smbdotconf/printing/lpqcommand.xml b/docs-xml/smbdotconf/printing/lpqcommand.xml
index 1e021399817..ee2c3d08146 100644
--- a/docs-xml/smbdotconf/printing/lpqcommand.xml
+++ b/docs-xml/smbdotconf/printing/lpqcommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lpq command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 ef7639cbfa4..e769fe356fb 100644
--- a/docs-xml/smbdotconf/printing/lpresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/lpresumecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lpresume command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 7ce99640b73..d542868d7f3 100644
--- a/docs-xml/smbdotconf/printing/lprmcommand.xml
+++ b/docs-xml/smbdotconf/printing/lprmcommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lprm command"
                  context="S"
 				 type="string"
-				 print="1"
                  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 659e173d105..0b3db05452a 100644
--- a/docs-xml/smbdotconf/printing/maxprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxprintjobs.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="max print jobs"
                  context="S"
-		 print="1"
 		 type="integer"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
index 34a5eb71c1a..e5e95700f12 100644
--- a/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
+++ b/docs-xml/smbdotconf/printing/maxreportedprintjobs.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max reported print jobs"
                  context="S"
 				 type="integer"
-		 print="1"
                  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 a578d3af443..c06002cdf73 100644
--- a/docs-xml/smbdotconf/printing/os2drivermap.xml
+++ b/docs-xml/smbdotconf/printing/os2drivermap.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="os2 driver map"
                  context="G"
-		 advanced="1" developer="1"
 		 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/printable.xml b/docs-xml/smbdotconf/printing/printable.xml
index 73aa533ed3b..ab8b5de3c9c 100644
--- a/docs-xml/smbdotconf/printing/printable.xml
+++ b/docs-xml/smbdotconf/printing/printable.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="printable"
                  context="S"
-				 print="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>print ok</synonym>
diff --git a/docs-xml/smbdotconf/printing/printcapcachetime.xml b/docs-xml/smbdotconf/printing/printcapcachetime.xml
index e9e0c98aeca..4bbcb2d5da8 100644
--- a/docs-xml/smbdotconf/printing/printcapcachetime.xml
+++ b/docs-xml/smbdotconf/printing/printcapcachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="printcap cache time"
 	context="G"
 	type="integer"
-		 print="1" developer="1"
                  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 1b9c852e603..edb47d7b57e 100644
--- a/docs-xml/smbdotconf/printing/printcapname.xml
+++ b/docs-xml/smbdotconf/printing/printcapname.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="printcap name"
 	context="G"
 	type="string"
-		 print="1" developer="1"
                  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 461d6de8e38..18881e9f940 100644
--- a/docs-xml/smbdotconf/printing/printcommand.xml
+++ b/docs-xml/smbdotconf/printing/printcommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="print command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 0e3a11a8f13..1d3f79e6c49 100644
--- a/docs-xml/smbdotconf/printing/printername.xml
+++ b/docs-xml/smbdotconf/printing/printername.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="printer name"
                  context="S"
-		 print="1"
 		 type="string"
                  function="_printername"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/printing/printing.xml b/docs-xml/smbdotconf/printing/printing.xml
index a1a21789402..14ec2b0c454 100644
--- a/docs-xml/smbdotconf/printing/printing.xml
+++ b/docs-xml/smbdotconf/printing/printing.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="printing"
                  context="S"
 				 type="enum"
-		 print="1"
                  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 782336ec92b..71d143c69b7 100644
--- a/docs-xml/smbdotconf/printing/printjobusername.xml
+++ b/docs-xml/smbdotconf/printing/printjobusername.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="printjob username"
                  context="S"
 				 type="string"
-		 print="1"
                  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 ce6a595fc96..b9d32ec357c 100644
--- a/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
+++ b/docs-xml/smbdotconf/printing/printnotifybackchannel.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="print notify backchannel"
 		 context="S"
-		 print="1"
 		 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/printing/queuepausecommand.xml b/docs-xml/smbdotconf/printing/queuepausecommand.xml
index 21b56c96654..c396a677bc1 100644
--- a/docs-xml/smbdotconf/printing/queuepausecommand.xml
+++ b/docs-xml/smbdotconf/printing/queuepausecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="queuepause command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 749bb02c658..ec1fb972525 100644
--- a/docs-xml/smbdotconf/printing/queueresumecommand.xml
+++ b/docs-xml/smbdotconf/printing/queueresumecommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="queueresume command"
                  context="S"
 				 type="string"
-		 print="1"
                  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 f24bdb529cd..542ca0bdd6c 100644
--- a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
+++ b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="show add printer wizard"
                  context="G"
 				 type="boolean"
-		 advanced="1" developer="1"
                  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 5ce9f13d657..a0739d50eb7 100644
--- a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
+++ b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
@@ -1,8 +1,6 @@
 <samba:parameter name="spoolss: architecture"
 		 context="G"
 		 type="string"
-		 advanced="1"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows spoolss print clients only allow association of server-side drivers
diff --git a/docs-xml/smbdotconf/printing/spoolssosversion.xml b/docs-xml/smbdotconf/printing/spoolssosversion.xml
index a63a4ced698..cd568e736d4 100644
--- a/docs-xml/smbdotconf/printing/spoolssosversion.xml
+++ b/docs-xml/smbdotconf/printing/spoolssosversion.xml
@@ -1,8 +1,6 @@
 <samba:parameter name="spoolss: os_major"
 		 context="G"
 		 type="integer"
-		 advanced="1"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows might require a new os version number. This option allows
@@ -17,8 +15,6 @@
 <samba:parameter name="spoolss: os_minor"
 		 context="G"
 		 type="integer"
-		 advanced="1"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows might require a new os version number. This option allows
@@ -33,8 +29,6 @@
 <samba:parameter name="spoolss: os_build"
 		 context="G"
 		 type="integer"
-		 advanced="1"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Windows might require a new os version number. This option allows
diff --git a/docs-xml/smbdotconf/printing/useclientdriver.xml b/docs-xml/smbdotconf/printing/useclientdriver.xml
index ecb9c3cdcf4..47fbb3e465f 100644
--- a/docs-xml/smbdotconf/printing/useclientdriver.xml
+++ b/docs-xml/smbdotconf/printing/useclientdriver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="use client driver"
                  context="S"
 				 type="boolean"
-		 print="1"
                  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/aclallowexecutealways.xml b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
index 672e891c60c..60ffb34a5ff 100644
--- a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
+++ b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="acl allow execute always"
                  context="S"
                  type="boolean"
-                 advanced="1" wizard="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 6b6866e542b..91d2b3fbef1 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="acl check permissions"
                  context="S"
 		 type="boolean"
-                 advanced="1" wizard="1"
                  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 450a967c301..33b6e51e4d5 100644
--- a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
+++ b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="acl map full control"
 		context="S"
 		type="boolean"
-		advanced="1" wizard="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/protocol/cldapport.xml b/docs-xml/smbdotconf/protocol/cldapport.xml
index c5f76065afa..ed41f11b06a 100644
--- a/docs-xml/smbdotconf/protocol/cldapport.xml
+++ b/docs-xml/smbdotconf/protocol/cldapport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="cldap port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 9321d3f97bb..1b1681478c3 100644
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client max protocol"
 		 context="G"
 		 type="enum"
-		 developer="1"
 		 function="_client_max_protocol"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/clientminprotocol.xml b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
index 84e03eac902..c906a154084 100644
--- a/docs-xml/smbdotconf/protocol/clientminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientminprotocol.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client min protocol"
 		 context="G"
 		 type="enum"
-		 developer="1"
 		 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/clientusespnego.xml b/docs-xml/smbdotconf/protocol/clientusespnego.xml
index c688a656f4f..b95ad0ea910 100644
--- a/docs-xml/smbdotconf/protocol/clientusespnego.xml
+++ b/docs-xml/smbdotconf/protocol/clientusespnego.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client use spnego"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 25ccd233e6a..7fc172bb5d5 100644
--- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
+++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dcerpc endpoint servers"
                  context="G"
 				 type="list"
-                 advanced="1" developer="1"
                  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 00ee27dad52..bf3b52454dd 100644
--- a/docs-xml/smbdotconf/protocol/defersharingviolations.xml
+++ b/docs-xml/smbdotconf/protocol/defersharingviolations.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="defer sharing violations"
                  context="G"
 		 type="boolean"
-                 developer="1"
                  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 a90310dcb55..cac72437ace 100644
--- a/docs-xml/smbdotconf/protocol/dgramport.xml
+++ b/docs-xml/smbdotconf/protocol/dgramport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dgram port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 e78cb8c4f7c..a7b575934a1 100644
--- a/docs-xml/smbdotconf/protocol/disablenetbios.xml
+++ b/docs-xml/smbdotconf/protocol/disablenetbios.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="disable netbios"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/durablehandles.xml b/docs-xml/smbdotconf/protocol/durablehandles.xml
index 011fabd8ab9..4267b2970f3 100644
--- a/docs-xml/smbdotconf/protocol/durablehandles.xml
+++ b/docs-xml/smbdotconf/protocol/durablehandles.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="durable handles"
                  context="S"
-                 advanced="1"
                  type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/easupport.xml b/docs-xml/smbdotconf/protocol/easupport.xml
index ba210fdac7e..fc37f718d91 100644
--- a/docs-xml/smbdotconf/protocol/easupport.xml
+++ b/docs-xml/smbdotconf/protocol/easupport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ea support"
                  context="S"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 8f25103a8d8..f938ed8007b 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="enable asu support"
 		 context="G"
-		 advanced="1" developer="1"
 		 type="boolean"
 		 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 0b4158d1617..5a34bfd484b 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="large readwrite"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 ef0b4eb6d6e..5b2de34e38e 100644
--- a/docs-xml/smbdotconf/protocol/mapaclinherit.xml
+++ b/docs-xml/smbdotconf/protocol/mapaclinherit.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="map acl inherit"
                  context="S"
 				 type="boolean"
-                 advanced="1" wizard="1"
                  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 71998c974fc..82817225d8e 100644
--- a/docs-xml/smbdotconf/protocol/maxmux.xml
+++ b/docs-xml/smbdotconf/protocol/maxmux.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="max mux"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/maxttl.xml b/docs-xml/smbdotconf/protocol/maxttl.xml
index 00f735d3a94..8813b4073e3 100644
--- a/docs-xml/smbdotconf/protocol/maxttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxttl.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max ttl"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 09935cdd9b6..6c37a0391c8 100644
--- a/docs-xml/smbdotconf/protocol/maxwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/maxwinsttl.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max wins ttl"
 				 type="integer"
                  context="G"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option tells <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/maxxmit.xml b/docs-xml/smbdotconf/protocol/maxxmit.xml
index 3804ae21e35..875efa0cc34 100644
--- a/docs-xml/smbdotconf/protocol/maxxmit.xml
+++ b/docs-xml/smbdotconf/protocol/maxxmit.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max xmit"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 0bad7f8f1e6..4f40ecfb4d8 100644
--- a/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
+++ b/docs-xml/smbdotconf/protocol/minreceivefilesize.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="min receivefile size"
 		type="integer"
 		context="G"
-		advanced="1" developer="1"
                  generated_function="0"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/minwinsttl.xml b/docs-xml/smbdotconf/protocol/minwinsttl.xml
index 38fbd7b0ebb..dbeb6d1915a 100644
--- a/docs-xml/smbdotconf/protocol/minwinsttl.xml
+++ b/docs-xml/smbdotconf/protocol/minwinsttl.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="min wins ttl"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 662c3fbee95..17a4d95f567 100644
--- a/docs-xml/smbdotconf/protocol/nameresolveorder.xml
+++ b/docs-xml/smbdotconf/protocol/nameresolveorder.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="name resolve order"
                  context="G"
 				 type="list"
-                 advanced="1" wizard="1" developer="1"
                  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 f7ec1e72973..0c06d7cad16 100644
--- a/docs-xml/smbdotconf/protocol/nbtport.xml
+++ b/docs-xml/smbdotconf/protocol/nbtport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="nbt port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 451d5d830ea..79381101ca3 100644
--- a/docs-xml/smbdotconf/protocol/ntaclsupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntaclsupport.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="nt acl support"
                  context="S"
-                 advanced="1" wizard="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/ntpipesupport.xml b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
index 7c310846b2f..9acfeda439a 100644
--- a/docs-xml/smbdotconf/protocol/ntpipesupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntpipesupport.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="nt pipe support"
                  context="G"
-                 advanced="1" developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/ntstatussupport.xml b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
index 4dfc142e2e6..961e2ae2720 100644
--- a/docs-xml/smbdotconf/protocol/ntstatussupport.xml
+++ b/docs-xml/smbdotconf/protocol/ntstatussupport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="nt status support"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 be897539cc4..956e41f1fe8 100644
--- a/docs-xml/smbdotconf/protocol/profileacls.xml
+++ b/docs-xml/smbdotconf/protocol/profileacls.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="profile acls"
                  context="S"
 				 type="boolean"
-                 advanced="1" wizard="1"
                  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 fb54cc0c000..f660b018d6b 100644
--- a/docs-xml/smbdotconf/protocol/readraw.xml
+++ b/docs-xml/smbdotconf/protocol/readraw.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="read raw"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 7989e7e7634..19330545036 100644
--- a/docs-xml/smbdotconf/protocol/rpcbigendian.xml
+++ b/docs-xml/smbdotconf/protocol/rpcbigendian.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="rpc big endian"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 822e42b12b4..41532a984f2 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server max protocol"
 		 context="G"
 		 type="enum"
-		 developer="1"
 		 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 fc249fc17bc..25457d9cd63 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server min protocol"
 		 context="G"
 		 type="enum"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>min protocol</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
index 713b95bda71..8709a28f48c 100644
--- a/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
+++ b/docs-xml/smbdotconf/protocol/sharefakefscaps.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="share:fake_fscaps"
 	context="G"
 	type="string"
-		 advanced="1" developer="0"
                  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 f349c4c2330..ef2ad48fd25 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb2 max credits"
 		type="integer"
 		context="G"
-		advanced="1" developer="1"
                  generated_function="0"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index 3b18531d239..9d05290e528 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb2 max read"
 		type="integer"
 		context="G"
-		advanced="1" developer="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index 64225a52c18..a1998c9e3d1 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb2 max trans"
 		type="integer"
 		context="G"
-		advanced="1" developer="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index 4e7103c58a2..5048d47953d 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb2 max write"
 		type="integer"
 		context="G"
-		advanced="1" developer="1"
 		xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 <para>This option specifies the protocol value that <citerefentry><refentrytitle>smbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/protocol/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml
index aaf4919db03..f21fe7fe431 100644
--- a/docs-xml/smbdotconf/protocol/smbports.xml
+++ b/docs-xml/smbdotconf/protocol/smbports.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb ports"
                  context="G"
 				 type="list"
-                 advanced="1" developer="1"
                  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/timeserver.xml b/docs-xml/smbdotconf/protocol/timeserver.xml
index 93d89183b5a..f907fbab8eb 100644
--- a/docs-xml/smbdotconf/protocol/timeserver.xml
+++ b/docs-xml/smbdotconf/protocol/timeserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="time server"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 dfcd1d81fe6..f7a23508282 100644
--- a/docs-xml/smbdotconf/protocol/unicode.xml
+++ b/docs-xml/smbdotconf/protocol/unicode.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="unicode"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 61a39cb7639..9bcf01d3e47 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="unix extensions"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 5c2abccffba..1bdb4baeb47 100644
--- a/docs-xml/smbdotconf/protocol/usespnego.xml
+++ b/docs-xml/smbdotconf/protocol/usespnego.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="use spnego"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 77eeef4eb58..7cc55b0144d 100644
--- a/docs-xml/smbdotconf/protocol/webport.xml
+++ b/docs-xml/smbdotconf/protocol/webport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="web port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 fb9e386b7d1..599104e699d 100644
--- a/docs-xml/smbdotconf/protocol/writeraw.xml
+++ b/docs-xml/smbdotconf/protocol/writeraw.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="write raw"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  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 66932d0c093..b33c4a50567 100644
--- a/docs-xml/smbdotconf/security/accessbasedshareenum.xml
+++ b/docs-xml/smbdotconf/security/accessbasedshareenum.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="access based share enum"
 		 type="boolean"
                  context="S"
-                 basic="1" advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
      <para>If this parameter is <constant>yes</constant> for a
diff --git a/docs-xml/smbdotconf/security/algorithmicridbase.xml b/docs-xml/smbdotconf/security/algorithmicridbase.xml
index bcf3ef673c0..4df3c3d0461 100644
--- a/docs-xml/smbdotconf/security/algorithmicridbase.xml
+++ b/docs-xml/smbdotconf/security/algorithmicridbase.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="algorithmic rid base"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/allowtrusteddomains.xml b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
index 57bf1d2422b..806bab72695 100644
--- a/docs-xml/smbdotconf/security/allowtrusteddomains.xml
+++ b/docs-xml/smbdotconf/security/allowtrusteddomains.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="allow trusted domains"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/authmethods.xml b/docs-xml/smbdotconf/security/authmethods.xml
index 39d211dbd3f..813c4cbe657 100644
--- a/docs-xml/smbdotconf/security/authmethods.xml
+++ b/docs-xml/smbdotconf/security/authmethods.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="auth methods"
                  context="G"
 				 type="list"
-                 basic="1" advanced="1" wizard="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/security/checkpasswordscript.xml b/docs-xml/smbdotconf/security/checkpasswordscript.xml
index df551a692dc..73997441430 100644
--- a/docs-xml/smbdotconf/security/checkpasswordscript.xml
+++ b/docs-xml/smbdotconf/security/checkpasswordscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="check password script"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 9c61dedeb90..4147f344785 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client lanman auth"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 7f303565ba5..d0f0a3748a2 100644
--- a/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+++ b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client NTLMv2 auth"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 c4061559db8..f640416be8a 100644
--- a/docs-xml/smbdotconf/security/clientplaintextauth.xml
+++ b/docs-xml/smbdotconf/security/clientplaintextauth.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client plaintext auth"
                  context="G"
 				 type="boolean"
-                 basic="1" advanced="1" wizard="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>Specifies whether a client should send a plaintext 
diff --git a/docs-xml/smbdotconf/security/clientschannel.xml b/docs-xml/smbdotconf/security/clientschannel.xml
index d293ee39619..62a47fea47f 100644
--- a/docs-xml/smbdotconf/security/clientschannel.xml
+++ b/docs-xml/smbdotconf/security/clientschannel.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="client schannel"
                  context="G"
-                 basic="1"
 				 type="enum"
 		 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 3b5687f7691..60b8ffe8632 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client signing"
                  context="G"
 				 type="enum"
-                 basic="1"
 		 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/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
index 792a7386f36..1d8214e5f27 100644
--- a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
+++ b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="client use spnego principal"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/dedicatedkeytabfile.xml b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
index 79fba82b8da..c8d6c2d85eb 100644
--- a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
+++ b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
@@ -1,5 +1,4 @@
 <samba:parameter name="dedicated keytab file" context="G" type="string"
-		 advanced="1" developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/encryptpasswords.xml b/docs-xml/smbdotconf/security/encryptpasswords.xml
index fdf0cfd43e6..4b7d50e9a66 100644
--- a/docs-xml/smbdotconf/security/encryptpasswords.xml
+++ b/docs-xml/smbdotconf/security/encryptpasswords.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="encrypt passwords"
                  context="G"
 				 type="boolean"
-                 basic="1" advanced="1" wizard="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This boolean controls whether encrypted passwords 
diff --git a/docs-xml/smbdotconf/security/guestaccount.xml b/docs-xml/smbdotconf/security/guestaccount.xml
index 9804a2bd425..905e79513d1 100644
--- a/docs-xml/smbdotconf/security/guestaccount.xml
+++ b/docs-xml/smbdotconf/security/guestaccount.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="guest account"
                  context="G"
 				 type="string"
-                 basic="1" advanced="1" developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/guestok.xml b/docs-xml/smbdotconf/security/guestok.xml
index f4b2c746f74..7a07ff1ba06 100644
--- a/docs-xml/smbdotconf/security/guestok.xml
+++ b/docs-xml/smbdotconf/security/guestok.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="guest ok"
 				 type="boolean"
                  context="S"
-                 basic="1" advanced="1" print="1" developer="1"
 				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>public</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/hostsallow.xml b/docs-xml/smbdotconf/security/hostsallow.xml
index 849b515f46a..35be404638f 100644
--- a/docs-xml/smbdotconf/security/hostsallow.xml
+++ b/docs-xml/smbdotconf/security/hostsallow.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="hosts allow"
                  context="S"
 				 type="list"
-                 basic="1" advanced="1" print="1" developer="1"
                  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 136f86c9c8a..2421a4e01a3 100644
--- a/docs-xml/smbdotconf/security/hostsdeny.xml
+++ b/docs-xml/smbdotconf/security/hostsdeny.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="hosts deny"
                  context="S"
 				 type="list"
-                 basic="1" advanced="1" print="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>deny hosts</synonym>
 <description>
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
index 9cd3530b028..a4948f2129c 100644
--- a/docs-xml/smbdotconf/security/kerberosmethod.xml
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -1,5 +1,4 @@
 <samba:parameter name="kerberos method" context="G" type="enum"
-		 advanced="1" developer="1"
                  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 419e86696e6..0555e782df8 100644
--- a/docs-xml/smbdotconf/security/kpasswdport.xml
+++ b/docs-xml/smbdotconf/security/kpasswdport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="kpasswd port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 e81053433f5..6c4f0a83578 100644
--- a/docs-xml/smbdotconf/security/krb5port.xml
+++ b/docs-xml/smbdotconf/security/krb5port.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="krb5 port"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 e055bd35f1a..44d18c462bd 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="lanman auth"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/lognttokencommand.xml b/docs-xml/smbdotconf/security/lognttokencommand.xml
index 33ec23b8106..66ec6c9e132 100644
--- a/docs-xml/smbdotconf/security/lognttokencommand.xml
+++ b/docs-xml/smbdotconf/security/lognttokencommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="log nt token command"
                  context="G"
                  type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option can be set to a command that will be called when new nt
diff --git a/docs-xml/smbdotconf/security/maptoguest.xml b/docs-xml/smbdotconf/security/maptoguest.xml
index 09017bcb107..2e4c6340c2a 100644
--- a/docs-xml/smbdotconf/security/maptoguest.xml
+++ b/docs-xml/smbdotconf/security/maptoguest.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="map to guest"
 				 type="enum"
                  context="G"
-                 advanced="1" developer="1"
 		 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/mapuntrustedtodomain.xml b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
index bcf65e6eb6d..69f4d823b8b 100644
--- a/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
+++ b/docs-xml/smbdotconf/security/mapuntrustedtodomain.xml
@@ -1,8 +1,6 @@
 <samba:parameter name="map untrusted to domain"
                  context="G"
 		 type="boolean"
-		 advanced="1"
-		 developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml b/docs-xml/smbdotconf/security/ntlmauth.xml
index ec603bbf59b..a39f9e5197b 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ntlm auth"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/ntpsigndsocketdirectory.xml b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
index ce25d361107..a2c92a4aa31 100644
--- a/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
+++ b/docs-xml/smbdotconf/security/ntpsigndsocketdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ntp signd socket directory"
                  context="G"
                  type="string"
-                 advanced="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/nullpasswords.xml b/docs-xml/smbdotconf/security/nullpasswords.xml
index 402114e2598..3d7b2ad5276 100644
--- a/docs-xml/smbdotconf/security/nullpasswords.xml
+++ b/docs-xml/smbdotconf/security/nullpasswords.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="null passwords"
                  context="G"
-                 advanced="1" developer="1"
 				 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/obeypamrestrictions.xml b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
index 40777f4f5da..e4b2b6c4bf7 100644
--- a/docs-xml/smbdotconf/security/obeypamrestrictions.xml
+++ b/docs-xml/smbdotconf/security/obeypamrestrictions.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="obey pam restrictions"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>When Samba 3.0 is configured to enable PAM support
diff --git a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
index ead720a7fe8..718cd3241bb 100644
--- a/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
+++ b/docs-xml/smbdotconf/security/oldpasswordallowedperiod.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="old password allowed period"
                  context="G"
-                 advanced="1"
 				 type="integer"
 		 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 e5c04d405cc..973a10bff55 100644
--- a/docs-xml/smbdotconf/security/pampasswordchange.xml
+++ b/docs-xml/smbdotconf/security/pampasswordchange.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="pam password change"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>With the addition of better PAM support in Samba 2.2, 
diff --git a/docs-xml/smbdotconf/security/passdbbackend.xml b/docs-xml/smbdotconf/security/passdbbackend.xml
index 1189d98d808..4f5321d2aeb 100644
--- a/docs-xml/smbdotconf/security/passdbbackend.xml
+++ b/docs-xml/smbdotconf/security/passdbbackend.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="passdb backend"
                  context="G"
 		 type="string"
-                 advanced="1" developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
index 08c893191a2..778a3909a88 100644
--- a/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
+++ b/docs-xml/smbdotconf/security/passdbexpandexplicit.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="passdb expand explicit"
                  context="G"
-                 advanced="1" developer="0"
 				 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index e2f672b1c10..bce0d43fedf 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="passwd chat"
                  context="G"
 		 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This string controls the <emphasis>&quot;chat&quot;</emphasis> 
diff --git a/docs-xml/smbdotconf/security/passwdchatdebug.xml b/docs-xml/smbdotconf/security/passwdchatdebug.xml
index 24bcbdba108..9046f2084ad 100644
--- a/docs-xml/smbdotconf/security/passwdchatdebug.xml
+++ b/docs-xml/smbdotconf/security/passwdchatdebug.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="passwd chat debug"
                  context="G"
-                 advanced="1" developer="1"
 				 type="boolean"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/passwdchattimeout.xml b/docs-xml/smbdotconf/security/passwdchattimeout.xml
index c371aa2c88c..07374ff9e47 100644
--- a/docs-xml/smbdotconf/security/passwdchattimeout.xml
+++ b/docs-xml/smbdotconf/security/passwdchattimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="passwd chat timeout"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 4158c1b7a6a..94649e26366 100644
--- a/docs-xml/smbdotconf/security/passwdprogram.xml
+++ b/docs-xml/smbdotconf/security/passwdprogram.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="passwd program"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
     <para>The name of a program that can be used to set 
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 24d4a0066ed..e01adb6bc90 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="password server"
                  context="G"
 				 type="string"
-                 advanced="1" wizard="1" developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/preloadmodules.xml b/docs-xml/smbdotconf/security/preloadmodules.xml
index 1d985a1995a..44eb46778cd 100644
--- a/docs-xml/smbdotconf/security/preloadmodules.xml
+++ b/docs-xml/smbdotconf/security/preloadmodules.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="preload modules"
 		type="list"
 		 context="G"
-		 basic="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a list of paths to modules that should
diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml
index 9142bde3e59..4189f6bb463 100644
--- a/docs-xml/smbdotconf/security/privatedir.xml
+++ b/docs-xml/smbdotconf/security/privatedir.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="private dir"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>private directory</synonym>
diff --git a/docs-xml/smbdotconf/security/readonly.xml b/docs-xml/smbdotconf/security/readonly.xml
index 612bf0d87db..f587f679bd2 100644
--- a/docs-xml/smbdotconf/security/readonly.xml
+++ b/docs-xml/smbdotconf/security/readonly.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="read only"
                  context="S"
 				 type="boolean"
-                 basic="1" advanced="1"
                  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 03ade315632..472a4a398c4 100644
--- a/docs-xml/smbdotconf/security/renameuserscript.xml
+++ b/docs-xml/smbdotconf/security/renameuserscript.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="rename user script"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
 				 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/restrictanonymous.xml b/docs-xml/smbdotconf/security/restrictanonymous.xml
index 8e2ef081d1c..ffea693bd39 100644
--- a/docs-xml/smbdotconf/security/restrictanonymous.xml
+++ b/docs-xml/smbdotconf/security/restrictanonymous.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="restrict anonymous"
 	type="integer"
                  context="G"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The setting of this parameter determines whether user and
diff --git a/docs-xml/smbdotconf/security/rootdirectory.xml b/docs-xml/smbdotconf/security/rootdirectory.xml
index 93a7d59dce8..d5a071ed713 100644
--- a/docs-xml/smbdotconf/security/rootdirectory.xml
+++ b/docs-xml/smbdotconf/security/rootdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="root directory"
 	context="G"
 	type="string"
-                 advanced="1" developer="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>root</synonym>
 <synonym>root dir</synonym>
diff --git a/docs-xml/smbdotconf/security/sambakcccommand.xml b/docs-xml/smbdotconf/security/sambakcccommand.xml
index d990d8f305f..cf944809693 100644
--- a/docs-xml/smbdotconf/security/sambakcccommand.xml
+++ b/docs-xml/smbdotconf/security/sambakcccommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="samba kcc command"
                  context="G"
                  type="list"
-                 advanced="1" 
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option specifies the path to the Samba KCC command.
diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index e7e6b328741..ac248d02065 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="security"
                  context="G"
 				 type="enum"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  function="_security"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 		 <when_value value="security">
diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml
index cd4b685a64a..e6ff39903a0 100644
--- a/docs-xml/smbdotconf/security/serverrole.xml
+++ b/docs-xml/smbdotconf/security/serverrole.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server role"
                  context="G"
 				 type="enum"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  function="_server_role"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index 573e94ba7c8..aee63cc1586 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server schannel"
                  context="G"
 				 type="enum"
-                 basic="1"
 		 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 c94a3ee6ba2..9fdb83340af 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="server signing"
                  context="G"
 				 type="enum"
-                 basic="1"
 		 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 14b32c2b675..17248e6c46d 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb encrypt"
                  context="S"
 				 type="enum"
-                 basic="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
diff --git a/docs-xml/smbdotconf/security/smbpasswdfile.xml b/docs-xml/smbdotconf/security/smbpasswdfile.xml
index 86701a284fa..7ca8584ca89 100644
--- a/docs-xml/smbdotconf/security/smbpasswdfile.xml
+++ b/docs-xml/smbdotconf/security/smbpasswdfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="smb passwd file"
 	type="string"
                  context="G"
-                 advanced="1" developer="1"
                  constant="1"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml
index 889dd23f3b1..149891342c8 100644
--- a/docs-xml/smbdotconf/security/tlscafile.xml
+++ b/docs-xml/smbdotconf/security/tlscafile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls cafile"
                  type="string"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_tls_cafile"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlscertfile.xml b/docs-xml/smbdotconf/security/tlscertfile.xml
index df5fb5fbf64..0d06936a041 100644
--- a/docs-xml/smbdotconf/security/tlscertfile.xml
+++ b/docs-xml/smbdotconf/security/tlscertfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls certfile"
                  type="string"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_tls_certfile"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlscrlfile.xml b/docs-xml/smbdotconf/security/tlscrlfile.xml
index 4c9de355678..c0f1cfb5b8b 100644
--- a/docs-xml/smbdotconf/security/tlscrlfile.xml
+++ b/docs-xml/smbdotconf/security/tlscrlfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls crlfile"
                  type="string"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_tls_crlfile"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
index b965b1ebec4..7d454f3635c 100644
--- a/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
+++ b/docs-xml/smbdotconf/security/tlsdhparamsfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls dh params file"
                  type="string"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_tls_dhpfile"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/tlsenabled.xml b/docs-xml/smbdotconf/security/tlsenabled.xml
index 106dddade66..411b9281b07 100644
--- a/docs-xml/smbdotconf/security/tlsenabled.xml
+++ b/docs-xml/smbdotconf/security/tlsenabled.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls enabled"
                  type="boolean"
                  context="G"
-                 basic="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	 <para>If this option is set to <constant>yes</constant>, then Samba
diff --git a/docs-xml/smbdotconf/security/tlskeyfile.xml b/docs-xml/smbdotconf/security/tlskeyfile.xml
index a1c7be3f388..e6b4a544cae 100644
--- a/docs-xml/smbdotconf/security/tlskeyfile.xml
+++ b/docs-xml/smbdotconf/security/tlskeyfile.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="tls keyfile"
                  type="string"
                  context="G"
-                 basic="1" advanced="1" developer="1"
                  function="_tls_keyfile"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/security/unixpasswordsync.xml b/docs-xml/smbdotconf/security/unixpasswordsync.xml
index 22971da01c1..d88254b5df1 100644
--- a/docs-xml/smbdotconf/security/unixpasswordsync.xml
+++ b/docs-xml/smbdotconf/security/unixpasswordsync.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="unix password sync"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/usernamelevel.xml b/docs-xml/smbdotconf/security/usernamelevel.xml
index adb00134d7b..d2cdb5b93a6 100644
--- a/docs-xml/smbdotconf/security/usernamelevel.xml
+++ b/docs-xml/smbdotconf/security/usernamelevel.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="username level"
                  context="G"
-                 advanced="1" developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/usernamemap.xml b/docs-xml/smbdotconf/security/usernamemap.xml
index 21098fa4631..c5a15d06f2d 100644
--- a/docs-xml/smbdotconf/security/usernamemap.xml
+++ b/docs-xml/smbdotconf/security/usernamemap.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="username map"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/usernamemapcachetime.xml b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
index 4361b1896d8..16aaaaf4b54 100644
--- a/docs-xml/smbdotconf/security/usernamemapcachetime.xml
+++ b/docs-xml/smbdotconf/security/usernamemapcachetime.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="username map cache time"
                  context="G"
-                 advanced="1" developer="0"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml
index 9e2e1a5ea65..2e43a788037 100644
--- a/docs-xml/smbdotconf/security/usernamemapscript.xml
+++ b/docs-xml/smbdotconf/security/usernamemapscript.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="username map script"
                  context="G"
 		 type="string"
-                 advanced="1" developer="1"
                  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/tuning/deadtime.xml b/docs-xml/smbdotconf/tuning/deadtime.xml
index 51b76bd85a5..7c60b90d097 100644
--- a/docs-xml/smbdotconf/tuning/deadtime.xml
+++ b/docs-xml/smbdotconf/tuning/deadtime.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="deadtime"
                  context="G"
-                 developer="1"
 				 type="integer"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/tuning/getwdcache.xml b/docs-xml/smbdotconf/tuning/getwdcache.xml
index 76e977b3962..93f7a90793d 100644
--- a/docs-xml/smbdotconf/tuning/getwdcache.xml
+++ b/docs-xml/smbdotconf/tuning/getwdcache.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="getwd cache"
                  context="G"
                  type="boolean"
-                 developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This is a tuning option. When this is enabled a 
diff --git a/docs-xml/smbdotconf/tuning/hostnamelookups.xml b/docs-xml/smbdotconf/tuning/hostnamelookups.xml
index 68f4ec4f408..03678e9adaf 100644
--- a/docs-xml/smbdotconf/tuning/hostnamelookups.xml
+++ b/docs-xml/smbdotconf/tuning/hostnamelookups.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="hostname lookups"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Specifies whether samba should use (expensive)
diff --git a/docs-xml/smbdotconf/tuning/keepalive.xml b/docs-xml/smbdotconf/tuning/keepalive.xml
index 5dba4f6a28c..7fbe8cca1ae 100644
--- a/docs-xml/smbdotconf/tuning/keepalive.xml
+++ b/docs-xml/smbdotconf/tuning/keepalive.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="keepalive"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>The value of the parameter (an integer) represents 
diff --git a/docs-xml/smbdotconf/tuning/maxdisksize.xml b/docs-xml/smbdotconf/tuning/maxdisksize.xml
index ee53105a8a5..27d74b922b3 100644
--- a/docs-xml/smbdotconf/tuning/maxdisksize.xml
+++ b/docs-xml/smbdotconf/tuning/maxdisksize.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max disk size"
                  context="G"
 				 type="integer"
-                 developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This option allows you to put an upper limit 
diff --git a/docs-xml/smbdotconf/tuning/maxopenfiles.xml b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
index 3bdc0c87c34..f873ef7d7ae 100644
--- a/docs-xml/smbdotconf/tuning/maxopenfiles.xml
+++ b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max open files"
 				 type="integer"
                  context="G"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter limits the maximum number of
diff --git a/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml b/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
index 677d731aa95..a194a26a13c 100644
--- a/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
+++ b/docs-xml/smbdotconf/tuning/maxsmbdprocesses.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="max smbd processes"
 				 type="integer"
                  context="G"
-                 developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This parameter limits the maximum number of <citerefentry><refentrytitle>smbd</refentrytitle>                                       
diff --git a/docs-xml/smbdotconf/tuning/minprintspace.xml b/docs-xml/smbdotconf/tuning/minprintspace.xml
index 706e4a70cf1..b5bba27a5aa 100644
--- a/docs-xml/smbdotconf/tuning/minprintspace.xml
+++ b/docs-xml/smbdotconf/tuning/minprintspace.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="min print space"
                  context="S"
 				 type="integer"
-                 print="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This sets the minimum amount of free disk 
diff --git a/docs-xml/smbdotconf/tuning/namecachetimeout.xml b/docs-xml/smbdotconf/tuning/namecachetimeout.xml
index 32ad55f1d0e..4d291945982 100644
--- a/docs-xml/smbdotconf/tuning/namecachetimeout.xml
+++ b/docs-xml/smbdotconf/tuning/namecachetimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="name cache timeout"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>Specifies the number of seconds it takes before 
diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml
index 213ff167ff5..d02f323a8da 100644
--- a/docs-xml/smbdotconf/tuning/socketoptions.xml
+++ b/docs-xml/smbdotconf/tuning/socketoptions.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="socket options"
                  context="G"
 				 type="string"
-                 developer="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/tuning/usemmap.xml b/docs-xml/smbdotconf/tuning/usemmap.xml
index c23fc358407..00c36c72877 100644
--- a/docs-xml/smbdotconf/tuning/usemmap.xml
+++ b/docs-xml/smbdotconf/tuning/usemmap.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="use mmap"
                  context="G"
 				 type="boolean"
-                 developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
     <para>This global parameter determines if the tdb internals of Samba can
diff --git a/docs-xml/smbdotconf/vfs/getquotacommand.xml b/docs-xml/smbdotconf/vfs/getquotacommand.xml
index eacd19cf793..7fcd829f50c 100644
--- a/docs-xml/smbdotconf/vfs/getquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/getquotacommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="get quota command"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>The <command>get quota command</command> should only be used 
diff --git a/docs-xml/smbdotconf/vfs/hostmsdfs.xml b/docs-xml/smbdotconf/vfs/hostmsdfs.xml
index 67f67dce45a..e61b0f6e97a 100644
--- a/docs-xml/smbdotconf/vfs/hostmsdfs.xml
+++ b/docs-xml/smbdotconf/vfs/hostmsdfs.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="host msdfs"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
 	<para>
diff --git a/docs-xml/smbdotconf/vfs/ntvfshandler.xml b/docs-xml/smbdotconf/vfs/ntvfshandler.xml
index b7c6d156987..af9d7bf900a 100644
--- a/docs-xml/smbdotconf/vfs/ntvfshandler.xml
+++ b/docs-xml/smbdotconf/vfs/ntvfshandler.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="ntvfs handler"
                  context="S"
                  type="list"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This specifies the NTVFS handlers for this share.</para>
diff --git a/docs-xml/smbdotconf/vfs/setquotacommand.xml b/docs-xml/smbdotconf/vfs/setquotacommand.xml
index cf62715ca5e..2a779d4a50f 100644
--- a/docs-xml/smbdotconf/vfs/setquotacommand.xml
+++ b/docs-xml/smbdotconf/vfs/setquotacommand.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="set quota command"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>The <command>set quota command</command> should only be used 
diff --git a/docs-xml/smbdotconf/winbind/createkrb5conf.xml b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
index be38519ac4a..bb2d300deea 100644
--- a/docs-xml/smbdotconf/winbind/createkrb5conf.xml
+++ b/docs-xml/smbdotconf/winbind/createkrb5conf.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="create krb5 conf"
 	context="G"
 	type="boolean"
-		 advanced="1" developer="0"
                  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 77de17e12b0..a554741b7ae 100644
--- a/docs-xml/smbdotconf/winbind/idmapbackend.xml
+++ b/docs-xml/smbdotconf/winbind/idmapbackend.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap backend"
                  context="G"
 		 type="string"
-                 advanced="1" developer="1" hide="1"
                  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 44e87edb9df..4fe65363b26 100644
--- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap cache time"
                  context="G"
 		 type="integer"
-                 advanced="1" developer="1"
                  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/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 30925a21ba7..434d379b076 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap config:OPTION"
                  context="G"
                  type="string"
-                 advanced="1" developer="1" hide="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/idmapgid.xml b/docs-xml/smbdotconf/winbind/idmapgid.xml
index 7f4521802f2..b5652b89b0f 100644
--- a/docs-xml/smbdotconf/winbind/idmapgid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapgid.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap gid"
                  context="G"
 		 type="string"
-                 advanced="1" developer="1" hide="1"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 		<synonym>winbind gid</synonym>
diff --git a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
index 6790938d947..76f538a4d21 100644
--- a/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
+++ b/docs-xml/smbdotconf/winbind/idmapnegativecachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap negative cache time"
                  context="G"
 		 type="integer"
-                 advanced="1" developer="1"
                  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 5a71d3e00c6..f72929c8574 100644
--- a/docs-xml/smbdotconf/winbind/idmapuid.xml
+++ b/docs-xml/smbdotconf/winbind/idmapuid.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="idmap uid"
 			 type="string"
                  context="G"
-                 advanced="1" developer="1" hide="1"
                  generated_function="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>winbind uid</synonym>
diff --git a/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml b/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
index 8294a90a2a9..247822e22e6 100644
--- a/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
+++ b/docs-xml/smbdotconf/winbind/netutralizent4emulation.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="neutralize nt4 emulation"
                  context="G"
                  type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether winbindd sends
diff --git a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
index 18f8bcb3490..37656293aa4 100644
--- a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
+++ b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="reject md5 servers"
                  context="G"
                  type="boolean"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether winbindd requires support
diff --git a/docs-xml/smbdotconf/winbind/requirestrongkey.xml b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
index de749bbb06d..4db62bfb02d 100644
--- a/docs-xml/smbdotconf/winbind/requirestrongkey.xml
+++ b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="require strong key"
                  context="G"
                  type="boolean"
-                 advanced="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether winbindd requires support
diff --git a/docs-xml/smbdotconf/winbind/templatehomedir.xml b/docs-xml/smbdotconf/winbind/templatehomedir.xml
index c289ac9bd75..2afa6b3ec32 100644
--- a/docs-xml/smbdotconf/winbind/templatehomedir.xml
+++ b/docs-xml/smbdotconf/winbind/templatehomedir.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="template homedir"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/winbind/templateshell.xml b/docs-xml/smbdotconf/winbind/templateshell.xml
index 68371617d59..0844bdf6a09 100644
--- a/docs-xml/smbdotconf/winbind/templateshell.xml
+++ b/docs-xml/smbdotconf/winbind/templateshell.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="template shell"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  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 6bdcf0d06ed..3ff80899564 100644
--- a/docs-xml/smbdotconf/winbind/winbindcachetime.xml
+++ b/docs-xml/smbdotconf/winbind/winbindcachetime.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind cache time"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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/winbinddprivilegedsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
index feb7828c60f..e8be177ad64 100644
--- a/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddprivilegedsocketdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbindd privileged socket directory"
                  context="G"
                  type="string"
-                 advanced="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
index b8edef5c082..9b20fbe8aee 100644
--- a/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
+++ b/docs-xml/smbdotconf/winbind/winbinddsocketdirectory.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbindd socket directory"
                  context="G"
                  type="string"
-                 advanced="1"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
index 74f6feed017..4d7b5e6cf66 100644
--- a/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindenumgroups.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind enum groups"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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/winbindenumusers.xml b/docs-xml/smbdotconf/winbind/winbindenumusers.xml
index 4054703bfe5..5ce53d6b51e 100644
--- a/docs-xml/smbdotconf/winbind/winbindenumusers.xml
+++ b/docs-xml/smbdotconf/winbind/winbindenumusers.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind enum users"
                  context="G"
                  type="boolean"
-                 advanced="1" developer="1"
                  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 57077b3cea8..73c1464ff1c 100644
--- a/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindexpandgroups.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind expand groups"
                  context="G"
 		 type="integer"
-                 advanced="1" developer="1"
                  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 ae49e45124e..d37ee25a3d5 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind max clients"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 e4925179d8b..c279244cb01 100644
--- a/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
+++ b/docs-xml/smbdotconf/winbind/winbindmaxdomainconnections.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind max domain connections"
 		 context="G"
 		 type="integer"
-		 advanced="1" developer="1"
                  generated_function="0"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
index 01e95bbaca6..8a8bc542117 100644
--- a/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnestedgroups.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind nested groups"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 28bd34cfbf3..8339cbf38da 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind normalize names"
                  context="G"
 		 type="boolean"
-                 advanced="1" developer="1"
                  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 fa88416fd0a..6b09be03268 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind nss info"
                  context="G"
 				 type="list"
-                 advanced="1" developer="1"
                  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 e482a111a33..1a5b522c385 100644
--- a/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
+++ b/docs-xml/smbdotconf/winbind/winbindofflinelogon.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind offline logon"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 2da263e5cec..11d105cca2b 100644
--- a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
+++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind reconnect delay"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 928039690cc..00c65dfeac2 100644
--- a/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrefreshtickets.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind refresh tickets"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 322087161d2..d6c9e089972 100644
--- a/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrequesttimeout.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind request timeout"
                  context="G"
 				 type="integer"
-                 advanced="1" developer="1"
                  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 71ac379925e..3019e7107bb 100644
--- a/docs-xml/smbdotconf/winbind/winbindrpconly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindrpconly.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind rpc only"
 	context="G"
 	type="boolean"
-		 advanced="1" developer="0"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
index 63f55883361..016ac9befcc 100644
--- a/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
+++ b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind sealed pipes"
                  context="G"
                  type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This option controls whether any requests from winbindd to domain controllers
diff --git a/docs-xml/smbdotconf/winbind/winbindseparator.xml b/docs-xml/smbdotconf/winbind/winbindseparator.xml
index e4995a8a314..8c4a11a129b 100644
--- a/docs-xml/smbdotconf/winbind/winbindseparator.xml
+++ b/docs-xml/smbdotconf/winbind/winbindseparator.xml
@@ -1,6 +1,5 @@
 <samba:parameter name="winbind separator"
                  context="G"
-                 advanced="1" developer="1"
 				 type="string"
                  constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
diff --git a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
index 3b1896ffece..629832cc26c 100644
--- a/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
+++ b/docs-xml/smbdotconf/winbind/winbindtrusteddomainsonly.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind trusted domains only"
                  context="G"
 		 type="boolean"
-                 advanced="1" developer="1"
                  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 c7e7600eab1..8278aa56750 100644
--- a/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
+++ b/docs-xml/smbdotconf/winbind/winbindusedefaultdomain.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="winbind use default domain"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  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 b367c44c8fe..6b3c1989195 100644
--- a/docs-xml/smbdotconf/wins/dnsproxy.xml
+++ b/docs-xml/smbdotconf/wins/dnsproxy.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="dns proxy"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  function="wins_dns_proxy"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/wins/winshook.xml b/docs-xml/smbdotconf/wins/winshook.xml
index 9e41fbd7c8a..748e8b8f239 100644
--- a/docs-xml/smbdotconf/wins/winshook.xml
+++ b/docs-xml/smbdotconf/wins/winshook.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="wins hook"
                  context="G"
 				 type="string"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>When Samba is running as a WINS server this 
diff --git a/docs-xml/smbdotconf/wins/winsproxy.xml b/docs-xml/smbdotconf/wins/winsproxy.xml
index 8f98687dba1..d240c2181f6 100644
--- a/docs-xml/smbdotconf/wins/winsproxy.xml
+++ b/docs-xml/smbdotconf/wins/winsproxy.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="wins proxy"
                  context="G"
 				 type="boolean"
-                 advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>This is a boolean that controls if <citerefentry><refentrytitle>nmbd</refentrytitle>                                 
diff --git a/docs-xml/smbdotconf/wins/winsserver.xml b/docs-xml/smbdotconf/wins/winsserver.xml
index 40e668fe4e4..69146fb8d76 100644
--- a/docs-xml/smbdotconf/wins/winsserver.xml
+++ b/docs-xml/smbdotconf/wins/winsserver.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="wins server"
                  context="G"
 				 type="list"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  function="wins_server_list"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/wins/winssupport.xml b/docs-xml/smbdotconf/wins/winssupport.xml
index 6bc3765e789..c1c7fed507e 100644
--- a/docs-xml/smbdotconf/wins/winssupport.xml
+++ b/docs-xml/smbdotconf/wins/winssupport.xml
@@ -1,7 +1,6 @@
 <samba:parameter name="wins support"
 	type="boolean"
                  context="G"
-                 basic="1" advanced="1" wizard="1" developer="1"
                  function="we_are_a_wins_server"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
  <description>
-- 
2.34.1