From f7bca2f1eb6956a5cd85848b2a669bda83a09069 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 16 Apr 2003 17:21:30 +0000 Subject: Fix a typo spotted when working on PDF version (This used to be commit 63767ab985396434d8772104555395d87691ed14) --- docs/docbook/smbdotconf/tuning/strictsync.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/docbook/smbdotconf/tuning/strictsync.xml b/docs/docbook/smbdotconf/tuning/strictsync.xml index 693806a503..18e778e093 100644 --- a/docs/docbook/smbdotconf/tuning/strictsync.xml +++ b/docs/docbook/smbdotconf/tuning/strictsync.xml @@ -18,7 +18,7 @@ reported with the new Windows98 explorer shell file copies. See also the sync - always> parameter. + always parameter. Default: strict sync = no -- cgit From 1268992fa30b404c9de694a150282c3378feecde Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 16 Apr 2003 18:45:42 +0000 Subject: I've changed 'net rpc join', so I should doco it... Andrew Bartlett (This used to be commit b12164729d61c4c6c4824ac1dad2c440f6852c06) --- docs/docbook/manpages/net.8.sgml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'docs') diff --git a/docs/docbook/manpages/net.8.sgml b/docs/docbook/manpages/net.8.sgml index 45bb3bcbcd..a22797845b 100644 --- a/docs/docbook/manpages/net.8.sgml +++ b/docs/docbook/manpages/net.8.sgml @@ -201,21 +201,29 @@ the remote server using /bin/date. -[RPC|ADS] JOIN [OLDSTYLE] [-U username[%password]] [options] +[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options] -Join a domain with specified username and password. Password -will be prompted if none is specified. If no -user name is specified, a domain created in server manager -can be joined. +Join a domain. If the account already exists on the server, and +[TYPE] is MEMBER, the machine will attempt to join automatically. +(Assuming that the machine has been created in server manager) +Otherwise, a password will be prompted for, and a new account may +be created. + + +[TYPE] may be PDC, BDC or MEMBER to specify the type of server +joining the domain. + + + +[RPC] OLDJOIN [options] -Specify [OLDSTYLE] to join the domain using the old -style of domain joining - you need to create a trust +Join a domain. Use the OLDJOIN option to join the domain +using the old style of domain joining - you need to create a trust account in server manager first. - - + [RPC|ADS] USER -- cgit From 9a68709f2caaf1da3b321259e7764f697e17bbe9 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 16 Apr 2003 20:52:33 +0000 Subject: Fix typos (This used to be commit eefe0322e2ab257d511ff5e7f93a16311e7073a0) --- docs/docbook/projdoc/IntroSMB.sgml | 2 +- docs/docbook/projdoc/PolicyMgmt.sgml | 2 +- docs/docbook/projdoc/Samba-PDC-HOWTO.sgml | 2 +- docs/docbook/projdoc/ServerType.sgml | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.sgml index d810a59010..c1c0ae3293 100644 --- a/docs/docbook/projdoc/IntroSMB.sgml +++ b/docs/docbook/projdoc/IntroSMB.sgml @@ -345,7 +345,7 @@ in case anyone asks. -This chapter is Copyright © 2003 David Lechnyr (david at lechnyr dot com). +This chapter is Copyright © 2003 David Lechnyr (david at lechnyr dot com). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation. A copy of the license is available at http://www.gnu.org/licenses/fdl.txt. diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.sgml index 7557d496a4..a6c5ffa8e4 100644 --- a/docs/docbook/projdoc/PolicyMgmt.sgml +++ b/docs/docbook/projdoc/PolicyMgmt.sgml @@ -195,12 +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: + diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml index 775e573aed..2e5f436769 100644 --- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml +++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml @@ -501,7 +501,7 @@ version of Windows. prompted). -Samba +Samba Joining a samba client to a domain is documented in the Domain Member chapter. diff --git a/docs/docbook/projdoc/ServerType.sgml b/docs/docbook/projdoc/ServerType.sgml index 7df1eb03fc..b38a9c097d 100644 --- a/docs/docbook/projdoc/ServerType.sgml +++ b/docs/docbook/projdoc/ServerType.sgml @@ -137,6 +137,7 @@ automatically demoted to a BDC. At this time Samba is NOT capable of acting as an ADS Domain Controller. - + + -- cgit