From df99c490db8c6edc76d368a1573ba938fda66aae Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 28 Apr 2003 16:53:13 +0000 Subject: Fix SGML/XML incompability before starting conversion to XML (This used to be commit 1b5ad8a502a641f285b986c81216d7c5e5c33e79) --- docs/docbook/projdoc/IntroSMB.sgml | 59 +++++++++++++--------- docs/docbook/projdoc/NT4Migration.sgml | 4 +- .../projdoc/PAM-Authentication-And-Samba.sgml | 12 ++--- docs/docbook/projdoc/PolicyMgmt.sgml | 3 +- docs/docbook/projdoc/locking.sgml | 6 +-- docs/docbook/projdoc/passdb.sgml | 2 +- docs/docbook/projdoc/security_level.sgml | 2 +- docs/docbook/projdoc/unicode.sgml | 38 +++++++++----- 8 files changed, 74 insertions(+), 52 deletions(-) (limited to 'docs/docbook') diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.sgml index 32b18cc8fc..4ead422fb8 100644 --- a/docs/docbook/projdoc/IntroSMB.sgml +++ b/docs/docbook/projdoc/IntroSMB.sgml @@ -239,58 +239,68 @@ walk through the establishment of a SMB/CIFS session step by step. - CIFS: Common Insecurities Fail Scrutiny by "Hobbit", - http://hr.uoregon.edu/davidrl/cifs.txt + + CIFS: Common Insecurities Fail Scrutiny by "Hobbit" - Doing the Samba on Windows by Financial Review, - http://afr.com/it/2002/10/01/FFXDF43AP6D.html + + Doing the Samba on Windows by Financial Review + - Implementing CIFS by Christopher R. Hertel, - http://ubiqx.org/cifs/ + + Implementing CIFS by Christopher R. Hertel + - Just What Is SMB? by Richard Sharpe, - http://samba.anu.edu.au/cifs/docs/what-is-smb.html + + Just What Is SMB? by Richard Sharpe + - Opening Windows Everywhere by Mike Warfield, - http://www.linux-mag.com/1999-05/samba_01.html + + Opening Windows Everywhere by Mike Warfield + - SMB HOWTO by David Wood, - http://www.tldp.org/HOWTO/SMB-HOWTO.html + + SMB HOWTO by David Wood + - SMB/CIFS by The Root by "ledin", - http://www.phrack.org/phrack/60/p60-0x0b.txt + + SMB/CIFS by The Root by "ledin" + - The Story of Samba by Christopher R. Hertel, - http://www.linux-mag.com/1999-09/samba_01.html + + The Story of Samba by Christopher R. Hertel + - The Unofficial Samba HOWTO by David Lechnyr, - http://hr.uoregon.edu/davidrl/samba/ + + The Unofficial Samba HOWTO by David Lechnyr + - Understanding the Network Neighborhood by Christopher R. Hertel, - http://www.linux-mag.com/2001-05/smb_01.html + + Understanding the Network Neighborhood by Christopher R. Hertel + - Using Samba as a PDC by Andrew Bartlett, - http://www.linux-mag.com/2002-02/samba_01.html + + Using Samba as a PDC by Andrew Bartlett + @@ -335,9 +345,8 @@ not the completely clueless user who probably sits there shivering thinking That's what's really irritating to me." - --- Linus Torvalds, from an interview with BOOT Magazine, Sept 1998 -(http://hr.uoregon.edu/davidrl/boot.txt) +-- +Linus Torvalds, from an interview with BOOT Magazine, Sept 1998 diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.sgml index 733d1f75ae..7b1d2f20b3 100644 --- a/docs/docbook/projdoc/NT4Migration.sgml +++ b/docs/docbook/projdoc/NT4Migration.sgml @@ -345,9 +345,9 @@ based solution fit into three basic categories. Number of UsersDescription - < 50Want simple conversion with NO pain + < 50Want simple conversion with NO pain 50 - 250Want new features, can manage some in-house complexity - > 250Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas + > 250Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml index 90a07a13bd..4b5179acc7 100644 --- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml +++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml @@ -236,29 +236,29 @@ Options recognized by this module are as follows: migrate - only meaningful in an "auth" context; used to update smbpasswd file with a password used for successful authentication. - smbconf=< file > - specify an alternate path to the smb.conf + smbconf=< file > - specify an alternate path to the smb.conf file. Thanks go to the following people: - * Andrew Morgan < morgan@transmeta.com >, for providing the Linux-PAM + * Andrew Morgan < morgan@transmeta.com >, for providing the Linux-PAM framework, without which none of this would have happened - * Christian Gafton < gafton@redhat.com > and Andrew Morgan again, for the + * Christian Gafton < gafton@redhat.com > and Andrew Morgan again, for the pam_pwdb module upon which pam_smbpass was originally based - * Luke Leighton < lkcl@switchboard.net > for being receptive to the idea, + * Luke Leighton < lkcl@switchboard.net > for being receptive to the idea, and for the occasional good-natured complaint about the project's status that keep me working on it :) * and of course, all the other members of the Samba team - < http://www.samba.org/samba/team.html >, for creating a great product + <http://www.samba.org/samba/team.html>, for creating a great product and for giving this project a purpose --------------------- - Stephen Langasek < vorlon@netexpress.net > + Stephen Langasek < vorlon@netexpress.net > diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.sgml index 333fe6ad0b..2ae3fa5ea7 100644 --- a/docs/docbook/projdoc/PolicyMgmt.sgml +++ b/docs/docbook/projdoc/PolicyMgmt.sgml @@ -195,13 +195,12 @@ exists with NT4 style policy files. Administration of Win2K / XP Policies - Instructions Instead of using the tool called "The System Policy Editor", commonly called Poledit (from the executable name poledit.exe), GPOs are created and managed using a Microsoft Management Console (MMC) snap-in as follows: - + Go to the Windows 200x / XP menu Start->Programs->Administrative Tools diff --git a/docs/docbook/projdoc/locking.sgml b/docs/docbook/projdoc/locking.sgml index facaef551f..adb4356497 100644 --- a/docs/docbook/projdoc/locking.sgml +++ b/docs/docbook/projdoc/locking.sgml @@ -371,9 +371,9 @@ Section of the Microsoft MSDN Library on opportunistic locking: -Opportunistic Locks, Microsoft Developer Network (MSDN), Windows Development > -Windows Base Services > Files and I/O > SDK Documentation > File Storage > File Systems -> About File Systems > Opportunistic Locks, Microsoft Corporation. +Opportunistic Locks, Microsoft Developer Network (MSDN), Windows Development > +Windows Base Services > Files and I/O > SDK Documentation > File Storage > File Systems +> About File Systems > Opportunistic Locks, Microsoft Corporation. http://msdn.microsoft.com/library/en-us/fileio/storage_5yk3.asp diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.sgml index 38e1cd6a2f..cc497f7d93 100644 --- a/docs/docbook/projdoc/passdb.sgml +++ b/docs/docbook/projdoc/passdb.sgml @@ -811,7 +811,7 @@ You either can set up your own table and specify the field names to pdb_mysql (s for the column names) or use the default table. The file examples/pdb/mysql/mysql.dump contains the correct queries to create the required tables. Use the command : -mysql -uusername -hhostname -ppassword databasename < /path/to/samba/examples/pdb/mysql/mysql.dump +mysql -uusername -hhostname -ppassword databasename > /path/to/samba/examples/pdb/mysql/mysql.dump diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml index f19ec4a1e8..528c87c52c 100644 --- a/docs/docbook/projdoc/security_level.sgml +++ b/docs/docbook/projdoc/security_level.sgml @@ -320,7 +320,7 @@ MS Windows through things such as setting an invalid shell in the An alternative to assigning UIDs to Windows users on a Samba member server is -presented in the Winbind Overview chapter +presented in the Winbind Overview chapter in this HOWTO collection. diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.sgml index eaf9990dcb..2351668e56 100644 --- a/docs/docbook/projdoc/unicode.sgml +++ b/docs/docbook/projdoc/unicode.sgml @@ -109,20 +109,34 @@ filenames from CP850 to the iso8859-15 charset. Japanese charsets -Samba doesn't work correctly with Japanese charsets yet. Here are points of attention when setting it up: - - -You should set mangling method = hash -There are various iconv() implementations around and not all of -them work equally well. glibc2's iconv() has a critical problem in CP932. -libiconv-1.8 works with CP932 but still has some problems and does not -work with EUC-JP. -You should set dos charset = CP932, not Shift_JIS, SJIS... -Currently only unix charset = CP932 will work (but still has some problems...) because of iconv() issues. unix charset = EUC-JP doesn't work well because of iconv() issues. -Currently Samba 3.0 does not support unix charset = UTF8-MAC/CAP/HEX/JIS* - +Samba doesn't work correctly with Japanese charsets yet. Here are +points of attention when setting it up: + + + +You should set mangling method = +hash + +There are various iconv() implementations around and not +all of them work equally well. glibc2's iconv() has a critical problem +in CP932. libiconv-1.8 works with CP932 but still has some problems and +does not work with EUC-JP. + +You should set dos charset = CP932, not +Shift_JIS, SJIS... + +Currently only unix charset = CP932 +will work (but still has some problems...) because of iconv() issues. +unix charset = EUC-JP doesn't work well because of +iconv() issues. + +Currently Samba 3.0 does not support unix charset += UTF8-MAC/CAP/HEX/JIS* + + More information (in Japanese) is available at: http://www.atmarkit.co.jp/flinux/special/samba3/samba3a.html. + -- cgit