[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-223-g67db171

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=67db171a3553875283c118a6ee02edc9acf208b7

The branch, master has been updated
       via  67db171a3553875283c118a6ee02edc9acf208b7 (commit)
       via  a4bc93184738e4226e1a8079c68ff4be2c9c2b53 (commit)
      from  d77d792c4abc6a198309501bd293dbf0252436b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 67db171a3553875283c118a6ee02edc9acf208b7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 12:56:57 2012 +0100

    documentation update

commit a4bc93184738e4226e1a8079c68ff4be2c9c2b53
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Feb 14 12:05:13 2012 +0100

    updated documentation for included programs.

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am                                    |   48 +++++++++++------
 doc/cha-intro-tls.texi                             |    2 +-
 doc/gnutls.texi                                    |   12 ++--
 .../Makefile.am => scripts/cleanup-autogen.pl}     |   55 +++++++++++++-------
 4 files changed, 75 insertions(+), 42 deletions(-)
 copy doc/{credentials/Makefile.am => scripts/cleanup-autogen.pl} (57%)
 mode change 100644 => 100755

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e07d90b..28c16fa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,41 +30,57 @@ endif
 
 invoke-gnutls-cli.texi: ../src/cli-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@
 
 invoke-gnutls-cli-debug.texi: ../src/cli-debug-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@
 
 invoke-gnutls-serv.texi: ../src/serv-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@
 
 invoke-certtool.texi: ../src/certtool-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@
 
-invoke-srptool.texi: ../src/srptool-args.def
+invoke-ocsptool.texi: ../src/ocsptool-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@ && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@
 
-invoke-ocsptool.texi: ../src/ocsptool-args.def
+invoke-srptool.texi: ../src/srptool-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@ && \
+       sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
+       sed -i 's/@section/@subsection/g' ../doc/$@
 
 invoke-psktool.texi: ../src/psk-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@ && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@ && \
+       sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
+       sed -i 's/@section/@subsection/g' ../doc/$@
 
 invoke-p11tool.texi: ../src/p11tool-args.def
        @-cd ../src/ && autogen -Tagtexi-cmd.tpl $< && \
-       sed -i 's/@subsection/@subsubsection/g' $@ && \
-       sed -i 's/@section/@subsection/g' $@ && \
-       mv -f ../src/$@ ../doc
+       rm -f ../doc/$@ && \
+       ../doc/scripts/cleanup-autogen.pl <../src/$@ >../doc/$@ && \
+       rm -f ../src/$@ && \
+       sed -i 's/@subheading/@subsubheading/g' ../doc/$@ && \
+       sed -i 's/@section/@subsection/g' ../doc/$@
 
 info_TEXINFOS = gnutls.texi gnutls-guile.texi
 gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi                             \
diff --git a/doc/cha-intro-tls.texi b/doc/cha-intro-tls.texi
index 6aaa201..c6e8876 100644
--- a/doc/cha-intro-tls.texi
+++ b/doc/cha-intro-tls.texi
@@ -270,7 +270,7 @@ application protocol solely (e.g. 
@address@hidden@address@hidden).  An
 alert signal includes a level indication which may be either fatal or
 warning. Fatal alerts always terminate the current connection, and
 prevent future re-negotiations using the current session ID. All alert
-messages are summarized in @ref{tab:alerts}.
+messages are summarized in the table below.
 
 The alert messages are protected by the record protocol, thus the
 information that is included does not leak. You must take extreme care
diff --git a/doc/gnutls.texi b/doc/gnutls.texi
index 74c556e..9d98de5 100644
--- a/doc/gnutls.texi
+++ b/doc/gnutls.texi
@@ -49,7 +49,7 @@ Documentation License''.
 @subtitle Transport Layer Security Library for the GNU system
 @subtitle for version @value{VERSION}, @value{UPDATED}
 @sp 7
address@hidden,6cm,6cm}
address@hidden @image{gnutls-logo,6cm,6cm}
 @author Nikos Mavrogiannopoulos
 @author Simon Josefsson (@email{bug-gnutls@@gnu.org})
 @page
@@ -160,13 +160,13 @@ Documentation License''.
 * Internal architecture of GnuTLS::
 * Support::
 * Error codes::
-* API reference::
 * Supported ciphersuites::
+* API reference::
 * Copying Information::
-* Concept Index::
+* Bibliography::
 * Function and Data Index::
+* Concept Index::
 @c * @mybibnode{}::
-* Bibliography::
 @end menu
 
 @include cha-preface.texi
@@ -195,10 +195,10 @@ Documentation License''.
 
 @include cha-errors.texi
 
address@hidden cha-functions.texi
-
 @include cha-ciphersuites.texi
 
address@hidden cha-functions.texi
+
 @include cha-copying.texi
 
 @include cha-bib.texi
diff --git a/doc/credentials/Makefile.am b/doc/scripts/cleanup-autogen.pl
old mode 100644
new mode 100755
similarity index 57%
copy from doc/credentials/Makefile.am
copy to doc/scripts/cleanup-autogen.pl
index bfe0ae0..7d2d43a
--- a/doc/credentials/Makefile.am
+++ b/doc/scripts/cleanup-autogen.pl
@@ -1,7 +1,8 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
-#
-# Author: Simon Josefsson
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
 #
 # This file is part of GnuTLS.
 #
@@ -19,18 +20,34 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-SUBDIRS = openpgp srp x509
-
-EXTRA_DIST = gnutls-http-serv 
-
-EXTRA_DIST += ca.tmpl client.tmpl proxy.tmpl server.tmpl
-
-EXTRA_DIST += params.pem
-
-EXTRA_DIST += srp-passwd.txt  srp-tpasswd.conf
-
-EXTRA_DIST += psk-passwd.txt
-
-EXTRA_DIST += openpgp-server.bin openpgp-server-key.bin        \
-       openpgp-server-key.txt openpgp-server.txt
-
+my $line;
+my $init = 0;
+my $menu = 0;
+
+while ($line = <>) {
+  if ($line =~ /address@hidden/) {
+    if ($init == 0) {
+      $init = 1;
+    } else {
+      next;
+    }
+  }
+
+  if ($line =~ /address@hidden/) {
+    $menu = 1;
+    next;
+  }
+
+  if ($line =~ /address@hidden menu/) {
+    $menu = 0;
+    next;
+  }
+
+  next if ($menu != 0);
+
+  if ($line =~ /address@hidden(.*)/) {
+    $line = "address@hidden $1\n";
+  }
+
+  print $line;
+}


hooks/post-receive
-- 
GNU gnutls