Removed duplicated documentation.

4 files changed, 11 insertions, 49 deletions

diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index c598c96392..383265d318 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -3507,11 +3507,14 @@ empty PSK identity hint, using @code{--netconf-hint ""}.
 @cindex srptool
 
 The @file{srptool} is a very simple program that emulates the programs
-in the @emph{Stanford SRP libraries}.  It is intended for use in
-places where you don't expect @acronym{SRP} authentication to be the
-used for system users.  Traditionally @emph{libsrp} used two
-files. One called 'tpasswd' which holds usernames and verifiers, and
-'tpasswd.conf' which holds generators and primes.
+in the @emph{Stanford SRP libraries}, see
+@url{http://srp.stanford.edu/}.  It is intended for use in places
+where you don't expect @acronym{SRP} authentication to be the used for
+system users.
+
+Traditionally @emph{libsrp} used two files. One called @code{tpasswd}
+which holds usernames and verifiers, and @code{tpasswd.conf} which
+holds generators and primes.
 
 How to use srptool:
 
@@ -3527,8 +3530,8 @@ $ srptool --create-conf /etc/tpasswd.conf
 
 @item
 This command will create /etc/tpasswd and will add user 'test' (you
-will also be prompted for a password). Verifiers are stored by default
-in the way libsrp expects.
+will also be prompted for a password).  Verifiers are stored by
+default in the way libsrp expects.
 
 @example
 $ srptool --passwd /etc/tpasswd \
@@ -3536,7 +3539,7 @@ $ srptool --passwd /etc/tpasswd \
 @end example
 
 @item
-This command will check against a password. If the password matches
+This command will check against a password.  If the password matches
 the one in /etc/tpasswd you will get an ok.
 
 @example
diff --git a/src/Makefile.am b/src/Makefile.am
index 92f59a23ea..6fdd3b6a26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-EXTRA_DIST = README README.srptool
-
 SUBDIRS = cfg
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
diff --git a/src/README b/src/README
deleted file mode 100644
index 9b4166ca28..0000000000
--- a/src/README
+++ /dev/null
@@ -1,9 +0,0 @@
-In this directory you will find example applications
-that use gnutls and libgcrypt.
-
-serv.c:
-  an example TLS/SSL server application.
-
-cli.c:
-  a TLS client application.
-
diff --git a/src/README.srptool b/src/README.srptool
deleted file mode 100644
index b695122f49..0000000000
--- a/src/README.srptool
+++ /dev/null
@@ -1,30 +0,0 @@
-srptool is a very simple program that emulates the programs in the libsrp 
-found in http://srp.stanford.edu.
-
-It is intended for use in places where you don't expect srp
-authentication to be the performed to system users. If this
-is the case use libsrp and the pam modules provided.
-
-
-Libsrp uses two files. One called 'tpasswd' which holds usernames and
-verifiers, and 'tpasswd.conf' which holds generators and primes.
-
-How to use srptool:
-
-Run: srptool --create-conf /etc/tpasswd.conf
-
-* This will create tpasswd.conf which holds the g and n values for
-SRP protocol (generator and a large prime).
-
-Run: srptool --passwd /etc/tpasswd --passwd-conf /etc/tpasswd.conf -u test
-
-* This will create /etc/tpasswd and will add user 'test' (you will also
-be prompted for a password). Verifiers are stored by default in the
-way libsrp expects (using a modified SHA()). However using this tool you 
-may also specify blowfish crypt instead of SHA (see --crypt parameter).
-
-Run: srptool --passwd /etc/tpasswd --passwd-conf /etc/tpasswd.conf --verify -u test
-
-* You will be promted for a password, and if this password matches the one
-in /etc/tpasswd you will get an ok.
-