summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/p11-kit-config.xml10
-rw-r--r--doc/p11-kit-docs.sgml12
-rw-r--r--doc/p11-kit-sharing.xml (renamed from doc/p11-kit-multiple-problem.xml)0
-rw-r--r--doc/style.css17
5 files changed, 25 insertions, 16 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b18d86a..fe65836 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -50,7 +50,7 @@ HTML_IMAGES=
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=p11-kit-config.xml p11-kit-multiple-problem.xml
+content_files=p11-kit-config.xml p11-kit-sharing.xml
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files
diff --git a/doc/p11-kit-config.xml b/doc/p11-kit-config.xml
index 851f5dc..2284265 100644
--- a/doc/p11-kit-config.xml
+++ b/doc/p11-kit-config.xml
@@ -35,7 +35,7 @@
underscore.</para>
<para>The value is specified after the name on the same line, separated
- from it by a a <literal>:</literal> colon. White space between the
+ from it by a <literal>:</literal> (colon). White space between the
name and value is ignored.</para>
<para>Blank lines are ignored. White space at the beginning or end of
@@ -50,8 +50,7 @@
# Here is a comment
setting.2: A long value with text.
- x-custom : text
- </programlisting>
+ x-custom : text</programlisting>
</section>
@@ -113,7 +112,10 @@
user's home directory.</para>
<para>
- The module config files are located XXX>
+ The module config files are located in the
+ <literal>/etc/pkcs11/modules</literal> directory, with one configuration
+ file per module. In addition the <literal>~/.pkcs11/modules</literal>
+ directory can be used for modules installed by the user.
</para>
</section>
</chapter>
diff --git a/doc/p11-kit-docs.sgml b/doc/p11-kit-docs.sgml
index d00cc36..6a5f467 100644
--- a/doc/p11-kit-docs.sgml
+++ b/doc/p11-kit-docs.sgml
@@ -11,14 +11,18 @@
<releaseinfo>for p11-kit &version;</releaseinfo>
</bookinfo>
+ <xi:include href="p11-kit-config.xml"/>
+ <xi:include href="p11-kit-sharing.xml"/>
+
<chapter>
<title>Reference</title>
<xi:include href="xml/p11-kit.xml"/>
<xi:include href="xml/p11-kit-uri.xml"/>
<xi:include href="xml/p11-kit-util.xml"/>
- <index id="api-index-full">
- <title>API Index</title>
- <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
- </index>
</chapter>
+
+ <index id="api-index-full">
+ <title>API Index</title>
+ <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+ </index>
</book>
diff --git a/doc/p11-kit-multiple-problem.xml b/doc/p11-kit-sharing.xml
index a1c19a7..a1c19a7 100644
--- a/doc/p11-kit-multiple-problem.xml
+++ b/doc/p11-kit-sharing.xml
diff --git a/doc/style.css b/doc/style.css
index 8015165..67ffff3 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -40,22 +40,25 @@ DIV.book,
DIV.refentry,
DIV.chapter,
DIV.index,
-DIV.footer {
+DIV.footer,
+DIV.section {
font-family: Verdana, Arial, 'Bitstream Vera Sans', Helvetica, sans-serif;
font-size: 9.5pt;
line-height: 150%;
- margin-right: 1em;
}
-DIV.book,
-DIV.footer {
+BODY > DIV.book,
+BODY > DIV.footer {
margin-left: 1em;
+ margin-right: 1em;
}
-DIV.refentry,
-DIV.chapter,
-DIV.index {
+BODY > DIV.refentry,
+BODY > DIV.chapter,
+BODY > DIV.index,
+BODY > DIV.section {
margin-left: 3em;
+ margin-right: 1em;
}
DIV.variablelist TABLE {