summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-05-01 13:54:48 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-05-01 13:54:48 +0000
commit866fce117e793e7997c6433bb9289489782a8deb (patch)
treef2926bac57eb17a5f5996d797a2086d4df8eaf8c /docs
parent67ce764d69b13203d9bd73e055e22f71dfebdba6 (diff)
downloadsamba-866fce117e793e7997c6433bb9289489782a8deb.tar.gz
samba-866fce117e793e7997c6433bb9289489782a8deb.tar.bz2
samba-866fce117e793e7997c6433bb9289489782a8deb.zip
Merge over Alexanders' conversion to XML
(This used to be commit bde44c471b301c45f5106f6229579928b3c56b89)
Diffstat (limited to 'docs')
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml3
-rw-r--r--docs/docbook/projdoc/upgrading-to-3.0.sgml5
-rw-r--r--docs/docbook/samba.dsl82
3 files changed, 6 insertions, 84 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 4842354012..5d120691e6 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -1073,8 +1073,7 @@
to it's domain using the administrator username and password method. </para>
<para>This option is only required when using sam back-ends tied to the
- Unix uid method of RID calculation such as smbpasswd. This option is only
- available in Samba 3.0.</para>
+ Unix uid method of RID calculation such as smbpasswd. This option is only available in Samba 3.0. If this option is not specified, the <link linkend="ADDUSERSCRIPT">add user script</link> is used.</para>
<para>Default: <command>add machine script = &lt;empty string&gt;
</command></para>
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.sgml
index 3dc4816664..d092fd7940 100644
--- a/docs/docbook/projdoc/upgrading-to-3.0.sgml
+++ b/docs/docbook/projdoc/upgrading-to-3.0.sgml
@@ -18,6 +18,11 @@ support has changed in samba 3.0. Read the chapter
</sect1>
<sect1>
+<title>add machine script</title>
+
+</sect1>
+
+<sect1>
<title>Obsolete configuration options</title>
<para>
diff --git a/docs/docbook/samba.dsl b/docs/docbook/samba.dsl
deleted file mode 100644
index 7c530ce424..0000000000
--- a/docs/docbook/samba.dsl
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- This file defines the DocBook-utils Style Sheet for DocBook
- Eric Bischoff <eric@caldera.de>
--->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
- <!ENTITY % html "IGNORE">
- <![%html; [
- <!ENTITY % print "IGNORE">
- <!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl>
- ]]>
- <!ENTITY % print "INCLUDE">
- <![%print; [
- <!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA dsssl>
- ]]>
-]>
-
-<STYLE-SHEET>
-
- <STYLE-SPECIFICATION ID="UTILS" USE="DOCBOOK">
- <STYLE-SPECIFICATION-BODY>
-;; ===================================================================
-;; Generic Parameters
-;; (Generic currently means: both print and html)
-(define (chunk-element-list)
- (list (normalize "preface")
- (normalize "chapter")
- (normalize "appendix")
- (normalize "article")
- (normalize "glossary")
- (normalize "bibliography")
- (normalize "index")
- (normalize "colophon")
- (normalize "setindex")
- (normalize "reference")
- (normalize "refentry")
- (normalize "part")
-; We would like to split up in chapters, not in sect1's...
-; (normalize "sect1")
- (normalize "section")
- (normalize "book") ;; just in case nothing else matches...
- (normalize "set") ;; sets are definitely chunks...
- ))
-
-(define %chapter-autolabel% #t)
-(define %section-autolabel% #t)
-(define (toc-depth nd) 3)
-
-(define %html-ext% ".html") ;; default extension for html output files
-(define %html-prefix% "") ;; prefix for all filenames generated (except root)
-(define %use-id-as-filename% #t)
-
-; === HTML settings ===
-(define %html-pubid% "-//W3C//DTD HTML 4.01 Transitional//EN") ;; Nearly true :-(
-(define %html40% #t)
-
-; === Media objects ===
-(define preferred-mediaobject-extensions ;; this magic allows to use different graphical
- (list "png" "jpg" "jpeg")) ;; formats for printing and putting online
-(define acceptable-mediaobject-extensions
- (list "bmp" "gif" "eps" "epsf" "avi" "mpg" "mpeg" "qt"))
-(define preferred-mediaobject-notations
- (list "PNG" "JPG" "JPEG"))
-(define acceptable-mediaobject-notations
- (list "EPS" "BMP" "GIF" "linespecific"))
-; === Rendering ===
-(define %admon-graphics% #t) ;; use symbols for Caution|Important|Note|Tip|Warning
-
-; === Books only ===
-(define %generate-book-titlepage% #t)
-(define %generate-book-toc% #t)
-(define ($generate-chapter-toc$) #f) ;; never generate a chapter TOC in books
-
-; === Articles only ===
-(define %generate-article-titlepage% #t)
-(define %generate-article-toc% #t) ;; make TOC
-
- </STYLE-SPECIFICATION-BODY>
- </STYLE-SPECIFICATION>
-
- <EXTERNAL-SPECIFICATION ID="DOCBOOK" DOCUMENT="docbook.dsl">
-
-</STYLE-SHEET>