summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2019-05-27 22:34:42 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2019-05-27 22:56:40 +0200
commitc155923fc8bd68df7ece4eea9cf421fddbfa6ca4 (patch)
tree7edf474a31c12f0e019691cbe9eb3456f80ce8c9 /doc
parent56cce397ec8580cbc148d571cf3ab82c73069c99 (diff)
downloadgnutls-c155923fc8bd68df7ece4eea9cf421fddbfa6ca4.tar.gz
minor updates in the latex version of the manual [ci skip]
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/cha-crypto.texi6
-rw-r--r--doc/cha-gtls-app.texi3
-rw-r--r--doc/latex/Makefile.am5
-rw-r--r--doc/latex/cover.tex2
-rw-r--r--doc/latex/gnutls.tex2
-rwxr-xr-xdoc/scripts/mytexi2latex3
6 files changed, 15 insertions, 6 deletions
diff --git a/doc/cha-crypto.texi b/doc/cha-crypto.texi
index e097040fd6..fb01b2c37b 100644
--- 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 b304d67fb9..e08cbb24f1 100644
--- 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 2ae3dff025..7056d56858 100644
--- 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 d3de705435..26a4487d33 100644
--- 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 0d770d59d3..0a5d0bd995 100644
--- 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 cb446e81e7..2e8bae16b9 100755
--- 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 "") {