- (djm) Doc fixes from Pekka Savola <pekkas@netcore.fi>

diff --git a/ChangeLog b/ChangeLog
index 8c8438b21eb9323cb5e5f43dfd345645ea0ffe8d..6bb393e483f97cdcf7f1d4f1c9de5c76e7ac6074 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
    <marekm@amelek.gda.pl>
  - (djm) Swapped tests for no_libsocket and no_libnsl in configure.in. 
    Patch from Marek Michalkiewicz <marekm@amelek.gda.pl>
    <marekm@amelek.gda.pl>
  - (djm) Swapped tests for no_libsocket and no_libnsl in configure.in. 
    Patch from Marek Michalkiewicz <marekm@amelek.gda.pl>

+ - (djm) Doc fixes from Pekka Savola <pekkas@netcore.fi>

 
 20010217
  - (bal) OpenBSD Sync:
 
 20010217
  - (bal) OpenBSD Sync:

diff --git a/INSTALL b/INSTALL
index cd2b40a5f13506ed2d94a803d0a0c24df0671ea8..3a4aadebcd623201436dbb7e6568d58292883d66 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,9 @@ http://www.freesoftware.com/pub/infozip/zlib/
 OpenSSL 0.9.5a or greater:
 http://www.openssl.org/
 
 OpenSSL 0.9.5a or greater:
 http://www.openssl.org/
 

-RPMs of OpenSSL are available at http://violet.ibs.com.au/openssh/files/support
+RPMs of OpenSSL are available at http://violet.ibs.com.au/openssh/files/support.
+For Red Hat Linux 6.2, they have been released as errata.  RHL7 includes
+these.

 
 OpenSSH can utilise Pluggable Authentication Modules (PAM) if your system
 supports it. PAM is standard on Redhat and Debian Linux, Solaris and
 
 OpenSSH can utilise Pluggable Authentication Modules (PAM) if your system
 supports it. PAM is standard on Redhat and Debian Linux, Solaris and


@@ -93,7 +95,7 @@ If you are using PAM, you may need to manually install a PAM
 control file as "/etc/pam.d/sshd" (or wherever your system
 prefers to keep them). A generic PAM configuration is included as
 "contrib/sshd.pam.generic", you may need to edit it before using it on
 control file as "/etc/pam.d/sshd" (or wherever your system
 prefers to keep them). A generic PAM configuration is included as
 "contrib/sshd.pam.generic", you may need to edit it before using it on

-your system. If you are using a recent version of Redhat Linux, the
+your system. If you are using a recent version of Red Hat Linux, the

 config file in contrib/redhat/sshd.pam should be more useful. 
 Failure to install a valid PAM file may result in an inability to
 use password authentication.  On HP-UX 11, the standard /etc/pam.conf
 config file in contrib/redhat/sshd.pam should be more useful. 
 Failure to install a valid PAM file may result in an inability to
 use password authentication.  On HP-UX 11, the standard /etc/pam.conf


@@ -107,8 +109,7 @@ Normally ./configure will search the current $PATH for 'rsh'. You
 may need to specify this option if rsh is not in your path or has a
 different name.
 
 may need to specify this option if rsh is not in your path or has a
 different name.
 

---without-pam will disable PAM support. PAM is automatically detected 
-and switched on if found.
+--with-pam enables PAM support.

 
 --enable-gnome-askpass will build the GNOME passphrase dialog. You
 need a working installation of GNOME, including the development
 
 --enable-gnome-askpass will build the GNOME passphrase dialog. You
 need a working installation of GNOME, including the development


@@ -194,8 +195,9 @@ review it to ensure that it matches your security requirements.
 To generate a host key, run "make host-key". Alternately you can do so
 manually using the following commands: 
 
 To generate a host key, run "make host-key". Alternately you can do so
 manually using the following commands: 
 

-    ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N ""
-    ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N ""
+    ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N ""
+    ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""
+    ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""

 
 Replacing /etc/ssh with the correct path to the configuration directory.
 (${prefix}/etc or whatever you specified with --sysconfdir during 
 
 Replacing /etc/ssh with the correct path to the configuration directory.
 (${prefix}/etc or whatever you specified with --sysconfdir during 

diff --git a/README b/README
index 952b38d31ccc147c48ef24e305444b19b68f6d36..4c6630771d66ca1d5e896170cbdc44d4919fd89d 100644 (file)
--- a/README
+++ b/README
@@ -33,8 +33,8 @@ Please send bug reports and patches to the mailing list
 openssh-unix-dev@mindrot.org. The list is open to posting by
 unsubscribed users.
 
 openssh-unix-dev@mindrot.org. The list is open to posting by
 unsubscribed users.
 

-If you are a citizen of the USA or another country which restricts 
-export of cryptographic products, then please refrain from sending 
+If you are a citizen of an USA-embargoed country to which export of 
+cryptographic products is restricted, then please refrain from sending 

 crypto-related code or patches to the list. We cannot accept them.
 Other code contribution are accepted, but please follow the OpenBSD
 style guidelines[6].
 crypto-related code or patches to the list. We cannot accept them.
 Other code contribution are accepted, but please follow the OpenBSD
 style guidelines[6].