summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-02-19 16:59:27 +0000
committerGerald Carter <jerry@samba.org>2002-02-19 16:59:27 +0000
commit6bd2af90cb62d5090b8a73fa19d043e892e8e7c3 (patch)
treed29c9b35a440a8cc146ec573d68aad76c737da72
parent34ab1844469b8e98ad2a2a30e5fd21fb7375f894 (diff)
downloadsamba-6bd2af90cb62d5090b8a73fa19d043e892e8e7c3.tar.gz
samba-6bd2af90cb62d5090b8a73fa19d043e892e8e7c3.tar.bz2
samba-6bd2af90cb62d5090b8a73fa19d043e892e8e7c3.zip
merge from 2.2 and regenerate
(This used to be commit b1cbc23d82cfca1179d6be1e11b8bea2d0acdc9e)
-rw-r--r--docs/Samba-HOWTO-Collection.pdf10
-rw-r--r--docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml2
-rw-r--r--docs/htmldocs/Samba-HOWTO-Collection.html2
-rw-r--r--docs/htmldocs/Samba-LDAP-HOWTO.html2
4 files changed, 7 insertions, 9 deletions
diff --git a/docs/Samba-HOWTO-Collection.pdf b/docs/Samba-HOWTO-Collection.pdf
index 0c6625e6f9..0813448f2c 100644
--- a/docs/Samba-HOWTO-Collection.pdf
+++ b/docs/Samba-HOWTO-Collection.pdf
@@ -1,6 +1,6 @@
%PDF-1.2
%
-1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20020202060013Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj
+1 0 obj<</Producer(htmldoc 1.8.11 Copyright 1997-2001 Easy Software Products, All Rights Reserved.)/CreationDate(D:20020219164220Z)/Title(SAMBA Project Documentation)/Creator(Modular DocBook HTML Stylesheet Version 1.57)>>endobj
2 0 obj<</Type/Encoding/Differences[ 32/space/exclam/quotedbl/numbersign/dollar/percent/ampersand/quotesingle/parenleft/parenright/asterisk/plus/comma/minus/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright/asciicircum/underscore/grave/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 128/Euro 130/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE 145/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash/tilde/trademark/scaron/guilsinglright/oe 159/Ydieresis/space/exclamdown/cent/sterling/currency/yen/brokenbar/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis/yacute/thorn/ydieresis]>>endobj
3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Bold/Encoding 2 0 R>>endobj
@@ -1812,10 +1812,8 @@ xV]o8}W\R >3UyCĀg88Rf&_ߏsν{'B i4(<-:-
d$a;pO4nTCl. n1-h:SZ-n8&}Zm
t%hܖn3qeW.3^oNMc
*Zo8M M*"d<Zr[|s(EHDv+_9?iiu؇/dh+SDdǷ<[:z1)7jy◻Q^]GK5IbXxr0*8ҭ
-@-\_\62P%$3jU8iy?خmUX\g62mۓ'R*13J8+V`?@mlëH8D gKcuv%$ u<U5ǷB[ɚJBsxTwJH=4z)jZP3 ²-5 |/;1̄(+b}}Il~õH#2Ff?r4X?5Us|,"mytGO`^_ޖwP MEN2ejn(#>O
-VQ%Ĺpe):e*wjDaHS{/ov+3yDl{扼/ɡ ua 3K>
-Q"ɲ!֪UrޟN7AL֣_1Xzf[A-K'H+GwohZF:T2.ZbȞZr#k%<vΨc5}62mj׹Lo-LXiQ11
-V95U6W"]lcfQ֨Trį*hymo]s_o|:ݻ|z/Fw:*xQjWcl^ӦCF
+@-\_\62P%$3jU8iy?خmUX\g62mۓ'R*13J8+V`?@mlëH8D gKcuv%$ u<:kn%d5Wq !gzhRn77 fۅeZv#$S+^sbZQ$nyWWꮻNO+|FkF&e0nP-a2k4XzE:M%FI <V?ϟ \-<-@ld6PF}q6 +Js[ʔS duʢU$-+(u$f(_PW'Z'""y_C7)@fR}<DX egCU?=ZAn4K;$˻G/bVCQ;7Ͷ:8m[@OV&ި<<շt<e"]v/*;Ĉ=*F׺Kx2xqv%QUXk8>ld:Gs h1^&<[ Ңb]c($s:k>l E1S̢Quo_=FU67 .߹Ngtu=H_.o<uT9^zծ^hSM2?
+endstream
endobj
822 0 obj
1030
@@ -3351,7 +3349,7 @@ xref
0000233521 00000 n
0000233616 00000 n
trailer
-<</Size 1035/Root 1034 0 R/Info 1 0 R/ID[<ac5ef860b16b55585a372299929b2521><ac5ef860b16b55585a372299929b2521>]>>
+<</Size 1035/Root 1034 0 R/Info 1 0 R/ID[<1fdb3822c43f6894895c14dbdc738b7a><1fdb3822c43f6894895c14dbdc738b7a>]>>
startxref
233831
%%EOF
diff --git a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
index aabc052055..21d2c55ec7 100644
--- a/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-LDAP-HOWTO.sgml
@@ -224,7 +224,7 @@ Next, include the <filename>samba.schema</filename> file in <filename>slapd.conf
The sambaAccount object contains two attributes which depend upon other schema
files. The 'uid' attribute is defined in <filename>cosine.schema</filename> and
the 'displayName' attribute is defined in the <filename>inetorgperson.schema</filename>
-file. Bother of these must be included before the <filename>samba.schema</filename> file.
+file. Both of these must be included before the <filename>samba.schema</filename> file.
</para>
<para><programlisting>
diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 50d9dea7e3..7366e3ccd9 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -8530,7 +8530,7 @@ the 'displayName' attribute is defined in the <TT
CLASS="FILENAME"
>inetorgperson.schema</TT
>
-file. Bother of these must be included before the <TT
+file. Both of these must be included before the <TT
CLASS="FILENAME"
>samba.schema</TT
> file.</P
diff --git a/docs/htmldocs/Samba-LDAP-HOWTO.html b/docs/htmldocs/Samba-LDAP-HOWTO.html
index 30bd21520a..3fb4e1df09 100644
--- a/docs/htmldocs/Samba-LDAP-HOWTO.html
+++ b/docs/htmldocs/Samba-LDAP-HOWTO.html
@@ -336,7 +336,7 @@ the 'displayName' attribute is defined in the <TT
CLASS="FILENAME"
>inetorgperson.schema</TT
>
-file. Bother of these must be included before the <TT
+file. Both of these must be included before the <TT
CLASS="FILENAME"
>samba.schema</TT
> file.</P