documentation updates.

diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index ae2df5dbdf2fbc8a7e371af08025834270251d14..437c68d034436abd03174db2c0476250b3299324 100644 (file)
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -392,7 +392,7 @@ such as @acronym{Gnome Keyring}. The objects residing on such token can be
 certificates, public keys, private keys or even plain data or  secret keys. Of those
 certificates and public/private key pairs can be used with @acronym{GnuTLS}. Its
 main advantage is that it allows operations on private key objects such as decryption
-and signing without accessing the key itself.
+and signing without exposing the key.
 
 Moreover it can be used to allow all applications in the same operating system to access
 shared cryptographic keys and certificates in a uniform way, as in @ref{fig:pkcs11-vision}.
@@ -404,8 +404,8 @@ shared cryptographic keys and certificates in a uniform way, as in @ref{fig:pkcs
 
 @subsection Initialization
 To allow all the  @acronym{GnuTLS} applications to access @acronym{PKCS} #11 tokens
-it is advisable to use @code{/etc/pkcs11/modules/mymodule.conf}. This file has the following
-format:
+you can use a configuration per module, such as @code{/etc/pkcs11/modules/mymodule.conf}. 
+This file has the following format:
 
 @smallexample
 module: /usr/lib/opensc-pkcs11.so

diff --git a/doc/latex/macros.tex b/doc/latex/macros.tex
index f6ea4a38db23a10dfba3577bbd21c2f7250f21f6..0a53b47bf4c67d0dd0168e8a1bd15b13d99eaf66 100644 (file)
--- a/doc/latex/macros.tex
+++ b/doc/latex/macros.tex
@@ -63,13 +63,11 @@
 }
 
 \newcommand{\showfuncdesc}[1]{%
-%\fcolorbox{black}{light-gray}{
  \begin{minipage}[l]{\linewidth}
  \begin{framed}
   \texttt{
    \input{functions/#1}
   }
-% }
  \end{framed}
  \vspace{0.15cm}
  \end{minipage}
@@ -79,9 +77,7 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
    \showfunc{#1}
-  }
 % }
  \end{framed}
  \end{samepage}
@@ -91,10 +87,8 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
     \showfunc{#1}
     \showfunc{#2}
-  }
 % }
  \end{framed}
  \end{samepage}
@@ -104,11 +98,9 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
   \showfunc{#1}
   \showfunc{#2}
   \showfunc{#3}
-  }
 % }
  \end{framed}
  \end{samepage}
@@ -118,12 +110,10 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
   \showfunc{#1}
   \showfunc{#2}
   \showfunc{#3}
   \showfunc{#4}
-  }
 % }
  \end{framed}
  \end{samepage}
@@ -133,13 +123,11 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
   \showfunc{#1}
   \showfunc{#2}
   \showfunc{#3}
   \showfunc{#4}
   \showfunc{#5}
-  }
 % }
  \end{framed}
  \end{samepage}
@@ -149,14 +137,12 @@
 % \fcolorbox{black}{light-gray}{
  \begin{samepage}
  \begin{framed}
-  \texttt{
   \showfunc{#1}
   \showfunc{#2}
   \showfunc{#3}
   \showfunc{#4}
   \showfunc{#5}
   \showfunc{#6}
-  }
 % }
  \end{framed}
  \end{samepage}