Tweak style of the manual

 * Unindent the main headings
 * Don't wrap options
 * Better spacing in table of contents
 * Don't have line numbers on code examples

4 files changed, 27 insertions, 7 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 219b2d8..1846993 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -64,7 +64,10 @@ 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-sharing.xml p11-kit-devel.xml
+content_files=p11-kit-config.xml p11-kit-sharing.xml \
+	p11-kit-devel.xml \
+	p11-kit.xml \
+	$(NULL)
 
 # 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-devel.xml b/doc/p11-kit-devel.xml
index aaa6671..f2a1f58 100644
--- a/doc/p11-kit-devel.xml
+++ b/doc/p11-kit-devel.xml
@@ -80,25 +80,21 @@ $ <command>pkg-config p11-kit-1 --variable p11_module_path</command>
 			libraries on multiple platforms. The normal sequence for compiling and
 			installing the p11-kit library is thus:</para>
 
-			<informalexample>
 <programlisting>
 $ ./configure --prefix=/path/to/prefix ...
 $ make
 $ make install
 </programlisting>
-			</informalexample>
 
 			<para>If you've checked out the source code from git, then the
 			<command>configure</command> script does not yet exist. So use
 			the following instead:</para>
 
-			<informalexample>
 <programlisting>
 $ ./autogen.sh --prefix=/path/to/prefix ...
 $ make
 $ make install
 </programlisting>
-			</informalexample>
 
 			<para>The standard options provided by GNU autoconf may be passed to the configure
 			script. Please see the autoconf documentation or run <literal>./configure --help</literal>
diff --git a/doc/p11-kit.xml b/doc/p11-kit.xml
index 3bc9d9f..b885dda 100644
--- a/doc/p11-kit.xml
+++ b/doc/p11-kit.xml
@@ -63,11 +63,9 @@
 
 	<para>List system configured PKCS#11 modules.</para>
 
-	<informalexample>
 <programlisting>
 $ p11-kit list-modules
 </programlisting>
-	</informalexample>
 
 	<para>The modules, information about them and the tokens present in
 	the PKCS#11 modules will be displayed.</para>
diff --git a/doc/style.css b/doc/style.css
index a4aa19e..e70190a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -72,6 +72,12 @@ DIV.refsynopsisdiv {
 	margin-bottom: 3em !important;
 }
 
+H1 {
+	position: relative;
+	left: -1em;
+	font-weight: normal !important;
+}
+
 H2 {
 	position: relative;
 	left: -1em;
@@ -83,3 +89,20 @@ H3 {
 	left: -1em;
 	font-weight: normal !important;
 }
+
+CODE.option {
+	white-space: nowrap;
+}
+
+DIV.toc DL {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+DIV.toc > DL > DT {
+	margin-top: 1em;
+}
+
+DIV.toc DT {
+	margin-bottom: 0.3em;
+}