2 files changed, 8 insertions, 16 deletions

diff --git a/crypto/telnet/telnet/telnet.1 b/crypto/telnet/telnet/telnet.1
index 96a03db674e3..52d291ea335b 100644
--- a/crypto/telnet/telnet/telnet.1
+++ b/crypto/telnet/telnet/telnet.1
@@ -34,7 +34,7 @@
 .\"
 .Dd January 27, 2000
 .Dt TELNET 1
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm telnet
 .Nd user interface to the 
@@ -376,10 +376,6 @@ The encrypt command manipulates the information sent through the
 .Dv TELNET ENCRYPT
 option.
 .Pp
-Note:  Because of export controls, the
-.Dv TELNET ENCRYPT
-option is not supported outside of the United States and Canada.
-.Pp
 Valid arguments for the
 .Ic encrypt
 command are:
@@ -1171,10 +1167,6 @@ stream does not start automatically.  The autoencrypt
 (autodecrypt) command states that encryption of the
 output (input) stream should be enabled as soon as
 possible.
-.Pp
-Note:  Because of export controls, the
-.Dv TELNET ENCRYPT
-option is not supported outside the United States and Canada.
 .It Ic autologin
 If the remote side supports the
 .Dv TELNET AUTHENTICATION
@@ -1363,8 +1355,6 @@ toggle is
 prints out a message each time encryption is enabled or
 disabled.  The initial value for this toggle is
 .Dv FALSE .
-Note:  Because of export controls, data encryption
-is not supported outside of the United States and Canada.
 .It Ic ?\&
 Displays the legal
 .Ic toggle
diff --git a/crypto/telnet/telnetd/telnetd.8 b/crypto/telnet/telnetd/telnetd.8
index 8cc1525bdc2e..029b8e87a145 100644
--- a/crypto/telnet/telnetd/telnetd.8
+++ b/crypto/telnet/telnetd/telnetd.8
@@ -34,7 +34,7 @@
 .\"
 .Dd January 27, 2000
 .Dt TELNETD 8
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm telnetd
 .Nd DARPA
@@ -462,7 +462,8 @@ is willing to receive an 8 bit data stream.
 Requests that the client handle flow control
 characters remotely.
 .It "DO ECHO"
-This is not really supported, but is sent to identify a 4.2BSD
+This is not really supported, but is sent to identify a
+.Bx 4.2
 .Xr telnet 1
 client, which will improperly respond with
 .Dv WILL ECHO .
@@ -527,7 +528,6 @@ is compiled with support for data encryption, and
 indicates a willingness to decrypt
 the data stream.
 .El
-.Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /usr/ucb/bftp -compact
 .It Pa /etc/services
@@ -594,11 +594,13 @@ Some
 .Tn TELNET
 commands are only partially implemented.
 .Pp
-Because of bugs in the original 4.2 BSD
+Because of bugs in the original
+.Bx 4.2
 .Xr telnet 1 ,
 .Nm
 performs some dubious protocol exchanges to try to discover if the remote
-client is, in fact, a 4.2 BSD
+client is, in fact, a
+.Bx 4.2
 .Xr telnet 1 .
 .Pp
 Binary mode