From 0b2380b188825868cd12f41b6f760669f73ffaee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 1 May 2009 22:00:19 +0200 Subject: Fix a bunch of XML validation errors. --- docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml | 2 +- docs-xml/Samba3-ByExample/SBE-500UserNetwork.xml | 7 +-- .../Samba3-ByExample/SBE-AddingUNIXClients.xml | 3 +- docs-xml/Samba3-ByExample/SBE-Appendix1.xml | 14 +++--- .../Samba3-ByExample/SBE-KerberosFastStart.xml | 16 ++++--- docs-xml/Samba3-ByExample/SBE-MigrateNW4Samba3.xml | 54 +++++++++++----------- .../Samba3-ByExample/SBE-SecureOfficeServer.xml | 2 +- .../Samba3-ByExample/SBE-SimpleOfficeServer.xml | 10 ++-- docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml | 2 + docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml | 16 +++---- 10 files changed, 64 insertions(+), 62 deletions(-) diff --git a/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml index c86d9bcb94..3b9976e3f4 100644 --- a/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml +++ b/docs-xml/Samba3-ByExample/SBE-2000UserNetwork.xml @@ -1,6 +1,6 @@ - + A Distributed 2000-User Network diff --git a/docs-xml/Samba3-ByExample/SBE-500UserNetwork.xml b/docs-xml/Samba3-ByExample/SBE-500UserNetwork.xml index 776d114257..64809c8c0e 100644 --- a/docs-xml/Samba3-ByExample/SBE-500UserNetwork.xml +++ b/docs-xml/Samba3-ByExample/SBE-500UserNetwork.xml @@ -1648,6 +1648,7 @@ net groupmap add ntgroup="Insurance Group" unixgroup=piops type=d include the accounting department HP LaserJet 6 and Minolta QMS Magicolor printers, and you also configure use of the identical printers that are located in the financial services department. Install printers on each machine using the following steps: + Steps to Install Printer Drivers on Windows Clients @@ -1683,8 +1684,8 @@ net groupmap add ntgroup="Insurance Group" unixgroup=piops type=d dialog panel. Right-click HP LaserJet 6 Properties - Details (Tab) - Add Port + Details (Tab) + Add Port . @@ -1710,7 +1711,7 @@ net groupmap add ntgroup="Insurance Group" unixgroup=piops type=d server on the network segment on which the workstation is to be located. - + When you are satisfied that the staging systems are complete, use the appropriate procedure to diff --git a/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml b/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml index a20703af39..23704fe716 100644 --- a/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml +++ b/docs-xml/Samba3-ByExample/SBE-AddingUNIXClients.xml @@ -445,7 +445,7 @@ - The instructions given here apply to the Samba environment shown in and . + The instructions given here apply to the Samba environment shown in and . If the network does not have an LDAP slave server (i.e., configuration), change the target LDAP server from lapdc to massive. @@ -2115,7 +2115,6 @@ hosts: files wins - UNIX/Linux Client Domain Member diff --git a/docs-xml/Samba3-ByExample/SBE-Appendix1.xml b/docs-xml/Samba3-ByExample/SBE-Appendix1.xml index b78e16a4bd..1b958b3ef2 100644 --- a/docs-xml/Samba3-ByExample/SBE-Appendix1.xml +++ b/docs-xml/Samba3-ByExample/SBE-Appendix1.xml @@ -39,7 +39,7 @@ The opening panel is the same one that can be reached by clicking System on the Control Panel. See . -
wxpp001The General Panel.
+
The General Panel.wxpp001
 @@ -52,13 +52,13 @@ Clicking the Network ID button launches the configuration wizard. Do not use this with Samba-3. If you wish to change the computer name, or join or leave the domain, click the Change button. See . -
wxpp004The Computer Name Panel.
+
The Computer Name Panel.wxpp004
 Click on Change. This panel shows that our example machine (TEMPTATION) is in a workgroup called WORKGROUP. We join the domain called MIDEARTH. See . -
