3 files changed, 212 insertions, 8 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 53a913ce6b03..34039ba361c7 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -3,12 +3,14 @@ ENV = SGML_CATALOG_FILES=$(docbookcatalog)
 XMLLINT = $(ENV) $(xmllint) $(xmlflags) --catalogs
 XSLTPROC = $(ENV) $(xsltproc) $(xmlflags) --catalogs \
  --param section.autolabel 1 \
- --param section.label.includes.component.label 1
+ --param section.label.includes.component.label 1 \
+ --param html.stylesheet \'style.css\'
 
 SOURCES = book.xml introduction.xml installation.xml \
  overview.xml \
  nix-store-reference.xml nix-instantiate-reference.xml \
- troubleshooting.xml bugs.xml
+ troubleshooting.xml bugs.xml \
+ style.css
 
 book.is-valid: $(SOURCES)
 	$(XMLLINT) --noout --valid book.xml
@@ -27,6 +29,7 @@ all-local: book.html
 install-data-local: book.html
 	$(INSTALL) -d $(datadir)/nix/manual
 	$(INSTALL_DATA) book.html $(datadir)/nix/manual
+	$(INSTALL_DATA) style.css $(datadir)/nix/manual
 
 EXTRA_DIST = $(SOURCES) book.html book.is-valid $(MANS) 
 
diff --git a/doc/manual/overview.xml b/doc/manual/overview.xml
index e207e649826d..85f164587790 100644
--- a/doc/manual/overview.xml
+++ b/doc/manual/overview.xml
@@ -265,8 +265,7 @@ derivation { <co id='ex-hello-nix-co-2' />
   };
   stdenv = stdenv; <co id='ex-hello-nix-co-7' />
   perl = perl;
-}
-        </programlisting>
+}</programlisting>
       </example>
 
       <para>
@@ -326,8 +325,7 @@ tar xvfz $src || exit 1
 cd hello-* || exit 1
 ./configure --prefix=$out || exit 1
 make || exit 1
-make install || exit 1
-        </programlisting>
+make install || exit 1</programlisting>
       </example>
 
     </sect2>
@@ -373,8 +371,7 @@ derivation {
   expat = expat;
   db4 = if localServer then db4 else null;
   swig = if swigBindings then swig else null;
-}
-        </programlisting>
+}</programlisting>
       </example>
 
       <para>
diff --git a/doc/manual/style.css b/doc/manual/style.css
new file mode 100644
index 000000000000..bf34c87e9f8a
--- /dev/null
+++ b/doc/manual/style.css
@@ -0,0 +1,204 @@
+/* Copied from http://bakefile.sourceforge.net/ and covered by the GNU
+   GPL. */
+
+
+/***************************************************************************
+                             Basic headers and text:
+ ***************************************************************************/
+
+body
+{
+    font-family: sans-serif;
+    background: white;
+  
+    margin: 2em 1em 2em 1em;
+}
+
+h1,h2,h3
+{
+    color: #005aa0;
+    text-align: left;
+}
+
+h1
+{
+    font-size: 185%;
+}
+
+h2
+{
+    font-size: 150%;
+}
+
+h3
+{
+    font-size: 120%;
+}
+
+
+
+/***************************************************************************
+                               Program listings:
+ ***************************************************************************/
+
+div.example
+{
+    border: 1px solid #6185a0;
+    padding: 6px 6px;
+    margin-left: 3em;
+    margin-right: 3em;
+    background: #eeeeee;
+}
+
+pre.programlisting
+{
+    color: #600000;
+    font-family: monospace;
+}
+
+
+/***************************************************************************
+                            Screen dumps:
+ ***************************************************************************/
+
+pre.screen
+{
+    border: 1px solid #6185a0;
+    padding: 6px 6px;
+    margin-left: 3em;
+    margin-right: 3em;
+    color: #600000;
+    background: #eeeeee;
+    font-family: monospace;
+    /* font-size: 90%; */
+}
+
+
+/***************************************************************************
+                               Notes, warnings etc:
+ ***************************************************************************/
+
+.note,.warning
+{
+    border: 1px solid #6185a0;
+    padding: 0px 36px;
+    margin-left: 2em;
+    margin-right: 2em;
+
+    background: #fffff5;
+    background-image: url(images/note.png);
+    background-position: center left;
+    background-repeat: no-repeat;
+}
+
+.warning
+{
+    background-image: url(images/warning.png);
+}
+
+div.note,div.warning
+{
+    font-style: italic;
+}
+
+div.note h3,div.warning h3
+{
+    color: red;
+    text-decoration: underline;
+}
+
+div.navfooter *
+{
+    font-size: 90%;
+}
+
+
+/***************************************************************************
+                        Links colors and highlighting: 
+ ***************************************************************************/
+
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a:hover { background: #ffffcd; }
+
+
+/***************************************************************************
+                              Table of contents:
+ ***************************************************************************/
+
+.toc
+{
+    font-size: 90%;
+}
+
+
+
+/***************************************************************************
+                               Special elements:
+ ***************************************************************************/
+
+tt
+{
+    color: #400000;
+}
+
+.term
+{
+    font-weight: bold;
+    
+}
+
+div.variablelist dd
+{
+    margin-bottom: 1em;
+}
+
+.default
+{
+    font-style: italic;
+}
+
+.availability
+{
+    font-style: italic;
+}
+
+.varname
+{
+    color: #400000;
+}
+
+
+div.informaltable table
+{
+  border: 1px solid #6185a0;
+  width: 100%;
+}
+
+div.informaltable td
+{
+  border: 0;
+  padding: 5px;
+}
+
+div.informaltable td.default
+{
+  text-align: right;
+}
+
+div.informaltable th
+{
+  text-align: left;
+  color: #005aa0;
+  border: 0;
+  padding: 5px;
+  background: #fffff5;
+  font-weight: normal;
+  font-style: italic;
+}
+
+td.varname, td.tagname, td.paramname
+{
+  font-weight: bold;
+  vertical-align: top;
+}