*** empty log message ***

4 files changed, 42 insertions, 45 deletions

diff --git a/doc/tex/Makefile.am b/doc/tex/Makefile.am
index 9206212f84..edd3040712 100644
--- a/doc/tex/Makefile.am
+++ b/doc/tex/Makefile.am
@@ -7,7 +7,7 @@ TEX_OBJECTS = gnutls.tex ../../lib/gnutls-api.tex serv1.tex ex1.tex ex2.tex ex3.
 	macros.tex cover.tex ciphersuites.tex handshake.tex translayer.tex \
 	auth.tex ciphers.tex errors.tex layers.tex alert.tex record.tex \
 	funcs.tex examples.tex ex4.tex ../../libextra/gnutls-extra-api.tex \
-	memory.tex intro.tex openpgp.tex x509.tex howto.tex openssl.tex \
+	memory.tex openpgp.tex x509.tex howto.tex openssl.tex \
 	ex-rfc2818.tex appendix.tex x509cert.xml.tex pgpcert.xml.tex \
 	serv-export.tex serv-srp.tex programs.tex library.tex certificate.tex \
 	tlsintro.tex
diff --git a/doc/tex/gnutls.tex b/doc/tex/gnutls.tex
index b910f5a145..3fe92c8638 100644
--- a/doc/tex/gnutls.tex
+++ b/doc/tex/gnutls.tex
@@ -23,8 +23,6 @@
 \fancyhead[RO,LE]{\empty}
 \fancyfoot[C]{\thepage}
 
-\input{intro}
-
 \input{library}
 
 \input{tlsintro}
diff --git a/doc/tex/intro.tex b/doc/tex/intro.tex
deleted file mode 100644
index 3b3d1ed9bd..0000000000
--- a/doc/tex/intro.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\chapter{Introduction}
-
-\section{Description}
-\par
-In brief \gnutls{} can be described as a portable library which offers
-an API to access secure communication protocols. These protocols provide
-privacy over insecure lines, and were designed to prevent 
-eavesdropping, tampering, or message forgery.
-
-\par
-Technically \gnutls{} is a library which implements the \tlsI{} and 
-\sslIII{} protocols.
-\tls{} stands for 'Transport Layer Security' and is the sucessor of \ssl{}, 
-the Secure Sockets Layer protocol designed by Netscape. 
-
-\tlsI{}\footnote{described in {\it RFC 2246}} is an Internet protocol,
-defined by {IETF}\footnote{IETF or Internet Engineering Task Force 
-is a large open international community of network
-designers, operators, vendors, and researchers concerned with the evolution of 
-the Internet architecture and the smooth operation of the Internet. It is open to any interested individual.}, 
-that provides confidentiality, and authentication layers over any reliable
-transport layer.
-The above protocols are implemented in a reentrant way. 
-This allows multiple threads of execution, without the need for critical 
-sections and locks. 
-
-\par
-See \htmladdnormallink{http://www.gnutls.org/}{http://www.gnutls.org/}
-and \htmladdnormallink{http://www.gnu.org/software/gnutls/}{http://www.gnu.org/software/gnutls/} 
-for updated versions of the \gnutls{} software and this document.
-
-\section{Current state}
-
-Currently \gnutls{} implements:
-\begin{itemize}
-\item the \tlsI{} and \sslIII{} protocols.
-\item {\bf X.509} Public Key Infrastructure.
-\item {\bf OpenPGP} Public Key Infrastructure.
-\item {\bf SRP} for \tls{} authentication.
-\item \tls{} {\bf Extension mechanism}.
-\end{itemize}
-
diff --git a/doc/tex/library.tex b/doc/tex/library.tex
index 612fca83d0..b67a380eda 100644
--- a/doc/tex/library.tex
+++ b/doc/tex/library.tex
@@ -1,5 +1,46 @@
 \chapter{The Library}
 
+\section{Description}
+\par
+In brief \gnutls{} can be described as a portable library which offers
+an API to access secure communication protocols. These protocols provide
+privacy over insecure lines, and were designed to prevent 
+eavesdropping, tampering, or message forgery.
+
+\par
+Technically \gnutls{} is a library which implements the \tlsI{} and 
+\sslIII{} protocols.
+\tls{} stands for 'Transport Layer Security' and is the sucessor of \ssl{}, 
+the Secure Sockets Layer protocol designed by Netscape. 
+
+\tlsI{}\footnote{described in {\it RFC 2246}} is an Internet protocol,
+defined by {IETF}\footnote{IETF or Internet Engineering Task Force 
+is a large open international community of network
+designers, operators, vendors, and researchers concerned with the evolution of 
+the Internet architecture and the smooth operation of the Internet. It is open to any interested individual.}, 
+that provides confidentiality, and authentication layers over any reliable
+transport layer.
+The above protocols are implemented in a reentrant way. 
+This allows multiple threads of execution, without the need for critical 
+sections and locks. 
+
+\par
+See \htmladdnormallink{http://www.gnutls.org/}{http://www.gnutls.org/}
+and \htmladdnormallink{http://www.gnu.org/software/gnutls/}{http://www.gnu.org/software/gnutls/} 
+for updated versions of the \gnutls{} software and this document.
+
+\section{Current state}
+
+Currently \gnutls{} implements:
+\begin{itemize}
+\item the \tlsI{} and \sslIII{} protocols.
+\item {\bf X.509} Public Key Infrastructure.
+\item {\bf OpenPGP} Public Key Infrastructure.
+\item {\bf SRP} for \tls{} authentication.
+\item \tls{} {\bf Extension mechanism}.
+\end{itemize}
+
+
 \section{General Idea}
 % explain how it works
 A brief description of how \gnutls{} works internally is shown at