Removed more stuff that's not relevant for us.

Texinfo grammatic fixes also.

4 files changed, 9 insertions, 31 deletions

diff --git a/kerberosIV/src/doc/install.texi b/kerberosIV/src/doc/install.texi
index 2e25101e2fd..49b3c72fbe8 100644
--- a/kerberosIV/src/doc/install.texi
+++ b/kerberosIV/src/doc/install.texi
@@ -6,14 +6,16 @@
 * Installing a binary distribution::  
 * Finishing the installation::  
 * .klogin::
-* Authentication modules::      
 @end menu
 
 @node Installing from source, Installing a binary distribution, Installing programs, Installing programs
 @comment  node-name,  next,  previous,  up
 @section Installing from source
 
-KerberosIV is by default built by the standard @code{make build} procedure.
+KerberosIV is by default built by the standard @code{make build} procedure,
+so normally you don't need to do anything special.
+But if you're upgrading from OpenBSD 2.6 or earlier, the following
+steps may be necessary:
 
 @table @asis
 
@@ -63,12 +65,7 @@ reason. The old protocols use reserved ports as security, and therefore
 the programs have to be setuid to root. If you don't need this
 functionality consider turning off the setuid bit.
 
-@menu
-* .klogin::
-* Authentication modules::      
-@end menu
-
-@node .klogin, Authentication modules, Finishing the installation, Installing programs
+@node .klogin, , Finishing the installation, Installing programs
 @comment  node-name,  next,  previous,  up
 
 Each user can have an authorization file @file{~@var{user}/.klogin}
diff --git a/kerberosIV/src/doc/kth-krb.texi b/kerberosIV/src/doc/kth-krb.texi
index 3eb21080dac..8a1233e9d08 100644
--- a/kerberosIV/src/doc/kth-krb.texi
+++ b/kerberosIV/src/doc/kth-krb.texi
@@ -222,7 +222,6 @@ to the following restrictions:
 * What is Kerberos?::           
 * Installing programs::         
 * How to set up a realm::       
-* One-Time Passwords::          
 * Resolving frequent problems::  
 * Acknowledgments::             
 * Index::                       
@@ -235,17 +234,6 @@ Installing programs
 * Installing from source::      
 * Installing a binary distribution::  
 * Finishing the installation::  
-* Authentication modules::      
-
-Finishing the installation
-
-* Authentication modules::      
-
-Authentication modules
-
-* Digital SIA::                 
-* IRIX::                        
-* PAM::                         
 
 How to set up a realm
 
@@ -273,7 +261,6 @@ How to set up the kerberos server
 
 Resolving frequent problems
 
-* Problems compiling Kerberos::  
 * Problems with firewalls::     
 * Common error messages::       
 * Is Kerberos year 2000 safe?::  
diff --git a/kerberosIV/src/doc/problems.texi b/kerberosIV/src/doc/problems.texi
index f31e1427cb8..f325b160003 100644
--- a/kerberosIV/src/doc/problems.texi
+++ b/kerberosIV/src/doc/problems.texi
@@ -1,4 +1,4 @@
-@node Resolving frequent problems, Acknowledgments, One-Time Passwords, Top
+@node Resolving frequent problems, Acknowledgments, How to set up a realm, Top
 @chapter Resolving frequent problems
 
 @menu
@@ -7,9 +7,7 @@
 * Is Kerberos year 2000 safe?::  
 @end menu
 
-@node Problems compiling Kerberos, Problems with firewalls, Resolving frequent problems, Resolving frequent problems
-
-@node Problems with firewalls, Common error messages, Problems compiling Kerberos, Resolving frequent problems
+@node Problems with firewalls, Common error messages, Resolving frequent problems, Resolving frequent problems
 @section Problems with firewalls
 
 @cindex firewall
diff --git a/kerberosIV/src/doc/setup.texi b/kerberosIV/src/doc/setup.texi
index 7f4caeb99c1..7f7dd49678a 100644
--- a/kerberosIV/src/doc/setup.texi
+++ b/kerberosIV/src/doc/setup.texi
@@ -1,4 +1,4 @@
-@node How to set up a realm, One-Time Passwords, Installing programs, Top
+@node How to set up a realm, Resolving frequent problems, Installing programs, Top
 @chapter How to set up a realm
 
 @quotation
@@ -621,9 +621,7 @@ authentication method should be used.  The @code{telnetd} program has
 an option ``-a user'' that only allows kerberised and authenticated
 connections.  If this is not included, it falls back to using clear text
 passwords.  For obvious reasons, we recommend that you enable this
-option.  If you want to use one-time passwords (@pxref{One-Time
-Passwords}) you can use the ``-a otp'' option which will allow OTPs or
-kerberised connections.
+option.
 
 @subsection ftp
 @pindex ftp
@@ -633,8 +631,6 @@ default only kerberos authenticated connections are allowed.  You can
 specify additional levels that are thus allowed with these options:
 
 @table @asis
-@item @kbd{-a otp}
-Allow one-time passwords (@pxref{One-Time Passwords}).
 @item @kbd{-a ftp}
 Allow anonymous login (as user ``ftp'' or ``anonymous'').
 @item @kbd{-a safe}