From 453675c5c113ac4ba91f28005b607671c0d66698 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Sep 2011 10:14:42 +0000
Subject: [PATCH] * Allow literal examples to be included in the manual.

svn path=/nixos/trunk/; revision=29025
---
 doc/manual/options-to-docbook.xsl | 14 +++++++++++---
 modules/misc/nixpkgs.nix          |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/manual/options-to-docbook.xsl b/doc/manual/options-to-docbook.xsl
index 828ca99ecd8..46e36b29289 100644
--- a/doc/manual/options-to-docbook.xsl
+++ b/doc/manual/options-to-docbook.xsl
@@ -52,12 +52,20 @@
                </para>
 
                <xsl:if test="attr[@name = 'example']">
+                 
                  <para>
                    <emphasis>Example:</emphasis>
                    <xsl:text> </xsl:text>
-                   <literal>
-                     <xsl:apply-templates select="attr[@name = 'example']" />
-                   </literal>
+                   <xsl:choose>
+                     <xsl:when test="attr[@name = 'example']/attrs[attr[@name = '_type' and string[@value = 'literalExample']]]">
+                       <programlisting><xsl:value-of select="attr[@name = 'example']/attrs/attr[@name = 'text']/string/@value" /></programlisting>
+                     </xsl:when>
+                     <xsl:otherwise>
+                       <literal>
+                         <xsl:apply-templates select="attr[@name = 'example']" />
+                       </literal>
+                     </xsl:otherwise>
+                   </xsl:choose>
                  </para>
                </xsl:if>
 
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index a3ceba9e727..78c52bca201 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -30,9 +30,9 @@ in
 {
   options = {
 
-    nixpkgs.config = pkgs.lib.mkOption {
+    nixpkgs.config = mkOption {
       default = {};
-      example =
+      example = literalExample
         ''
           { firefox.enableGeckoMediaPlayer = true;
             packageOverrides = pkgs: {
@@ -54,7 +54,7 @@ in
       '';
     };
 
-    nixpkgs.system = pkgs.lib.mkOption {
+    nixpkgs.system = mkOption {
       default = "";
       description = ''
         Specifies the Nix platform type for which NixOS should be built.