6 files changed, 178 insertions, 8 deletions

diff --git a/FAQ/admin.sgml b/FAQ/admin.sgml
index 426187b675..f4f34e6260 100644
--- a/FAQ/admin.sgml
+++ b/FAQ/admin.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: admin.sgml,v 1.9 1998-08-14 15:24:02 nik Exp $ -->
+<!-- $Id: admin.sgml,v 1.10 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -823,5 +823,44 @@
     take effect.  Of course if you are using an alternate keymap for your
     country, you should edit that one instead.
 
+  <sect1>
+    <heading>How do I reformat DOS text files to UNIX ones?</heading>
+
+     <p>Simply use this perl command:
+
+<verb>
+perl -i.bak -pe 's/\r\n/\n/g' file ...
+</verb>
+
+     <p>file is the file(s) to process.  The modification is done in-place,
+     with the original file stored with a .bak extension.
+
+   <sect1>
+     <heading>How do I kill processes by name?</heading>
+
+     <p>Use <url url="/cgi/cvsweb.cgi/man.cgi?killall" name="killall(1)">.
+
+   <sect1>
+     <heading>Why is su bugging me about not being in root's ACL?
+     </heading>
+
+     <p>The error comes from the Kerberos distributed authentication system.  
+     The problem isn't fatal but annoying.  You can either run su with the -k
+     option, or uninstall Kerberos as described in the next question.
+   
+   <sect1>
+     <heading>How do I uninstall Kerberos?</heading>
+
+     <p>To remove Kerberos from the system, reinstall the bin distribution
+     for the release you are running.  If you have the CDROM, you can 
+     mount the cd (we'll assume on /cdrom) and run
+    
+<verb>
+cd /cdrom/bin
+./install.sh
+</verb>
+
+
+     
   </sect>
 
diff --git a/FAQ/hardware.sgml b/FAQ/hardware.sgml
index 290dd682af..c785ddb287 100644
--- a/FAQ/hardware.sgml
+++ b/FAQ/hardware.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: hardware.sgml,v 1.10 1998-08-03 17:38:19 wosch Exp $ -->
+<!-- $Id: hardware.sgml,v 1.11 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -397,5 +397,12 @@
       <htmlurl 
         url="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron"
         name="http://cesdis.gsfc.nasa.gov/linux/drivers/vortex.html#micron">
+
+    <sect1>
+      <heading>Does FreeBSD support Symmetric Multiproccessing (SMP)?
+      </heading>
+
+      <p>SMP is supported in 3.0-CURRENT only.
+
   </sect>
 
diff --git a/FAQ/install.sgml b/FAQ/install.sgml
index d9f4340207..5ea777b5b1 100644
--- a/FAQ/install.sgml
+++ b/FAQ/install.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: install.sgml,v 1.8 1998-08-12 04:02:57 jkoshy Exp $ -->
+<!-- $Id: install.sgml,v 1.9 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -535,5 +535,18 @@ disk            wd2     at wdc1 drive 1 # change from wd3 to wd2
 
     </enum>
 
+   <sect1>
+     <heading>What are the limits for memory and diskspace?</heading>
+     
+     <p>For memory, the (theoretical) limit is 4 gigabytes.  One gigabyte
+     has been tested; you generally can't buy i386 PCs that can support
+     much more than that.
+
+     <p>For filesystems, the maximum theoretical limit is 8 terabytes.  In
+     practice, there is a soft limit of 1 terabyte, but with modifications
+     filesystems with 4 terabytes are possible (and exist).
+
+     <p>The maximum size of a single file is 2 gigabytes.
+
   </sect>
 
diff --git a/FAQ/misc.sgml b/FAQ/misc.sgml
index f40b9aec3c..04052b2a21 100644
--- a/FAQ/misc.sgml
+++ b/FAQ/misc.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: misc.sgml,v 1.5 1998-07-23 14:10:03 jkh Exp $ -->
+<!-- $Id: misc.sgml,v 1.6 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -231,5 +231,12 @@
       Given a choice, I think I'd prefer to get used to the scratchy
       noises, myself!
 
+    <sect1>
+      <heading>What does 'MFC' mean?</heading>
+
+      <p>MFC is an acronym for 'Merged From -CURRENT.' It's used in the CVS
+      logs to denote when a change was migrated from the CURRENT to the STABLE
+      branches.
+
   </sect>
 
diff --git a/FAQ/network.sgml b/FAQ/network.sgml
index 321a5926be..30f46b5ad5 100644
--- a/FAQ/network.sgml
+++ b/FAQ/network.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: network.sgml,v 1.12 1998-07-30 02:31:21 jkoshy Exp $ -->
+<!-- $Id: network.sgml,v 1.13 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -1067,5 +1067,20 @@ default            10.0.0.2           UGSc        0        0      tun0
 
       </itemize>
 
+    <sect1>
+      <heading>How can I redirect service requests from one machine to another?
+      </heading>
+
+      <p>You can redirect FTP (and other service) request with the 'socket'
+      package, available in the ports tree in category 'sysutils'.  
+      Simply replace the service's commandline to call socket instead, like so:
+
+<verb>
+ftp stream tcp nowait nobody /usr/local/bin/socket socket ftp.foo.com ftp
+</verb>
+
+      <p>where 'ftp.foo.com' and 'ftp' are the host and port to redirect to,
+      respectively.
+
   </sect>
 
diff --git a/FAQ/preface.sgml b/FAQ/preface.sgml
index e3d46ac5bd..3c6720a2ed 100644
--- a/FAQ/preface.sgml
+++ b/FAQ/preface.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: preface.sgml,v 1.16 1998-08-17 23:09:21 dwhite Exp $ -->
+<!-- $Id: preface.sgml,v 1.17 1998-08-18 23:26:50 dwhite Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -380,9 +380,9 @@
       <heading>Books on FreeBSD</heading>
 
       <p>Greg Lehey's book ``Installing and Running FreeBSD'' is available
-      from Walnut Creek and ships with the 2.2.6 CDROM.  There is also
+      from Walnut Creek and ships with the 2.2.7 CDROM.  There is also
       a larger book entitled ``The Complete FreeBSD'', which comes with
-      additional printed manpages and includes the 2.2.6 CDROM set.  It
+      additional printed manpages and includes the 2.2.7 CDROM set.  It
       should be available in most good book shops now.
 
       <p>There is a FreeBSD Documentation Project which you may contact (or
@@ -483,6 +483,95 @@
       electronic mail.
 
     <sect1>
+      <heading>Where can I get ASCII/PostScript versions of the FAQ?</heading>
+      
+      <p>The up-to-date FAQ is available from the FreeBSD Web Server or any
+      mirror as PostScript and plain text (7 bit ASCII and 8-bit Latin1).
+
+      <p>As PostScript (about 370KB):
+      <itemize>
+        <item><url url="http://www.freebsd.org/FAQ/FAQ.ps" 
+               name="http://www.freebsd.org/FAQ/FAQ.ps">
+      </itemize>
+ 
+      <p>As ASCII text (about 220KB):
+      <itemize>
+         <item><url url="http://www.freebsd.org/FAQ/FAQ.ascii"
+                name="http://www.freebsd.org/FAQ/FAQ.ascii">
+      </itemize>
+
+      <p>As ISO 8859-1 text (about 220KB):
+      <itemize>
+         <item><url url="http://www.freebsd.org/FAQ/FAQ.latin1"
+                name="http://www.freebsd.org/FAQ/FAQ.latin1">
+      </itemize>
+
+    <sect1>
+      <heading>Where can I get ASCII/PostScript versions of the Handbook?</heading>
+      
+      <p>The up-to-date Handbook is available from the FreeBSD Web Server or any
+      mirror as PostScript and plain text (7 bit ASCII and 8-bit Latin1).
+
+      <p>As PostScript (about 1.7MB):
+      <itemize>
+        <item><url url="http://www.freebsd.org/handbook/handbook.ps" 
+               name="http://www.freebsd.org/handbook/handbook.ps">
+      </itemize>
+ 
+      <p>As ASCII text (about 1080KB):
+      <itemize>
+         <item><url url="http://www.freebsd.org/handbook/handbook.ascii"
+                name="http://www.freebsd.org/handbook/handbook.ascii">
+      </itemize>
+
+      <p>As ISO 8859-1 text (about 1080KB):
+      <itemize>
+         <item><url url="http://www.freebsd.org/handbook/handbook.latin1"
+                name="http://www.freebsd.org/handbook/handbook.latin1">
+      </itemize>
+
+    <sect1>
+      <heading>The ASCII handbook isn't plain text!</heading>
+
+      <p>True, the ASCII and Latin1 versions of the FAQ and Handbook aren't
+      strictly plaintext; they contain underlines and overprints that
+      assume the output is going directly to a dot matrix printer.  If you 
+      need to reformat them to be human-readable, run the file through col:
+
+      <verb>
+          $ col -b < inputfile > outputfile
+      </verb>
+
+    <sect1>
+      <heading>I'd like to become a FreeBSD Web mirror!</heading>
+
+      <p>Certainly!  There are multiple ways to mirror the Web pages.
+
+      <itemize>
+         <item>Using CVSUP:  You can retrieve the formatted files using CVSUP
+         from cvsup.freebsd.org.  Add this line to your cvsup file:
+
+<verb>
+www release=current hostname=/home base=/usr/local/etc/cvsup 
+prefix=/usr/local/www/data/www.freebsd.org delete old use-rel-suffix
+
+</verb>
+
+         <item>Using rsync:  See <url url="http://www.freebsd.org/internal/mirror.html"
+         name="the mirroring page"> for information.
+         <item>Using ftp mirror:  You can download the FTP server's copy of
+         the web site using your favorite ftp mirror tool.  Simply start at
+         ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/www.
+     </itemize>
+
+    <sect1>
+      <heading>I'd like to translate the documentation into Friesian.</heading>
+
+      <p>Well, we can't pay, but we might arrange a free CD or T-shirt and a 
+      Contributor's Handbook entry if you sbumit a translation of the
+      documentation.
+
+    <sect1>
       <heading>Other sources of information.</heading>
 
       <p>The following newsgroups contain pertinent discussion for FreeBSD