Downloading and installing moved to main document

2 files changed, 54 insertions, 56 deletions

diff --git a/doc/cha-library.texi b/doc/cha-library.texi
index 2afaaa1916..e99cedab6f 100644
--- a/doc/cha-library.texi
+++ b/doc/cha-library.texi
@@ -44,18 +44,67 @@ libtasn1@footnote{@url{http://www.gnu.org/software/libtasn1/}},
 a library which offers @acronym{ASN.1} parsing capabilities, is used
 for the @acronym{X.509} certificate parsing functions.  
 The ``Cryptographic back-end'' is provided by nettle@footnote{@url{http://www.lysator.liu.se/~nisse/nettle/}}
-library.
-In order to ease integration in embedded systems, parts of the
-@acronym{GnuTLS} library can be disabled at compile time. That way a
-smaller library, with the required features, can be generated.
-
+library. 
 @menu
+* Downloading and installing::
 * General idea::
 * Error handling::
 * Thread safety::
 * Callback functions::
 @end menu
 
+@node Downloading and installing
+@section Downloading and installing
+@cindex installation
+@cindex download
+
+GnuTLS is available for download at:
+@url{http://www.gnutls.org/download.html}
+
+GnuTLS uses a development cycle where even minor version numbers
+indicate a stable release and a odd minor version number indicate a
+development release.  For example, GnuTLS 1.6.3 denote a stable
+release since 6 is even, and GnuTLS 1.7.11 denote a development
+release since 7 is odd.
+
+GnuTLS depends on Libnettle, and you will need to install it
+before installing GnuTLS.  Libnettle is available from
+@url{http://www.lysator.liu.se/~nisse/nettle/}.  
+Don't forget to verify the cryptographic signature after downloading
+source code packages.
+
+The package is then extracted, configured and built like many other
+packages that use Autoconf.  For detailed information on configuring
+and building it, refer to the @file{INSTALL} file that is part of the
+distribution archive.  Typically you invoke @code{./configure} and
+then @code{make check install}.  There are a number of compile-time
+parameters, as discussed below.
+
+The compression library, libz, as well as p11-kit are a optional dependencies.
+You can get libz from @url{http://www.zlib.net/} and p11-kit from @url{http://p11-glue.freedesktop.org/}.
+
+The X.509 part of GnuTLS needs ASN.1 functionality, from a library
+called libtasn1.  A copy of libtasn1 is included in GnuTLS.  If you
+want to install it separately (e.g., to make it possibly to use
+libtasn1 in other programs), you can get it from
+@url{http://www.gnu.org/software/gnutls/download.html}.
+
+A few @code{configure} options may be relevant, summarized below.
+They disable or enable particular features,
+to create a smaller library with only the required features.
+
+@verbatim
+--disable-srp-authentication
+--disable-psk-authentication
+--disable-anon-authentication
+--disable-extra-pki
+--disable-openpgp-authentication
+--disable-openssl-compatibility
+--without-p11-kit
+@end verbatim
+
+For the complete list, refer to the output from @code{configure --help}.
+
 @node General idea
 @section General idea
 
diff --git a/doc/cha-support.texi b/doc/cha-support.texi
index 7c171d9d0f..dfb501aab1 100644
--- a/doc/cha-support.texi
+++ b/doc/cha-support.texi
@@ -4,7 +4,6 @@
 @menu
 * Getting help::
 * Commercial Support::
-* Downloading and Installing::
 * Bug Reports::
 * Contributing::
 @end menu
@@ -58,56 +57,6 @@ E-mail: simon@josefsson.org
 If your company provides support related to GnuTLS and would like to
 be mentioned here, contact the authors.
 
-@node Downloading and Installing
-@section Downloading and Installing
-@cindex installation
-@cindex download
-
-GnuTLS is available for download at:
-@url{http://www.gnutls.org/download.html}
-
-GnuTLS uses a Linux-like development cycle: even minor version numbers
-indicate a stable release and a odd minor version number indicates a
-development release.  For example, GnuTLS 1.6.3 denote a stable
-release since 6 is even, and GnuTLS 1.7.11 denote a development
-release since 7 is odd.
-
-GnuTLS depends on Libnettle, and you will need to install it
-before installing GnuTLS.  Libnettle is available from
-@url{http://www.lysator.liu.se/~nisse/nettle/}.  
-Don't forget to verify the cryptographic signature after downloading
-source code packages.
-
-The package is then extracted, configured and built like many other
-packages that use Autoconf.  For detailed information on configuring
-and building it, refer to the @file{INSTALL} file that is part of the
-distribution archive.  Typically you invoke @code{./configure} and
-then @code{make check install}.  There are a number of compile-time
-parameters, as discussed below.
-
-The compression library, libz, is an optional dependency.
-You can get libz from @url{http://www.zlib.net/}.  
-
-The X.509 part of GnuTLS needs ASN.1 functionality, from a library
-called libtasn1.  A copy of libtasn1 is included in GnuTLS.  If you
-want to install it separately (e.g., to make it possibly to use
-libtasn1 in other programs), you can get it from
-@url{http://www.gnu.org/software/gnutls/download.html}.
-
-A few @code{configure} options may be relevant, summarized below.
-They disable or enable particular features. 
-
-@verbatim
---disable-srp-authentication
---disable-psk-authentication
---disable-anon-authentication
---disable-extra-pki
---disable-openpgp-authentication
---disable-openssl-compatibility
---without-p11-kit
-@end verbatim
-
-For the complete list, refer to the output from @code{configure --help}.
 
 @node Bug Reports
 @section Bug Reports