summaryrefslogtreecommitdiff
path: root/docs/docbook/projdoc
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2003-04-26 19:29:27 +0000
committerJohn Terpstra <jht@samba.org>2003-04-26 19:29:27 +0000
commit239cd4a7c9713430173283765ed459f1cbd8e1f0 (patch)
tree5ff092733ade6f5dae6830b9ef180582288b18c0 /docs/docbook/projdoc
parent1342ecf274c3ccf3b41f90594a4e30ffe10b5ab3 (diff)
downloadsamba-239cd4a7c9713430173283765ed459f1cbd8e1f0.tar.gz
samba-239cd4a7c9713430173283765ed459f1cbd8e1f0.tar.bz2
samba-239cd4a7c9713430173283765ed459f1cbd8e1f0.zip
Update from HEAD.
(This used to be commit 69b1055d9d1d2ef428e57da90fe3b08168a88a3a)
Diffstat (limited to 'docs/docbook/projdoc')
-rw-r--r--docs/docbook/projdoc/ADS-HOWTO.sgml2
-rw-r--r--docs/docbook/projdoc/DOMAIN_MEMBER.sgml16
-rw-r--r--docs/docbook/projdoc/Diagnosis.sgml2
-rw-r--r--docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml2
-rw-r--r--docs/docbook/projdoc/Samba-PDC-HOWTO.sgml2
-rw-r--r--docs/docbook/projdoc/security_level.sgml4
6 files changed, 12 insertions, 16 deletions
diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.sgml
index 1ee0ab1962..c89a0e4f87 100644
--- a/docs/docbook/projdoc/ADS-HOWTO.sgml
+++ b/docs/docbook/projdoc/ADS-HOWTO.sgml
@@ -160,8 +160,6 @@ specify the <parameter>-k</parameter> option to choose kerberos authentication.
<para>You must change administrator password at least once after DC
install, to create the right encoding types</para>
-<!--RS: right encoding types for what? I don't understand this note as I did not do this on my server and did not have any problems (that I know of)-->
-
<para>w2k doesn't seem to create the _kerberos._udp and _ldap._tcp in
their defaults DNS setup. Maybe fixed in service packs?</para>
</sect1>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
index cd4168e446..a5921e8ce3 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.sgml
@@ -12,15 +12,13 @@
<sect1>
<title>Joining an NT Domain with Samba 3.0</title>
-<!--changed by RS: IMHO, this would read better and be easier to reference as a listrather than written out in paragraph form-->
- <para>
- <variablelist>
- <varlistentry><term>"Assumptions:"</term>
- <listitem>NetBIOS name: <constant>SERV1</constant></listitem>
- <listitem>Win2K/NT domain name: <constant>DOM</constant></listitem>
- <listitem>Domain's PDC NetBIOS name: <constant>DOMPDC</constant></listitem>
- <listitem>Domain's BDC NetBIOS names: <constant>DOMBDC1</constant> and <constant>DOMBDC2</constant></listitem>
- </variablelist>
+ <para><emphasis>Assumptions:</emphasis>
+ <programlisting>
+ NetBIOS name: SERV1
+ Win2K/NT domain name: DOM
+ Domain's PDC NetBIOS name: DOMPDC
+ Domain's BDC NetBIOS names: DOMBDC1 and DOMBDC2
+ </programlisting>
</para>
<para>First, you must edit your &smb.conf; file to tell Samba it should
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.sgml
index 8f9a85728f..150f071b78 100644
--- a/docs/docbook/projdoc/Diagnosis.sgml
+++ b/docs/docbook/projdoc/Diagnosis.sgml
@@ -82,7 +82,7 @@ best way to check this is with <userinput>testparm smb.conf</userinput>.
<para>
It is helpful to monitor the log files during testing by using the
-<command>tail -F <replaceable>log_file_name</replaceable> in a separate
+<command>tail -F <replaceable>log_file_name</replaceable></command> in a separate
terminal console (use ctrl-alt-F1 through F6 or multiple terminals in X).
Relevant log files can be found (for default installations) in
<filename>/usr/local/samba/var</filename>. Also, connection logs from
diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
index 841d24b78d..af6ddff9bf 100644
--- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
+++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
@@ -3,8 +3,8 @@
<chapterinfo>
<author>
<firstname>Jean François</firstname><surname>Micouleau</surname>
- &person.jerry;
</author>
+ &author.jerry;
</chapterinfo>
<title>Configuring Group Mapping</title>
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
index be7a6d5201..6a3bcacf17 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
@@ -330,7 +330,7 @@ for this including:
</para></listitem>
</itemizedlist>
-<para>Read the chapter about the <link linkend="passdb backend">User Database</link>
+<para>Read the chapter about the <link linkend="passdb">User Database</link>
for details.</para>
<note><para>
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.sgml
index a59392bbac..f19ec4a1e8 100644
--- a/docs/docbook/projdoc/security_level.sgml
+++ b/docs/docbook/projdoc/security_level.sgml
@@ -130,8 +130,8 @@ Windows NT server, the later natively capable of encrypted password support.
<note><para>
<emphasis>Server</emphasis> level security is incompatible with what is known
-as </empahsis>schannel</emphasis> or "sign and seal" protocols. This means that
-if you want to use <empahsis>server</emphasis> level security you must disable
+as <emphasis>schannel</emphasis> or "sign and seal" protocols. This means that
+if you want to use <emphasis>server</emphasis> level security you must disable
the use of "sign and seal" on all machines on your network.
</para></note>