From 4e1bdbb757d2b23af46ebc92484e74db95fe3236 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 13 Aug 2003 00:35:58 +0000 Subject: Last set of syntax fixes (This used to be commit 1ab824e77edd955e90515b40e0d0c2d4f826b603) --- docs/docbook/Makefile.in | 6 +-- docs/docbook/projdoc/CUPS-printing.xml | 58 ++++++++++++---------- docs/docbook/projdoc/Compiling.xml | 9 ++-- docs/docbook/projdoc/NT4Migration.xml | 2 +- .../projdoc/PAM-Authentication-And-Samba.xml | 14 +++--- docs/docbook/projdoc/Problems.xml | 2 +- docs/docbook/projdoc/ProfileMgmt.xml | 36 +++++++------- docs/docbook/projdoc/upgrading-to-3.0.xml | 2 +- docs/docbook/projdoc/winbind.xml | 2 +- docs/docbook/xslt/expand-sambadoc.xsl | 12 ++++- 10 files changed, 84 insertions(+), 59 deletions(-) (limited to 'docs/docbook') diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index f4859de8b3..556e9f9cc1 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -88,7 +88,7 @@ htmlfaq: $(HTMLDIR) CSS @$(XSLTPROC) --stringparam base.dir "$(FAQDIR)/" --stringparam root.filename samba-faq xslt/html-chunk.xsl $(FAQPROJDOC)/sambafaq.xml html-single: $(HTMLDIR) CSS $(HTMLDIR)/Samba-HOWTO-Collection.html $(HTMLDIR)/Samba-Developers-Guide.html html: $(HTMLDIR) CSS Samba-HOWTO-Collection.xml - @$(XSLTPROC) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml + @$(XSLTPROC) -o $(HTMLDIR) xslt/html-chunk.xsl Samba-HOWTO-Collection.xml manpages: $(MANDIR) $(MANPAGES) tex: Samba-HOWTO-Collection.tex Samba-Developers-Guide.tex @@ -111,7 +111,7 @@ $(DEVDOC)/attributions.xml: $(DEVDOC)/dev-doc.xml clean: @rm -f *.xml $(MANPAGES) $(TXTDIR)/*.txt $(PSDIR)/*.ps $(PDFDIR)/*.pdf @rm -f $(SMBDOTCONFDOC)/parameters.*.xml $(DVIDIR)/*.dvi - @rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml + @rm -f samba-doc.* dev-doc.* $(PROJDOC)/attributions.xml $(DEVDOC)/attributions.xml @rm -f $(IMAGEPROJDIR)/*.eps $(MANPROJDIR)/smb.conf.5.xml # Text files @@ -120,7 +120,7 @@ $(TXTDIR): $(TXTDIR)/%.txt: %.xml @echo "Converting $< to plain text..." - @$(XMLTO) txt -o $(TXTDIR) $< + @$(XMLTO) txt -o $(TXTDIR) $< > $@ # Tex files %.tex: %.xml diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml index 3be540e886..258132ddd9 100644 --- a/docs/docbook/projdoc/CUPS-printing.xml +++ b/docs/docbook/projdoc/CUPS-printing.xml @@ -324,9 +324,10 @@ one by one; this yields the old LanMan style printing; it uses a \\sambaserver\printershare type of connection. -point and print -deposit and prepare the drivers (for later download) on + +point and print + deposit and prepare the drivers (for later download) on the print server (Samba); this enables the clients to use "Point and Print" to get drivers semi-automatically installed the first time they access the printer; with this method NT/2K/XP @@ -447,9 +448,10 @@ method; upload-from-a-UNIX-workstation method; -imprints -the Imprints Toolset + +imprints + the Imprints Toolset method. @@ -588,7 +590,7 @@ Systems. Their Core Graphic Engine uses a -Windows Printing to a local Printer1small +Windows Printing to a local Printer1small @@ -681,7 +683,7 @@ is CUPS.... - Printing to a Postscript Printer + Printing to a Postscript Printer 2small @@ -714,7 +716,7 @@ to non-PostScript hardware. -Ghostscript as a RIP for non-postscript printers + Ghostscript as a RIP for non-postscript printers 3small @@ -1130,7 +1132,7 @@ print options already embedded into the file. - Prefiltering in CUPS to form Postscript + Prefiltering in CUPS to form Postscript 4small @@ -1149,7 +1151,7 @@ stapling an punching it, etc.) into the PostScript file. - Adding Device-specific Print Options + Adding Device-specific Print Options 5small @@ -1190,7 +1192,7 @@ that are able to generate device-specific printer data. - Postscript to intermediate Raster format6small + Postscript to intermediate Raster format6small @@ -1207,7 +1209,7 @@ than one vendor financing the development of CUPS raster drivers). - CUPS-raster production using Ghostscript + CUPS-raster production using Ghostscript 7small @@ -1243,7 +1245,7 @@ filtering: - Image format to CUPS-raster format conversion + Image format to CUPS-raster format conversion 8small @@ -1268,7 +1270,7 @@ closely as possible with CUPS. - Raster to Printer Specific formats + Raster to Printer Specific formats 9small @@ -1744,7 +1746,7 @@ advantages) than other methods. - cupsomatic/foomatic processing versus Native CUPS + cupsomatic/foomatic processing versus Native CUPS 10small @@ -2034,7 +2036,7 @@ clients. - Print Driver execution on the Client + Print Driver execution on the Client 11small @@ -2060,7 +2062,7 @@ understand. - Print Driver execution on the Server + Print Driver execution on the Server 12small @@ -2134,7 +2136,7 @@ simply use printingsysv -Printing via CUPS/samba server +Printing via CUPS/samba server 13small @@ -2738,8 +2740,9 @@ items which weigh in favor of the CUPS ones: no hassle with the question Where do I get the ADOBE*.* driver files from? + PJL -the Adobe drivers (on request of the printer PPD + the Adobe drivers (on request of the printer PPD associated with them) often put a PJL header in front of the main PostScript part of the print file. Thus the printfile starts with <1B >%-12345X or @@ -2934,8 +2937,9 @@ the procedure + IPP -call the CUPS server via IPP and request the + call the CUPS server via IPP and request the driver files and the PPD file for the named printer; store the files temporarily in the local @@ -2947,13 +2951,15 @@ TEMPDIR (as defined in share's WIN40 (for Win95/98/ME) and W32X86/ (for WinNT/2k/XP) sub directories; + rpcclientadddriver -connect via rpcclient to the Samba server and + connect via rpcclient to the Samba server and execute the "adddriver" command with the correct parameters; + rpcclientsetdriver -connect via rpcclient to the Samba server a second + connect via rpcclient to the Samba server a second time and execute the "setdriver" command. @@ -3046,7 +3052,7 @@ not intended to, and does not work with, "raw" queues! - cupsaddsmb flowchart + cupsaddsmb flowchart 14small @@ -3177,12 +3183,14 @@ now); copy all files to [print$] + rpcclientadddriver -run rpcclient adddriver + run rpcclient adddriver (for each client architecture you want to support): + rpcclientsetdriver -run rpcclient + run rpcclient setdriver. @@ -3563,7 +3571,7 @@ The driver files now are in the W32X86 architecture "root" of &rootprompt;rpcclient -Uroot%xxxx -c `adddriver "Windows NT x86" "mydrivername: \ cupsdrvr.dll:mysmbtstprn.PPD: \ - cupsui.dll:cups.hlp:NULL:RAW:NULL" \ + cupsui.dll:cups.hlp:NULL:RAW:NULL" \ localhost Printer Driver mydrivername successfully installed. diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml index 8a5c5e89a6..ccb2f46f3f 100644 --- a/docs/docbook/projdoc/Compiling.xml +++ b/docs/docbook/projdoc/Compiling.xml @@ -208,9 +208,9 @@ With that said, go ahead and download the following files: &prompt;wget http://us1.samba.org/samba/ftp/samba-pubkey.asc -GPG +GPG The first file is the PGP signature for the Samba source file; the other is the Samba public PGP key itself. Import the public PGP key with: @@ -235,9 +235,11 @@ then all is well. The warnings about trust relationships can be ignored. An example of what you would not want to see would be: + gpg: BAD signature from "Samba Distribution Verification Key" - + + @@ -246,7 +248,8 @@ example of what you would not want to see would be: configure - To do this, first run the program ./configure + + To do this, first run the program ./configure in the source directory. This should automatically configure Samba for your operating system. If you have unusual needs then you may wish to run diff --git a/docs/docbook/projdoc/NT4Migration.xml b/docs/docbook/projdoc/NT4Migration.xml index 8494e06ec8..36bafee2af 100644 --- a/docs/docbook/projdoc/NT4Migration.xml +++ b/docs/docbook/projdoc/NT4Migration.xml @@ -288,7 +288,7 @@ generally fit into three basic categories. The 3 Major Site Types - + Number of UsersDescription diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml index 3a2a6da61e..addd646057 100644 --- a/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml +++ b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml @@ -705,15 +705,15 @@ Options recognized by this module are as follows: - Andrew Morgan, for providing the Linux-PAM - framework, without which none of this would have happened + Andrew Morgan, for providing the Linux-PAM + framework, without which none of this would have happened - Christian Gafton and Andrew Morgan again, for the - pam_pwdb module upon which pam_smbpass was originally based +Christian Gafton and Andrew Morgan again, for the + pam_pwdb module upon which pam_smbpass was originally based - Luke Leighton for being receptive to the idea, +Luke Leighton for being receptive to the idea, and for the occasional good-natured complaint about the project's status - that keep me working on it :) + that keep me working on it :). @@ -912,10 +912,12 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false But the following command just fails: + &rootprompt;chown 'maryo' a_file chown: `maryo': invalid user + This is driving me nuts! What can be wrong? diff --git a/docs/docbook/projdoc/Problems.xml b/docs/docbook/projdoc/Problems.xml index c11862a49e..46f3c002d2 100644 --- a/docs/docbook/projdoc/Problems.xml +++ b/docs/docbook/projdoc/Problems.xml @@ -26,7 +26,7 @@ listens on your LAN, analyses the data sent on it and displays it on the screen. -Debugging with Samba itselfl +Debugging with Samba itself One of the best diagnostic tools for debugging problems is Samba itself. diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml index ff0c90067e..37ae2d41e8 100644 --- a/docs/docbook/projdoc/ProfileMgmt.xml +++ b/docs/docbook/projdoc/ProfileMgmt.xml @@ -317,6 +317,25 @@ local desktop cache, as shown below. When this user then next logs in, they will be told that they are logging in "for the first time". + + + Before deleting the contents of the + directory listed in the ProfilePath (this is likely to be + c:\windows\profiles\username), ask them if they + have any important files stored on their desktop or in their start menu. + Delete the contents of the directory ProfilePath (making a backup if any + of the files are needed). + + + + This will have the effect of removing the local (read-only hidden + system file) user.DAT in their profile directory, as well as the + local "desktop", "nethood", "start menu" and "programs" folders. + + + + + @@ -343,23 +362,6 @@ they will be told that they are logging in "for the first time". [Exit the registry editor]. - - - Before deleting the contents of the - directory listed in the ProfilePath (this is likely to be - c:\windows\profiles\username), ask them if they - have any important files stored on their desktop or in their start menu. - Delete the contents of the directory ProfilePath (making a backup if any - of the files are needed). - - - - This will have the effect of removing the local (read-only hidden - system file) user.DAT in their profile directory, as well as the - local "desktop", "nethood", "start menu" and "programs" folders. - - - search for the user's .PWL password-caching file in the c:\windows diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml index 95411f429a..b5b2a4bf0a 100644 --- a/docs/docbook/projdoc/upgrading-to-3.0.xml +++ b/docs/docbook/projdoc/upgrading-to-3.0.xml @@ -16,7 +16,7 @@ Major new features: - + Active Directory support. This release is able to join a ADS realm as a member server and authenticate users using LDAP/kerberos. diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml index 2340e93551..001b2f16c1 100644 --- a/docs/docbook/projdoc/winbind.xml +++ b/docs/docbook/projdoc/winbind.xml @@ -20,8 +20,8 @@ JohnTrostel -
jtrostel@snapserver.com
SNAP +
jtrostel@snapserver.com
 diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl index 34496a91fc..2749fdf3e9 100644 --- a/docs/docbook/xslt/expand-sambadoc.xsl +++ b/docs/docbook/xslt/expand-sambadoc.xsl @@ -191,7 +191,17 @@ - + + + + + + + + + + + -- cgit