minor updates in the latex version of the manual [ci skip]

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/doc/cha-crypto.texi b/doc/cha-crypto.texi
index e097040fd6ddc440a41ce03721db0551c05444f8..fb01b2c37b4b6765ce51efd59aa4adb8978bbb23 100644 (file)
--- a/doc/cha-crypto.texi
+++ b/doc/cha-crypto.texi
@@ -11,7 +11,7 @@ to the random number generation. For a low-level crypto API the usage of nettle
 @menu
 * Symmetric algorithms::
 * Public key algorithms::
-* Cryptographic Message Syntax / PKCS#7::
+* Cryptographic Message Syntax / PKCS7::
 * Hash and MAC functions::
 * Random number generation::
 * Overriding algorithms::
@@ -94,8 +94,8 @@ or with the more advanced @funcref{gnutls_privkey_generate2}.
 
 @showfuncdesc{gnutls_privkey_generate2}
 
-@node Cryptographic Message Syntax / PKCS#7
-@section Cryptographic Message Syntax / PKCS#7
+@node Cryptographic Message Syntax / PKCS7
+@section Cryptographic Message Syntax / PKCS7
 @cindex public key algorithms
 @cindex cryptographic message syntax
 @cindex file signing

diff --git a/doc/cha-gtls-app.texi b/doc/cha-gtls-app.texi
index b304d67fb9a9768567e1e03d7c86452dfb8c77e3..e08cbb24f12c04e4525296c6a719cef8dd110e95 100644 (file)
--- a/doc/cha-gtls-app.texi
+++ b/doc/cha-gtls-app.texi
@@ -205,7 +205,8 @@ CPU. The currently available options are:
 @end itemize
 
 @item @code{GNUTLS_FORCE_FIPS_MODE}
-@tab In setups where GnuTLS is compiled with support for FIPS140-2 (see @ref{FIPS140-2 mode}).
+@tab In setups where GnuTLS is compiled with support for FIPS140-2 (see @ref{FIPS140-2 mode})
+if set to one it will force the FIPS mode enablement.
 
 @end multitable
 @caption{Environment variables used by the library.}

diff --git a/doc/latex/Makefile.am b/doc/latex/Makefile.am
index 2ae3dff02579f1c7deaefe2acd33a8a21c7cdf82..7056d56858afe22d51227525da9289fa51e696a3 100644 (file)
--- a/doc/latex/Makefile.am
+++ b/doc/latex/Makefile.am
@@ -8,7 +8,7 @@ GEN_TEX_OBJECTS = cha-preface.tex cha-library.tex cha-intro-tls.tex cha-cert-aut
   invoke-certtool.tex invoke-gnutls-cli.tex invoke-gnutls-serv.tex cha-tokens.tex \
   invoke-srptool.tex invoke-psktool.tex invoke-gnutls-cli-debug.tex \
   invoke-p11tool.tex invoke-ocsptool.tex invoke-tpmtool.tex invoke-danetool.tex \
-  cha-auth.tex
+  cha-auth.tex cha-crypto.tex
 
 invoke-certtool.tex: ../invoke-certtool.texi
        ../scripts/mytexi2latex $< > $@
@@ -76,6 +76,9 @@ cha-gtls-examples.tex: ../cha-gtls-examples.texi
 sec-tls-app.tex: ../sec-tls-app.texi
        ../scripts/mytexi2latex $< > $@
 
+cha-crypto.tex: ../cha-crypto.texi
+       ../scripts/mytexi2latex $< > $@
+
 cha-programs.tex: ../cha-programs.texi
        ../scripts/mytexi2latex $< > $@
 

diff --git a/doc/latex/cover.tex b/doc/latex/cover.tex
index d3de7054359c95d161d9cd9d6cc757dcf3f0e2f7..26a4487d33fa705a6ed9899e4d7471c298fc5c94 100644 (file)
--- a/doc/latex/cover.tex
+++ b/doc/latex/cover.tex
@@ -13,7 +13,7 @@ to Patrick Pelletier and Andreas Metzler.
 \begin{flushleft}
 ISBN 978-1-326-00266-4\\
 Copyright \copyright{} 2001-2015 Free Software Foundation, Inc.\\
-Copyright \copyright{} 2001-2015 Nikos Mavrogiannopoulos
+Copyright \copyright{} 2001-2019 Nikos Mavrogiannopoulos
 \end{flushleft}
 
 \begin{flushleft}

diff --git a/doc/latex/gnutls.tex b/doc/latex/gnutls.tex
index 0d770d59d3b8462a86433825a9f0d32bb1c73c27..0a5d0bd995cc7327257651881267bf081d7bfeaa 100644 (file)
--- a/doc/latex/gnutls.tex
+++ b/doc/latex/gnutls.tex
@@ -80,6 +80,8 @@
 
 \input{cha-gtls-examples}
 
+\input{cha-crypto}
+
 \input{cha-programs}
 
 \input{cha-internals}

diff --git a/doc/scripts/mytexi2latex b/doc/scripts/mytexi2latex
index cb446e81e73e65e22ff4416a1d2b700fe1914dec..2e8bae16b96bde332fb55cb79885170e174b9716 100755 (executable)
--- a/doc/scripts/mytexi2latex
+++ b/doc/scripts/mytexi2latex
@@ -172,6 +172,9 @@ while ($line = <FILE>) {
 multitable:
                 if ($line =~ s/\@end multitable/\\\\\n\\hline\n\\end{tabular}/g) {
                         $mode = pop(@stack);
+                } elsif ($line =~ s/\@itemize/\\begin{itemize}/g) {
+                        $mode = ITEMIZE;
+                        push(@stack, MULTITABLE);
                 } else {
                        chomp $line;
                        if ($line eq "") {