4 files changed, 126 insertions, 56 deletions
diff --git a/docs/docbook/faq/clientapp.sgml b/docs/docbook/faq/clientapp.sgml
index 9bb7cb320f..2077b230ce 100644
--- a/docs/docbook/faq/clientapp.sgml
+++ b/docs/docbook/faq/clientapp.sgml
@@ -23,4 +23,63 @@ to fix the owner.
 
 </sect1>
 
+<sect1>
+<title>How to use a Samba share as an administrative share for MS Office, etc.</title>
+
+<para>
+Microsoft Office products can be installed as an administrative installation
+from which the application can either be run off the administratively installed
+product that resides on a shared resource, or from which that product can be
+installed onto workstation clients.
+</para>
+
+<para>
+The general mechanism for implementing an adminstrative installation involves
+running <command>X:\setup /A</command>, where X is the drive letter of either CDROM or floppy.
+</para>
+
+<para>
+This installation process will NOT install the product for use per se, but
+rather results in unpacking of the compressed distribution files into a target
+shared folder. For this process you need write privilidge to the share and it
+is desirable to enable file locking and share mode operation during this
+process.
+</para>
+
+<para>
+Subsequent installation of MS Office from this share will FAIL unless certain
+precautions are taken. This failure will be caused by share mode operation
+which will prevent the MS Office installation process from re-opening various
+dynamic link library files and will cause sporadic file not found problems.
+</para>
+
+<itemizedlist>
+<listitem><para>
+As soon as the administrative installation (unpacking) has completed
+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
+</programlisting></para>
+
+</listitem>
+
+<listitem>
+<para>Now you are ready to run the setup program from the Microsoft Windows
+workstation as follows: <command>\\"Server_Name"\MSOP95\msoffice\setup</command>
+</para>
+</listitem>
+</itemizedlist>
+
+</sect1>
 </chapter>
diff --git a/docs/faq/clientapp.html b/docs/faq/clientapp.html
index d2ba0a08b5..0081891331 100644
--- a/docs/faq/clientapp.html
+++ b/docs/faq/clientapp.html
@@ -86,6 +86,68 @@ rdonly by trying to open it for writing.</P
 You just have to install as a non-admin user and then use "chown -R"
 to fix the owner.</P
 ></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN175"
+></A
+>3.2. How to use a Samba share as an administrative share for MS Office, etc.</H1
+><P
+>Microsoft Office products can be installed as an administrative installation
+from which the application can either be run off the administratively installed
+product that resides on a shared resource, or from which that product can be
+installed onto workstation clients.</P
+><P
+>The general mechanism for implementing an adminstrative installation involves
+running <B
+CLASS="COMMAND"
+>X:\setup /A</B
+>, where X is the drive letter of either CDROM or floppy.</P
+><P
+>This installation process will NOT install the product for use per se, but
+rather results in unpacking of the compressed distribution files into a target
+shared folder. For this process you need write privilidge to the share and it
+is desirable to enable file locking and share mode operation during this
+process.</P
+><P
+>Subsequent installation of MS Office from this share will FAIL unless certain
+precautions are taken. This failure will be caused by share mode operation
+which will prevent the MS Office installation process from re-opening various
+dynamic link library files and will cause sporadic file not found problems.</P
+><P
+></P
+><UL
+><LI
+><P
+>As soon as the administrative installation (unpacking) has completed
+set the following parameters on the share containing it:</P
+><P
+><PRE
+CLASS="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</PRE
+></P
+></LI
+><LI
+><P
+>Now you are ready to run the setup program from the Microsoft Windows
+workstation as follows: <B
+CLASS="COMMAND"
+>\\"Server_Name"\MSOP95\msoffice\setup</B
+></P
+></LI
+></UL
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/docs/faq/samba-faq.html b/docs/faq/samba-faq.html
index 9623dc9a7c..14b62edcc1 100644
--- a/docs/faq/samba-faq.html
+++ b/docs/faq/samba-faq.html
@@ -165,6 +165,11 @@ HREF="clientapp.html"
 HREF="clientapp.html#AEN170"
 >MS Office Setup reports "Cannot change properties of '\MSOFFICE\SETUP.INI'"</A
 ></DT
+><DT
+>3.2. <A
+HREF="clientapp.html#AEN175"
+>How to use a Samba share as an administrative share for MS Office, etc.</A
+></DT
 ></DL
 ></DD
 ></DL
diff --git a/docs/textdocs/Application_Serving.txt b/docs/textdocs/Application_Serving.txt
deleted file mode 100644
index 6a61a99d7e..0000000000
--- a/docs/textdocs/Application_Serving.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Contributed:	January 7, 1997
-Updated:	March 24, 1998
-Contributor:	John H Terpstra <samba@samba.org>
-		Copyright (C) 1997 - John H Terpstra
-Status:		Current
-
-Subject: Using a Samba share as an administrative share for MS Office, etc.
-==============================================================================
-
-Problem:
-========
-Microsoft Office products can be installed as an administrative installation
-from which the application can either be run off the administratively installed
-product that resides on a shared resource, or from which that product can be
-installed onto workstation clients.
-
-The general mechanism for implementing an adminstrative installation involves
-running:
-	X:\setup /A, where X is the drive letter of either CDROM or floppy
-
-This installation process will NOT install the product for use per se, but
-rather results in unpacking of the compressed distribution files into a target
-shared folder. For this process you need write privilidge to the share and it
-is desirable to enable file locking and share mode operation during this
-process.
-
-Subsequent installation of MS Office from this share will FAIL unless certain
-precautions are taken. This failure will be caused by share mode operation
-which will prevent the MS Office installation process from re-opening various
-dynamic link library files and will cause sporadic file not found problems.
-
-Solution:
-=========
-1. As soon as the administrative installation (unpacking) has completed
-	set the following parameters on the share containing it:
-	[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
-
-2. Now you are ready to run the setup program from the Microsoft Windows
-workstation as follows:-
-	\\"Server_Name"\MSOP95\msoffice\setup
-
-MS Office Sharing - Please note:
-================================
-
-Workgroup Templates should be stored on an ordinary writable or read-only share
-but USER templates MUST be stored on a writable share _OR_ on the users' local
-machine.