From: Jelmer Vernooij Date: Fri, 26 Sep 2003 00:00:07 +0000 (+0000) Subject: Follow DTD more strictly X-Git-Tag: samba-4.0.0alpha6~801^2~12566 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=dc5ba6c819d6e2428dec8b149410ebfd4fcfc573;p=vlendec%2Fsamba-autobuild%2F.git Follow DTD more strictly (This used to be commit 1e098b5b17b0fa505c528305c75d3c972935b100) --- diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml index 6d3e4942267..2badb828100 100644 --- a/docs/docbook/projdoc/AccessControls.xml +++ b/docs/docbook/projdoc/AccessControls.xml @@ -872,7 +872,7 @@ Before using any of the following options, please refer to the man page for &smb - SERVER\user (Long name) + "SERVER\user (Long name)" @@ -1027,10 +1027,10 @@ Before using any of the following options, please refer to the man page for &smb These are: - security mask - force security mode - directory security mask - force directory security mode + security mask + force security mode + directory security mask + force directory security mode @@ -1187,8 +1187,8 @@ are examples taken from the mailing list in recent times. - - This is the same as doing: + + This is the same as doing: &prompt;chown jack /foodbar &prompt;chgrp engr /foodbar diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml index 65d50b496e5..3534074b2c1 100644 --- a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml +++ b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml @@ -53,9 +53,9 @@ on Windows 9x/Me systems. The tools set includes: - Server Manager - User Manager for Domains - Event Viewer + Server Manager + User Manager for Domains + Event Viewer @@ -219,12 +219,12 @@ There are several opportunities for creating a custom network startup configurat - No Logon Script. - Simple universal Logon Script that applies to all users. - Use of a conditional Logon Script that applies per user or per group attributes. - Use of Samba's preexec and postexec functions on access to the NETLOGON share to create - a custom logon script and then execute it. - User of a tool such as KixStart. + No Logon Script. + Simple universal Logon Script that applies to all users. + Use of a conditional Logon Script that applies per user or per group attributes. + Use of Samba's preexec and postexec functions on access to the NETLOGON share to create + a custom logon script and then execute it. + User of a tool such as KixStart. @@ -323,8 +323,8 @@ Those wishing to use more elaborate or capable logon processing system should ch - http://www.craigelachi.e.org/rhacer/ntlogon - http://www.kixtart.org + http://www.craigelachi.e.org/rhacer/ntlogon + http://www.kixtart.org diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml index ece3b2acd15..ac1bb915c1c 100644 --- a/docs/docbook/projdoc/CUPS-printing.xml +++ b/docs/docbook/projdoc/CUPS-printing.xml @@ -588,7 +588,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Windows printing to a local printer.1small + Windows printing to a local printer.1small @@ -681,7 +681,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Printing to a PostScript printer. + Printing to a PostScript printer. 2small @@ -714,7 +714,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) - Ghostscript as a RIP for non-postscript printers. + Ghostscript as a RIP for non-postscript printers. 3small @@ -1123,7 +1123,7 @@ print options already embedded into the file. - Pre-filtering in CUPS to form PostScript. + Pre-filtering in CUPS to form PostScript. 4small @@ -1142,7 +1142,7 @@ stapling and punching it, and so on) into the PostScript file. - Adding device-specific print options. + Adding device-specific print options. 5small @@ -1183,7 +1183,7 @@ that are able to generate device-specific printer data. - PostScript to intermediate raster format.6small + PostScript to intermediate raster format.6small @@ -1200,7 +1200,7 @@ than one vendor financing the development of CUPS raster drivers). - CUPS-raster production using Ghostscript. + CUPS-raster production using Ghostscript. 7small @@ -1663,7 +1663,7 @@ specific model supports. See the figure below f PPDs shipped with CUPS - + PPD filePrinter type deskjet.ppdolder HP inkjet printers and compatible @@ -2112,7 +2112,7 @@ simply use printingsysv -Printing via CUPS/Samba server. +Printing via CUPS/Samba server. 13small @@ -2533,9 +2533,9 @@ the Windows NT/2000/XP client. - cups.hlp - cupsdrvr.dll - cupsui.dll + cups.hlp + cupsdrvr.dll + cupsui.dll @@ -2549,12 +2549,12 @@ different platforms. - ADFONTS.MFM - ADOBEPS4.DRV - ADOBEPS4.HLP - DEFPRTR2.PPD - ICONLIB.DLL - PSMON.DLL + ADFONTS.MFM + ADOBEPS4.DRV + ADOBEPS4.HLP + DEFPRTR2.PPD + ICONLIB.DLL + PSMON.DLL @@ -2562,9 +2562,9 @@ different platforms. - ADOBEPS5.DLL - ADOBEPSU.DLL - ADOBEPSU.HLP + ADOBEPS5.DLL + ADOBEPSU.DLL + ADOBEPSU.HLP diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml index da28e43859b..20f27ce0e55 100644 --- a/docs/docbook/projdoc/Compiling.xml +++ b/docs/docbook/projdoc/Compiling.xml @@ -329,8 +329,8 @@ example of what you would not want to see would be: On Debian, you need to install the following packages: - libkrb5-dev - krb5-user + libkrb5-dev + krb5-user @@ -341,9 +341,9 @@ example of what you would not want to see would be: On Red Hat Linux, this means you should have at least: - krb5-workstation (for kinit) - krb5-libs (for linking with) - krb5-devel (because you are compiling from source) + krb5-workstation (for kinit) + krb5-libs (for linking with) + krb5-devel (because you are compiling from source) diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml index b528fe9b617..059d586c54a 100644 --- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml +++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml @@ -463,12 +463,12 @@ Server, and so on. - + When Samba is configured to use an LDAP, or other identity management and/or directory service, it is Samba that continues to perform user and machine authentication. It should be noted that the LDAP server does not perform authentication handling in place of what Samba is designed to do. - + Please refer to , for more information regarding @@ -867,7 +867,7 @@ may want to create the machine account within a particular organizational unit. this to be done using the following syntax: &rootprompt; kinit Administrator@your.kerberos.REALM -&rootprompt; net ads join organizational_unit +&rootprompt; net ads join "organizational_unit" @@ -925,9 +925,9 @@ be logged in with Kerberos without needing to know a password. If this fails the an encryption type of DES-CBC-MD5? - + Samba can use both DES-CBC-MD5 encryption as well as ARCFOUR-HMAC-MD5 encoding. - + diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml index 3e7dca6358b..9e9d1a0e019 100644 --- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml +++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml @@ -165,7 +165,7 @@ - &rootprompt;net groupmap add ntgroup=Domain Admins UNIXgroup=domadm + &rootprompt;net groupmap add ntgroup="Domain Admins" UNIXgroup=domadm @@ -221,10 +221,10 @@ Aliases, and RIDs are shown in . - + When the passdb backend uses LDAP (ldapsam) it is the admininstrators' responsibility to create the essential Domain Groups, and to assign each its default RID. - + It is permissible to create any Domain Group that may be necessary, just make certain that the essential diff --git a/docs/docbook/projdoc/NT4Migration.xml b/docs/docbook/projdoc/NT4Migration.xml index b5ba7c1ced9..b5e651ae676 100644 --- a/docs/docbook/projdoc/NT4Migration.xml +++ b/docs/docbook/projdoc/NT4Migration.xml @@ -298,7 +298,7 @@ generally fit into three basic categories. shows the The Three Major Site Types - + Number of UsersDescription diff --git a/docs/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml index 251b387a05c..8b4f9bfd47f 100644 --- a/docs/docbook/projdoc/NetworkBrowsing.xml +++ b/docs/docbook/projdoc/NetworkBrowsing.xml @@ -92,12 +92,12 @@ The technologies (or methods) employed in making all of this work include: - MS Windows machines register their presence to the network. - Machines announce themselves to other machines on the network. - One or more machine on the network collates the local announcements. - The client machine finds the machine that has the collated list of machines. - The client machine is able to resolve the machine names to IP addresses. - The client machine is able to connect to a target machine. + MS Windows machines register their presence to the network. + Machines announce themselves to other machines on the network. + One or more machine on the network collates the local announcements. + The client machine finds the machine that has the collated list of machines. + The client machine is able to resolve the machine names to IP addresses. + The client machine is able to connect to a target machine. @@ -1062,17 +1062,17 @@ are: - WINS &smbmdash; the best tool. - LMHOSTS &smbmdash; static and hard to maintain. - Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments. + WINS &smbmdash; the best tool. + LMHOSTS &smbmdash; static and hard to maintain. + Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments. Alternative means of name resolution include: -Static /etc/hosts &smbmdash; hard to maintain, and lacks name_type info. -DNS &smbmdash; is a good choice but lacks essential name_type info. +Static /etc/hosts &smbmdash; hard to maintain, and lacks name_type info. +DNS &smbmdash; is a good choice but lacks essential name_type info. @@ -1437,7 +1437,7 @@ as shown in . - + SubnetBrowse MasterList diff --git a/docs/docbook/projdoc/Other-Clients.xml b/docs/docbook/projdoc/Other-Clients.xml index 76909e5236e..735c858e7c4 100644 --- a/docs/docbook/projdoc/Other-Clients.xml +++ b/docs/docbook/projdoc/Other-Clients.xml @@ -48,9 +48,9 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) Basically, you need three components: - The File and Print Client (IBM Peer) - TCP/IP (Internet support) - The NetBIOS over TCP/IP driver (TCPBEUI) + The File and Print Client (IBM Peer) + TCP/IP (Internet support) + The NetBIOS over TCP/IP driver (TCPBEUI) Installing the first two together with the base operating diff --git a/docs/docbook/projdoc/PolicyMgmt.xml b/docs/docbook/projdoc/PolicyMgmt.xml index fc06ffefb13..10ecc0e4409 100644 --- a/docs/docbook/projdoc/PolicyMgmt.xml +++ b/docs/docbook/projdoc/PolicyMgmt.xml @@ -339,11 +339,11 @@ Common restrictions that are frequently used include: Account Controls - Logon hours - Password aging - Permitted logon from certain machines only - Account type (local or global) - User rights + Logon hours + Password aging + Permitted logon from certain machines only + Account type (local or global) + User rights diff --git a/docs/docbook/projdoc/Problems.xml b/docs/docbook/projdoc/Problems.xml index 2058b6867f8..23da2052921 100644 --- a/docs/docbook/projdoc/Problems.xml +++ b/docs/docbook/projdoc/Problems.xml @@ -236,13 +236,13 @@ If you do post a message to one of the lists, please observe the following guide In addition to the version, if you obtained Samba via CVS, mention the date when you last checked it out. - Try and make your questions clear and brief. Lots of long, + Try and make your questions clear and brief. Lots of long, convoluted questions get deleted before they are completely read! Do not post HTML encoded messages. Most people on mailing lists simply delete them. - If you run one of those nifty I'm on holidays things when + If you run one of those nifty I'm on holidays things when you are away, make sure its configured to not answer mailing list traffic. Auto-responses to mailing lists really irritate the thousands of people who end up having to deal with such bad netiquet bahavior. @@ -262,7 +262,7 @@ If you do post a message to one of the lists, please observe the following guide If you have a complete Netmon trace (from the opening of the pipe to the error), you can send the *.CAP file as well. - ` + Please think carefully before attaching a document to an email. Consider pasting the relevant parts into the body of the message. The Samba mailing lists go to a huge number of people. Do they all need a copy of your diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml index 71718844109..7e70158c133 100644 --- a/docs/docbook/projdoc/ProfileMgmt.xml +++ b/docs/docbook/projdoc/ProfileMgmt.xml @@ -408,7 +408,7 @@ workstation as follows: You will need to log on if a logon box opens up. For example, connect as DOMAIN\root, password: - mypassword. + mypassword. To make the profile capable of being used by anyone, select Everyone. @@ -424,7 +424,7 @@ workstation as follows: Under Windows NT/200x, the use of mandatory profiles forces the use of MS Exchange storage of mail data and keeps it out of the desktop profile. That keeps desktop profiles from becoming unusable. - + Windows XP Service Pack 1 @@ -830,7 +830,7 @@ since it will involve copying a new default profile to every MS Windows 200x/XP exists there it will copy this to the workstation to the C:\Documents and Settings\ under the Windows login name of the user. - This path translates, in Samba parlance, to the &smb.conf; + This path translates, in Samba parlance, to the &smb.conf; [NETLOGON] share. The directory should be created at the root of this share and must be called Default Profile. @@ -968,9 +968,9 @@ per-user settings using the Domain User Manager (as with MS Windows NT4/ Win 200 In any case, you can configure only one profile per user. That profile can be either: - A profile unique to that user. - A mandatory profile (one the user cannot change). - A group profile (really should be mandatory, that is unchangable). + A profile unique to that user. + A mandatory profile (one the user cannot change). + A group profile (really should be mandatory, that is unchangable). diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml index f86a4d59044..2541d7a4851 100644 --- a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml +++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml @@ -33,7 +33,7 @@ network clients.
An Example Domain. - +
@@ -243,7 +243,7 @@ LDAP-based user and machine account backend. New to Samba-3 is the ability to use a backend database that holds the same type of data as -the NT4-style SAM database (one of the registry files)See also .. +the NT4-style SAM database (one of the registry files)See also .. @@ -292,12 +292,12 @@ management requirements. Samba can act as a NT4-style DC in a Windows 2000/XP environment. However, there are certain compromises: - No machine policy files. - No Group Policy Objects. - No synchronously executed AD logon scripts. - Can't use Active Directory management tools to manage users and machines. - Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect. - Without AD you cannot perform the function of exporting specific applications to specific users or groups. + No machine policy files. + No Group Policy Objects. + No synchronously executed AD logon scripts. + Can't use Active Directory management tools to manage users and machines. + Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect. + Without AD you cannot perform the function of exporting specific applications to specific users or groups. @@ -407,7 +407,7 @@ A Domain Controller is an SMB/CIFS server that: It is rather easy to configure Samba to provide these. Each Samba Domain Controller must provide the NETLOGON service that Samba calls the domain logons functionality (after the name of the parameter in the &smb.conf; file). Additionally, one server in a Samba-3 -Domain must advertise itself as the Domain Master BrowserSee .. +Domain must advertise itself as the Domain Master BrowserSee .. This causes the Primary Domain Controller to claim a domain-specific NetBIOS name that identifies it as a Domain Master Browser for its given domain or workgroup. Local master browsers in the same domain or workgroup on broadcast-isolated subnets then ask for a complete copy of the browse list for the whole wide area network. @@ -829,7 +829,7 @@ Create a user without the $. Then use vipw to the $. Or create the whole entry with vipw if you like; make sure you use a unique user login ID. -The machine account must have the exact name that the workstation has. +The machine account must have the exact name that the workstation has. The UNIX tool vipw is a common tool for directly editing the /etc/passwd file. diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml index c7ee63cef2b..f400cdd647a 100644 --- a/docs/docbook/projdoc/ServerType.xml +++ b/docs/docbook/projdoc/ServerType.xml @@ -101,15 +101,15 @@ different type of servers: Domain Controller - Primary Domain Controller - Backup Domain Controller - ADS Domain Controller + Primary Domain Controller + Backup Domain Controller + ADS Domain Controller Domain Member Server - Active Directory Domain Server - NT4 Style Domain Domain Server + Active Directory Domain Server + NT4 Style Domain Domain Server Stand-alone Server diff --git a/docs/docbook/projdoc/VFS.xml b/docs/docbook/projdoc/VFS.xml index 58bb64d3efb..90bcff2fd6c 100644 --- a/docs/docbook/projdoc/VFS.xml +++ b/docs/docbook/projdoc/VFS.xml @@ -88,10 +88,10 @@ This can be done using a configuration similar to the one shown in - share - connect/disconnect - directory opens/create/remove - file open/close/rename/unlink/chmod + share + connect/disconnect + directory opens/create/remove + file open/close/rename/unlink/chmod diff --git a/docs/docbook/projdoc/locking.xml b/docs/docbook/projdoc/locking.xml index 8bdb06ca8ff..c2c0401e30a 100644 --- a/docs/docbook/projdoc/locking.xml +++ b/docs/docbook/projdoc/locking.xml @@ -986,11 +986,13 @@ so far: We are seeing lots of errors in the Samba logs, like: + tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic 0x4d6f4b61 at offset=36116 + What do these mean? diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml index 1e0fcc6e2bf..043c452a1fc 100644 --- a/docs/docbook/projdoc/passdb.xml +++ b/docs/docbook/projdoc/passdb.xml @@ -106,6 +106,9 @@ as follows: + +New Backends + Samba-3 introduces a number of new password backend capabilities. SAM backendtdbsam @@ -114,9 +117,6 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendxmlsam - -New Backends - tdbsam @@ -279,10 +279,10 @@ Samba-3 introduces a number of new password backend capabilities. - MS DOS Network client 3.0 with the basic network redirector installed. - Windows 95 with the network redirector update installed. - Windows 98 [Second Edition]. - Windows Me. + MS DOS Network client 3.0 with the basic network redirector installed. + Windows 95 with the network redirector update installed. + Windows 98 [Second Edition]. + Windows Me. @@ -296,11 +296,11 @@ Samba-3 introduces a number of new password backend capabilities. - Windows NT 3.5x. - Windows NT 4.0. - Windows 2000 Professional. - Windows 200x Server/Advanced Server. - Windows XP Professional. + Windows NT 3.5x. + Windows NT 4.0. + Windows 2000 Professional. + Windows 200x Server/Advanced Server. + Windows XP Professional. @@ -414,10 +414,9 @@ Samba-3 introduces a number of new password backend capabilities. SAM backendldapsam Example configuration with the LDAP idmap backend -SAM backendxmlsam [global] idmap backendldapsam:ldap://ldap-server.quenya.org:636 -Alternately, this could be specified as: +Alternately, this could be specified as: idmap backendldapsam:ldaps://ldap-server.quenya.org @@ -495,12 +494,12 @@ be announced in time for the Samba-3.0.1 release. - add user or machine accounts. - delete user or machine accounts. - enable user or machine accounts. - disable user or machine accounts. - set to NULL user passwords. - manage interdomain trust accounts. + add user or machine accounts. + delete user or machine accounts. + enable user or machine accounts. + disable user or machine accounts. + set to NULL user passwords. + manage interdomain trust accounts. @@ -563,9 +562,9 @@ be announced in time for the Samba-3.0.1 release. - add, remove or modify user accounts. - list user accounts. - migrate user accounts. + add, remove or modify user accounts. + list user accounts. + migrate user accounts. @@ -1326,10 +1325,10 @@ access to attrs=lmPassword,ntPassword - sambaHomePath - sambaLogonScript - sambaProfilePath - sambaHomeDrive + sambaHomePath + sambaLogonScript + sambaProfilePath + sambaHomeDrive @@ -1418,11 +1417,11 @@ access to attrs=lmPassword,ntPassword The ldap passwd sync options can have the values shown in . -
+
Possible <emphasis>ldap passwd sync</emphasis> values - - + + ValueDescription @@ -1690,10 +1689,7 @@ access to attrs=lmPassword,ntPassword - [global] - ... passdb backendsmbpasswd, tdbsam - ... @@ -1704,10 +1700,10 @@ access to attrs=lmPassword,ntPassword -[globals] -... + [globals] + ... passdb backendtdbsam, smbpasswd -... + ... diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml index 4461f0fdcb0..6556d847534 100644 --- a/docs/docbook/projdoc/upgrading-to-3.0.xml +++ b/docs/docbook/projdoc/upgrading-to-3.0.xml @@ -51,7 +51,7 @@ See . The major new features are: - + Active Directory support. This release is able to join an ADS realm as a member server and authenticate users using LDAP/kerberos. @@ -327,7 +327,7 @@ complete descriptions of new or modified parameters.
TDB File Descriptions - +