doc: fixes in sectioning for p11tool and tpmtool invocation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55970959f9643eee9f4177747aebbfaa37377fa1..50bd980fe1be69f54f719f7fbe3e60e94760799a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -117,7 +117,7 @@ invoke-p11tool.texi: $(top_srcdir)/src/p11tool-args.def invoke-psktool.texi
        fi; \
        $(srcdir)/scripts/cleanup-autogen.pl < $@ > $@.tmp && \
        rm -f $@ && \
-       $(SED) -e 's/@subheading/@subsubheading/g' \
+       $(SED) -e 's/@subheading/@subsection/g' \
            -e 's/@section/@subsection/g' $@.tmp > $@ && \
        rm -f $@.tmp
 
@@ -128,7 +128,7 @@ invoke-tpmtool.texi: $(top_srcdir)/src/tpmtool-args.def invoke-p11tool.texi
        fi; \
        $(srcdir)/scripts/cleanup-autogen.pl < $@ > $@.tmp && \
        rm -f $@ && \
-       $(SED) -e 's/@subheading/@subsubheading/g' \
+       $(SED) -e 's/@subheading/@subsection/g' \
            -e 's/@section/@subsection/g' $@.tmp > $@ && \
        rm -f $@.tmp
 

diff --git a/doc/cha-tokens.texi b/doc/cha-tokens.texi
index 69b3688cb77686f19c4784bc53318b35f0ffae89..b85d521b82f56f4a328a6520cd58e6e787581f87 100644 (file)
--- a/doc/cha-tokens.texi
+++ b/doc/cha-tokens.texi
@@ -216,7 +216,7 @@ storage module@footnote{@url{http://p11-glue.freedesktop.org/trust-module.html}}
 * Reading objects::
 * Writing objects::
 * Using a PKCS11 token with TLS::
-* p11tool Invocation::             Invoking p11tool
+* p11tool Invocation::
 @end menu
 
 @node PKCS11 Initialization
@@ -414,7 +414,7 @@ In GnuTLS the TPM functionality is available in @code{gnutls/tpm.h}.
 * Keys in TPM::
 * Key generation::
 * Using keys::
-* tpmtool Invocation::            Invoking tpmtool
+* tpmtool Invocation::
 @end menu
 
 @node Keys in TPM

diff --git a/doc/latex/cover.tex b/doc/latex/cover.tex
index 8c00edad55e175c0611b4cbc8dffb9a3b0338a6d..73f8aaad7003ca1688a95901c9aef51e6ca9896c 100644 (file)
--- a/doc/latex/cover.tex
+++ b/doc/latex/cover.tex
@@ -11,8 +11,8 @@ to Patrick Pelletier and Andreas Metzler.
 
 
 \begin{flushleft}
-Copyright \copyright{} 2001-2013 Free Software Foundation, Inc.\\
-Copyright \copyright{} 2001-2013 Nikos Mavrogiannopoulos
+Copyright \copyright{} 2001-2014 Free Software Foundation, Inc.\\
+Copyright \copyright{} 2001-2014 Nikos Mavrogiannopoulos
 \end{flushleft}
 
 \begin{flushleft}