Update readme files to better reflect reality.

Prompted by bz#3738, ok djm@.

diff --git a/INSTALL b/INSTALL
index f99d1e2a80948e689512158af195c6d66b1e26cb..3ad1659f36f60b4aa5abc7d32a04b62622a3d76e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -41,15 +41,17 @@ direct support of /dev/random, or failing that, either prngd or egd.
 PRNGD:
 
 If your system lacks kernel-based random collection, the use of Lutz
-Jaenicke's PRNGd is recommended. It requires that libcrypto be configured
-to support it.
+Jaenicke's PRNGd is recommended.  If you are using libcrypto it requires
+that the libcrypto is configured to support it.  If you are building
+--without-openssl then the --with-prngd-socket option must match the
+socket provided by prngd.
 
 http://prngd.sourceforge.net/
 
 EGD:
 
 The Entropy Gathering Daemon (EGD) supports the same interface as prngd.
-It also supported only if libcrypto is configured to support it.
+The same caveats about configuration for prngd also apply.
 
 http://egd.sourceforge.net/
 
@@ -94,8 +96,8 @@ http://nlnetlabs.nl/projects/ldns/
 Autoconf:
 
 If you modify configure.ac or configure doesn't exist (eg if you checked
-the code out of git yourself) then you will need autoconf-2.69 and
-automake-1.16.1 to rebuild the automatically generated files by running
+the main git branch) then you will need autoconf-2.69 and automake-1.16.1
+or newer to rebuild the automatically generated files by running
 "autoreconf".  Earlier versions may also work but this is not guaranteed.
 
 http://www.gnu.org/software/autoconf/

diff --git a/README b/README
index 3e494c6943987f11eaba48bb18bad9f4229d39ea..e1821138e7f9050ae417b8759585c7dbfcec028a 100644 (file)
--- a/README
+++ b/README
@@ -2,18 +2,18 @@ See https://www.openssh.com/releasenotes.html#9.9p1 for the release
 notes.
 
 Please read https://www.openssh.com/report.html for bug reporting
-instructions and note that we do not use Github for bug reporting or
-patch/pull-request management.
+instructions and note that we do not use Github for bug reporting.
 
 This is the port of OpenBSD's excellent OpenSSH[0] to Linux and other
 Unices.
 
 OpenSSH is based on the last free version of Tatu Ylonen's sample
-implementation with all patent-encumbered algorithms removed (to
-external libraries), all known security bugs fixed, new features
-reintroduced and many other clean-ups.  OpenSSH has been created by
-Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de Raadt,
-and Dug Song. It has a homepage at https://www.openssh.com/
+implementation with all patent-encumbered algorithms removed (to external
+libraries), all known security bugs fixed, new features reintroduced and
+many other clean-ups.  OpenSSH was created by Aaron Campbell, Bob Beck,
+Markus Friedl, Niels Provos, Theo de Raadt, and Dug Song, and has been
+developed and maintained by Andre Lucas, Ben Lindstom, Damien Miller,
+Darren Tucker and Tim Rice. It has a homepage at https://www.openssh.com/
 
 This port consists of the re-introduction of autoconf support, PAM
 support, EGD/PRNGD support and replacements for OpenBSD library
@@ -23,10 +23,6 @@ FreeBSD, NetBSD, OpenBSD, OpenServer, Solaris and UnixWare.
 
 This version actively tracks changes in the OpenBSD CVS repository.
 
-The PAM support is now more functional than the popular packages of
-commercial ssh-1.2.x. It checks "account" and "session" modules for
-all logins, not just when using password authentication.
-
 There is now several mailing lists for this port of OpenSSH. Please
 refer to https://www.openssh.com/list.html for details on how to join.
 

diff --git a/README.md b/README.md
index 9431b0ffdd89ce3e3932d6d48d133c6650a5759d..2ad6471386e2c88d227f6c36c79a31e0e3d621c8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ In addition, certain platforms and build-time options may require additional dep
 
 ### Building a release
 
-Releases include a pre-built copy of the ``configure`` script and may be built using:
+Release tarballs and release branches in git include a pre-built copy of the ``configure`` script and may be built using:
 
 ```
 tar zxvf openssh-X.YpZ.tar.gz
@@ -54,7 +54,7 @@ See the [Build-time Customisation](#build-time-customisation) section below for
 
 ### Building from git
 
-If building from git, you'll need [autoconf](https://www.gnu.org/software/autoconf/) installed to build the ``configure`` script. The following commands will check out and build portable OpenSSH from git:
+If building from the git master branch, you'll need [autoconf](https://www.gnu.org/software/autoconf/) installed to build the ``configure`` script. The following commands will check out and build portable OpenSSH from git:
 
 ```
 git clone https://github.com/openssh/openssh-portable # or https://anongit.mindrot.org/openssh.git