From fa9ecc3cc290df0211c931dc63ab59d0ded8fbf7 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 25 Apr 2009 03:58:12 +0000
Subject: [PATCH] remove some archaic stuff.  Are we still telling people to
 not use telnet?  That is not our job.

---
 src/etc/root/root.mail | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/etc/root/root.mail b/src/etc/root/root.mail
index 5b856fd5..35a4193e 100644
--- a/src/etc/root/root.mail
+++ b/src/etc/root/root.mail
@@ -14,16 +14,16 @@ For more information on how to set up your OpenBSD system, refer to the
 "man afterboot").  If you are not familiar with how to read man pages, type
 "man man" at a shell prompt and read the entire thing.  Pay specific
 attention to the "man -k keyword" option, which will permit you to find the
-man page you are looking for more easily; for instance, "man -k ethernet".  The
-GNU "info" subsystem is also installed with further documentation resources:
-to read info pages type "info".  (The info subsystem behaves like the
-popular emacs editor.)
+man page you are looking for more easily; for instance, "man -k ethernet".
+The GNU "info" subsystem is also installed with further documentation
+resources: to read info pages type "info".  (The info subsystem behaves like
+the popular emacs editor.)
 
 Again, PLEASE READ THE MANUAL PAGES.  Our developers have spent countless
 hours improving them so that they are clear and precise.
 
-If you have installed the X11 packages during the install process, you can find
-further information regarding configuration in the file /usr/X11R6/README.
+If you have installed the X11 packages during the install process, you can
+find further information regarding configuration in the file /usr/X11R6/README.
 
 Several popular binary packages (pre-compiled applications) are available
 for most architectures.  If you installed from a CD-ROM the packages
@@ -45,11 +45,6 @@ to install the emacs package for i386, execute:
 or alternatively install them via FTP this way:
  # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.5/packages/i386/emacs-21.4p7.tgz
 
-You are STRONGLY urged to use ssh instead of telnet, rlogin, or rsh!  ssh is
-included in all OpenBSD systems.  The implementation is OpenSSH, which we are
-the developers of.  For more information, see
-	http://www.OpenSSH.com
-
 Significant efforts were made to centralize all system configuration in the
 /etc directory.  You should be able to find each of the configuration files
 you seek there, lightly documented.  In particular, much of the configuration
@@ -86,6 +81,5 @@ kernel.  If you have a multi-processor machine, dmesg results of both GENERIC.MP
 and GENERIC kernels are appreciated.)  The device driver information we get from
 this helps us fix existing drivers. Thank you!
 
-(If you used 'mail' to read this message and it scrolled by too quickly,
-type "more ."  If you wish to save it, use the "x" command.)
+(If you wish to save it, use the "x" command.)