wxpp006The Computer Name Changes Panel
+
The Computer Name Changes Panelwxpp006
 @@ -67,7 +67,7 @@ This panel shows that our example machine (TEMPTATION) is set to join the domain called MIDEARTH. See . -
wxpp007The Computer Name Changes Panel &smbmdash; Domain MIDEARTH
+
The Computer Name Changes Panel &smbmdash; Domain MIDEARTHwxpp007
 @@ -77,7 +77,7 @@ Enter the name root and the root password from your Samba-3 server. See . -
wxpp008Computer Name Changes &smbmdash; User name and Password Panel
+
Computer Name Changes &smbmdash; User name and Password Panelwxpp008
 @@ -1542,12 +1542,12 @@ drw-rw-r-- 2 bobj Domain Users 12346 Dec 18 18:11 maryvfile.txt file caching Third-party Windows applications may not be compatible with the use of opportunistic file - and record locking. For applications that are known not to be compatible,Refer to + and record locking. For applications that are known not to be compatible,Refer to the application manufacturer's installation guidelines and knowledge base for specific information regarding compatibility. It is often safe to assume that if the software manufacturer does not specifically mention incompatibilities with opportunistic file and record locking, or with Windows client file caching, the application is probably - compatible with Windows (as well as Samba) default settings. oplock + compatible with Windows (as well as Samba) default settings. oplock support may need to be disabled both on the Samba server and on the Windows workstations. diff --git a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml index b593eed4ff..4fef217249 100644 --- a/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml +++ b/docs-xml/Samba3-ByExample/SBE-KerberosFastStart.xml @@ -82,8 +82,8 @@ Abmas Video Rentals' head of IT heard of this criticism. He was offended that a junior engineer should make such a comment. He felt that he had to prepare in case he might be criticized for his decision to use Active Directory. He decided he would defend his decision by hiring the services - of an outside security systems consultant to reportThis report is entirely fictitious. - Any resemblance to a factual report is purely coincidental. on his unit's operations + of an outside security systems consultant to reportThis report is entirely fictitious. + Any resemblance to a factual report is purely coincidental. on his unit's operations and to investigate the role of Samba at his site. Here are key extracts from this hypothetical report: @@ -802,8 +802,8 @@ - Active Directory Replacement with Kerberos, LDAP, and Samba - + Active Directory Replacement with Kerberos, LDAP, and Samba + Active Directory Replacement @@ -814,6 +814,8 @@ remote procedure call RPC + + The Microsoft networking protocols extensively make use of remote procedure call (RPC) @@ -935,8 +937,8 @@ A storm has broken out concerning interoperability between MIT Kerberos and Microsofts' implementation of it. For example, a 2002 IDG - reportNote: This link is no longer active. The same article is still - available from ITWorld.com (July 5, 2005) by + reportNote: This link is no longer active. The same article is still + available from ITWorld.com (July 5, 2005) by states: @@ -1369,7 +1371,7 @@ A user opens a Work document from a network drive. The file was owned by user janetp - and users, and was set read/write-enabled for everyone. + and users, and was set read/write-enabled for everyone. diff --git a/docs-xml/Samba3-ByExample/SBE-MigrateNW4Samba3.xml b/docs-xml/Samba3-ByExample/SBE-MigrateNW4Samba3.xml index 8fabc325fc..2664c771e8 100644 --- a/docs-xml/Samba3-ByExample/SBE-MigrateNW4Samba3.xml +++ b/docs-xml/Samba3-ByExample/SBE-MigrateNW4Samba3.xml @@ -84,12 +84,12 @@ - 200 MHz MMX processor - 512K RAM - 24 GB disk space in RAID1 - Novell 4.11 patched to service pack 7 - 60+ users - 7 network-attached printers + 200 MHz MMX processor + 512K RAM + 24 GB disk space in RAID1 + Novell 4.11 patched to service pack 7 + 60+ users + 7 network-attached printers @@ -161,25 +161,25 @@ - 3.0 GHz P4 Processor + 3.0 GHz P4 Processor - 1 GB RAM + 1 GB RAM - 120 GB SATA operating system drive + 120 GB SATA operating system drive - 4 x 80 GB SATA data drives (RAID5 240 GB capacity) + 4 x 80 GB SATA data drives (RAID5 240 GB capacity) - 2 x 80 GB SATA removable drives for online backup + 2 x 80 GB SATA removable drives for online backup - A DLT drive for asynchronous offline backup + A DLT drive for asynchronous offline backup - SUSE Linux Professional 9.1 + SUSE Linux Professional 9.1 @@ -314,17 +314,17 @@ done - courier-imap - courier-imap-ldap - nss_ldap - openldap2-client - openldap2-devel (only for Samba compilation) - openldap2 - pam_ldap - samba-3.0.20 or later - samba-client-3.0.20 or later - samba-winbind-3.0.20 or later - smbldap-tools Version 0.9.1 + courier-imap + courier-imap-ldap + nss_ldap + openldap2-client + openldap2-devel (only for Samba compilation) + openldap2 + pam_ldap + samba-3.0.20 or later + samba-client-3.0.20 or later + samba-winbind-3.0.20 or later + smbldap-tools Version 0.9.1 @@ -645,9 +645,9 @@ session: none Postfix Courier-IMAP - UNIX login/ssh - Postfix (SMTP) - Courier-IMAP/IMAPS/POP3/POP3S + UNIX login/ssh + Postfix (SMTP) + Courier-IMAP/IMAPS/POP3/POP3S diff --git a/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml index 2e60b4a91c..956bb4dcdb 100644 --- a/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml +++ b/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml @@ -1790,7 +1790,7 @@ hosts: wins The next step is to make certain that Samba is running using ps ax | grep mbd. The nmbd daemon will provide the WINS name resolution service when the - &smb.conf; file [global] parameter parameter Yes has been specified. Having validated that Samba is operational, excute the following: diff --git a/docs-xml/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs-xml/Samba3-ByExample/SBE-SimpleOfficeServer.xml index eaa436d6ef..f25ed5c5e8 100644 --- a/docs-xml/Samba3-ByExample/SBE-SimpleOfficeServer.xml +++ b/docs-xml/Samba3-ByExample/SBE-SimpleOfficeServer.xml @@ -556,8 +556,8 @@ Password changed directories are created with the same owner and group as the directory in which they are created. Any new directories created still have the same owner, group, and permissions as the directory they are in. This should eliminate all permissions-based file access problems. For - more information on this subject, refer to TOSHARG2The Official Samba-3 HOWTO and - Reference Guide, Chapter 15, File, Directory and Share Access Controls. or refer + more information on this subject, refer to TOSHARG2The Official Samba-3 HOWTO and + Reference Guide, Chapter 15, File, Directory and Share Access Controls. or refer to the UNIX man page for the chmod and the chown commands. @@ -798,10 +798,8 @@ C:\WINDOWS: regedit ME-dpwc.reg - - Right-click My Network - Map Network Drive... - + Right-click My Network + Map Network Drive... diff --git a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml index b1787498f2..846145ed58 100644 --- a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml +++ b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml @@ -287,10 +287,12 @@ by setting the sticky bit (set UID/GID) on the top-level directories. +
Abmas Accounting &smbmdash; 52-User Network Topology acct2net
+ Server Installation Steps diff --git a/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml b/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml index f7634aaad7..b41cea9cc1 100644 --- a/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml +++ b/docs-xml/Samba3-ByExample/SBE-UpgradingSamba.xml @@ -682,7 +682,7 @@ Samba-2.x could be compiled with LDAP support. parameters The following parameters are new to Samba-3 and should be correctly configured. - Please refer to through + Please refer to through in this book for examples of use of the new parameters shown here: add group script add machine script @@ -695,13 +695,13 @@ Samba-2.x could be compiled with LDAP support. - add group script - add machine script - add user to group script - delete group script - delete user from group script - passdb backend - set primary group script + add group script + add machine script + add user to group script + delete group script + delete user from group script + passdb backend + set primary group script -- cgit