Manual: Render multi-line strings properly

4 files changed, 28 insertions, 14 deletions

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 02524d8f9814..f4bdc6288b10 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -40,7 +40,7 @@
                  <para>
                    <emphasis>Default:</emphasis>
                    <xsl:text> </xsl:text>
-                   <literal><xsl:apply-templates select="attr[@name = 'default']" /></literal>
+                   <xsl:apply-templates select="attr[@name = 'default']" mode="top" />
                  </para>
                </xsl:if>
 
@@ -53,7 +53,7 @@
                        <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:apply-templates select="attr[@name = 'example']" mode="top" />
                      </xsl:otherwise>
                    </xsl:choose>
                  </para>
@@ -84,6 +84,20 @@
   </xsl:template>
 
 
+  <xsl:template match="*" mode="top">
+    <xsl:choose>
+      <xsl:when test="string[contains(@value, '&#010;')]">
+<programlisting>
+<xsl:text>''
+</xsl:text><xsl:value-of select='str:replace(string/@value, "${", "&apos;&apos;${")' /><xsl:text>''</xsl:text></programlisting>
+      </xsl:when>
+      <xsl:otherwise>
+        <literal><xsl:apply-templates /></literal>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
   <xsl:template match="null">
     <xsl:text>null</xsl:text>
   </xsl:template>
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 441b8606b01f..6971fe496b22 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -99,10 +99,10 @@ in
 
       extraOptions = mkOption {
         default = "";
-        example = "
+        example = ''
           gc-keep-outputs = true
           gc-keep-derivations = true
-        ";
+        '';
         description = "Additional text appended to <filename>nix.conf</filename>.";
       };
 
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 43e0843cb971..5b2058e4e129 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -15,7 +15,7 @@ let
       authoritative;
       ddns-update-style ad-hoc;
       log-facility local1; # see dhcpd.nix
-      
+
       ${cfg.extraConfig}
 
       ${pkgs.lib.concatMapStrings
@@ -30,13 +30,13 @@ let
     '';
 
 in
-  
+
 {
 
   ###### interface
 
   options = {
-  
+
     services.dhcpd = {
 
       enable = mkOption {
@@ -48,16 +48,16 @@ in
 
       extraConfig = mkOption {
         default = "";
-        example = "
+        example = ''
           option subnet-mask 255.255.255.0;
           option broadcast-address 192.168.1.255;
           option routers 192.168.1.5;
           option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1;
-          option domain-name \"example.org\";
+          option domain-name "example.org";
           subnet 192.168.1.0 netmask 255.255.255.0 {
             range 192.168.1.100 192.168.1.200;
           }
-        ";
+        '';
         description = "
           Extra text to be appended to the DHCP server configuration
           file.  Currently, you almost certainly need to specify
@@ -100,9 +100,9 @@ in
       };
 
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -127,5 +127,5 @@ in
       };
 
   };
-  
+
 }
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index d16142a5fdf3..5884e9aa31c8 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -74,7 +74,7 @@ let cfg = config.services.xserver.synaptics; in
         example = ''
           Option "RTCornerButton" "2"
           Option "RBCornerButton" "3"
-		'';
+        '';
         description = ''
           Additional options for synaptics touchpad driver.
         '';