summaryrefslogtreecommitdiff
path: root/docs/docbook/faq
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/faq')
-rw-r--r--docs/docbook/faq/clientapp.sgml24
-rw-r--r--docs/docbook/faq/config.sgml16
-rw-r--r--docs/docbook/faq/errors.sgml4
-rw-r--r--docs/docbook/faq/features.sgml6
-rw-r--r--docs/docbook/faq/general.sgml2
-rw-r--r--docs/docbook/faq/install.sgml4
-rw-r--r--docs/docbook/faq/printing.sgml37
-rw-r--r--docs/docbook/faq/sambafaq.sgml2
8 files changed, 23 insertions, 72 deletions
diff --git a/docs/docbook/faq/clientapp.sgml b/docs/docbook/faq/clientapp.sgml
index 3d44dd44c0..6d687bf772 100644
--- a/docs/docbook/faq/clientapp.sgml
+++ b/docs/docbook/faq/clientapp.sgml
@@ -1,8 +1,8 @@
-<chapter id="FAQ-ClientApp">
+<chapter id="ClientApp">
<title>Specific client application problems</title>
<sect1>
-<title>MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</title>
+<title>MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</title>
<para>
When installing MS Office on a Samba drive for which you have admin
user permissions, ie. admin users = username, you will find the
@@ -60,16 +60,16 @@ set the following parameters on the share containing it:
</para>
<para><programlisting>
-[MSOP95]
- path = /where_you_put_it
- comment = Your comment
- volume = "The_CD_ROM_Label"
- read only = yes
- available = yes
- share modes = no
- locking = no
- browseable = yes
- public = yes
+ [MSOP95]
+ path = /where_you_put_it
+ comment = Your comment
+ volume = "The_CD_ROM_Label"
+ read only = yes
+ available = yes
+ share modes = no
+ locking = no
+ browseable = yes
+ public = yes
</programlisting></para>
</listitem>
diff --git a/docs/docbook/faq/config.sgml b/docs/docbook/faq/config.sgml
index db27102cdf..78f73252a2 100644
--- a/docs/docbook/faq/config.sgml
+++ b/docs/docbook/faq/config.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-Config">
+<chapter id="Config">
<title>Configuration problems</title>
<sect1>
@@ -8,18 +8,4 @@ When you have a user in 'admin users', samba will always do file operations for
this user as 'root', even if 'force user' has been set.
</para>
</sect1>
-
-<sect1>
-<title>I have just installed samba and I'm trying to log in from Windows, but samba refuses all logins!</title>
-
-<para>
-Newer windows clients(NT4, 2000, XP) send encrypted passwords. Samba can't compare these
-passwords to the unix password database, so it needs it's own user database. You can
-add users to this database using "smbpasswd -a user-name".
-</para>
-
-<para>
-See also the "User database" chapter of the samba HOWTO Collection.
-</para>
-</sect1>
</chapter>
diff --git a/docs/docbook/faq/errors.sgml b/docs/docbook/faq/errors.sgml
index 97619ce704..6476ec064e 100644
--- a/docs/docbook/faq/errors.sgml
+++ b/docs/docbook/faq/errors.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-errors">
+<chapter id="errors">
<title>Common errors</title>
@@ -50,6 +50,7 @@ Windows NT in the chapter "Portability" of the samba HOWTO collection
</member>
</simplelist>
</para>
+
</sect1>
<sect1>
@@ -63,6 +64,7 @@ It also ignores the "-N" argument when querying some (but not all) of our
NT servers.
</quote>
</para>
+
<para>
No, it does not ignore -N, it is just that your server rejected the
null password in the connection, so smbclient prompts for a password
diff --git a/docs/docbook/faq/features.sgml b/docs/docbook/faq/features.sgml
index 66b05379cc..bc1081e5c0 100644
--- a/docs/docbook/faq/features.sgml
+++ b/docs/docbook/faq/features.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-features">
+<chapter id="features">
<title>Features</title>
@@ -83,7 +83,9 @@ manual carefully.</para>
<title>Tools for printing faxes</title>
<para>Your incomed faxes are in:
-<filename>/var/spool/fax/incoming</filename>. Print it with:</para>
+<filename>/var/spool/fax/incoming</filename></para>
+
+<para>print it with:</para>
<para><programlisting>
for i in *
diff --git a/docs/docbook/faq/general.sgml b/docs/docbook/faq/general.sgml
index 3f7c2074f9..38bcdf49e3 100644
--- a/docs/docbook/faq/general.sgml
+++ b/docs/docbook/faq/general.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-general">
+<chapter id="general">
<title>General Information</title>
<sect1>
diff --git a/docs/docbook/faq/install.sgml b/docs/docbook/faq/install.sgml
index f8341dc65a..88520fc71d 100644
--- a/docs/docbook/faq/install.sgml
+++ b/docs/docbook/faq/install.sgml
@@ -1,4 +1,4 @@
-<chapter id="FAQ-Install">
+<chapter id="Install">
<title>Compiling and installing Samba on a Unix host</title>
<sect1>
@@ -22,7 +22,7 @@ client to client - check your client's documentation.
</sect1>
<sect1>
-<title>Some files that I KNOW are on the server don't show up when I view the files from my client!</title>
+<title>Some files that I KNOW are on the server doesn't show up when I view the files from my client!</title>
<para>See the next question.</para>
</sect1>
diff --git a/docs/docbook/faq/printing.sgml b/docs/docbook/faq/printing.sgml
deleted file mode 100644
index 4a58c385bb..0000000000
--- a/docs/docbook/faq/printing.sgml
+++ /dev/null
@@ -1,37 +0,0 @@
-<chapter id="FAQ-Printing">
-<chapterinfo>
-<author>
- <firstname>Ronan</firstname><surname>Waide</surname>
-</author>
-</chapterinfo>
-
-<title>Printing problems</title>
-
-<sect1>
-<title>setdriver or cupsaddsmb failes</title>
-<para>
-setdriver expects the following setup:
-
-<simplelist>
-<member>you are a printer admin, or root. this is the smb.conf printer admin group, not the Printer Operators group in NT. I've not tried the latter, but I don't believe it will work based on the current code.</member>
-<member>printer admins has to be defined in [global]</member>
-<member>upload the driver files to \\server\print$\w32x86 and win40 as appropriate. DON'T put them in the 0 or 2 subdirectories.</member>
-<member>Make sure that the user you're connecting as is able to write to the print$ directories</member>
-<member>Use adddriver (with appropriate parameters) to create the driver. note, this will not just update samba's notion of drivers, it will also move the files from the w32x86 and win40 directories to an appropriate subdirectory (based on driver version, I think, but not important enough for me to find out)</member>
-<member>Use setdriver to associate the driver with a printer</member>
-</simplelist>
-</para>
-
-<para>
-The setdriver call will fail if the printer doesn't already exist in
-samba's view of the world. Either create the printer in cups and
-restart samba, or create an add printer command (see smb.conf doco)
-and use RPC calls to create a printer. NB the add printer command MUST
-return a single line of text indicating which port the printer was
-added on. If it doesn't, Samba won't reload the printer
-definitions. Although samba doesn't really support the notion of
-ports, suitable add printer command and enumport command settings can
-allow you pretty good remote control of the samba printer setup.
-</para>
-</sect1>
-</chapter>
diff --git a/docs/docbook/faq/sambafaq.sgml b/docs/docbook/faq/sambafaq.sgml
index 2cc7d466fd..e9e5ed7a3c 100644
--- a/docs/docbook/faq/sambafaq.sgml
+++ b/docs/docbook/faq/sambafaq.sgml
@@ -5,7 +5,6 @@
<!ENTITY clientapp SYSTEM "clientapp.sgml">
<!ENTITY features SYSTEM "features.sgml">
<!ENTITY config SYSTEM "config.sgml">
-<!ENTITY printing SYSTEM "printing.sgml">
]>
<book id="Samba-FAQ">
@@ -35,5 +34,4 @@ and the old samba text documents which were mostly written by John Terpstra.
&clientapp;
&errors;
&features;
-&printing;
</book>