tidy, fix typos, reorder

1 files changed, 23 insertions, 24 deletions

diff --git a/contrib/README b/contrib/README
index dde6ccb19..407152dcc 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,20 +1,29 @@
 Other patches and addons for OpenSSH. Please send submissions to 
-djm@ibs.com.au
+djm@mindrot.org
 
-Elsewhere
----------
+Externally maintained
+---------------------
 
-http://www.imasy.or.jp/~gotoh/connect.c is a Unix and Windows 
-ProxyCommand which allows OpenSSH to make connections through a SOCKS5
-or http proxy which supports the CONNECT method (eg. Squid).
+SSH Proxy Command -- connect.c
 
-In this directory
------------------
+Shun-ichi GOTO <gotoh@imasy.or.jp> has written a very useful ProxyCommand
+which allows the use of outbound SSH from behind a SOCKS4, SOCKS5 or 
+https CONNECT style proxy server. His page for connect.c has extensive
+documentation on its use as well as compiled versions for Win32.
 
-chroot.diff: 
+http://www.taiyo.co.jp/~gotoh/ssh/connect.html
 
-Due to the fact the patch is never in sync with the rest of the tree.  It was
-removed. 
+
+X11 SSH Askpass:
+
+Jim Knoble <jmknoble@pobox.com> has written an excellent X11
+passphrase requester. This is highly recommended:
+
+http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html
+
+
+In this directory
+-----------------
 
 ssh-copy-id:
 
@@ -23,7 +32,7 @@ your public key to a remote machine's ~/.ssh/authorized_keys file.
 
 gnome-ssh-askpass[12]:
 
-A GNOME/Gtk2 passphrase requester of my own creation. Compilation instructions
+A GNOME and Gtk2 passphrase requesters. Compilation instructions
 are in the top of the files.
 
 sshd.pam.generic:
@@ -43,19 +52,9 @@ Contributed by Mark D. Roth <roth@feep.net>
 
 redhat:
 
-RPM spec file an scripts for building Redhat packages
+RPM spec file and scripts for building Redhat packages
 
 suse:
 
-RPM spec file an scripts for building SuSE packages
-
-
-Externally maintained
----------------------
-
-X11 SSH Askpass:
-
-Jim Knoble <jmknoble@pobox.com> has written an excellent X11
-passphrase requester. This is highly recommended:
+RPM spec file and scripts for building SuSE packages
 
-http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html