Add display of declaration and definition locations.

svn path=/nixos/trunk/; revision=17254

doc/manual/default.nix

@@ -1,4 +1,7 @@
-{ pkgs, options }:
+{ pkgs, options
+# revision can have multiple values: local, HEAD or any revision number.
+, revision ? "HEAD"
+}:
 
 let
   # To prevent infinite recursion, remove system.path from the
@@ -33,7 +36,7 @@ let
 
     buildCommand = ''
       
-      ln -s $sources/*.xml .
+      ln -s $sources/*.xml . # */
       ln -s ${optionsDocBook} options-db.xml
 
       dst=$out/share/doc/nixos

doc/manual/options-to-docbook.xsl

@@ -59,6 +59,20 @@
                  </para>
                </xsl:if>
 
+               <xsl:if test="count(attr[@name = 'declarations']/list/*) != 0">
+                 <para>
+                   <emphasis>Declared by:</emphasis>
+                   <xsl:apply-templates select="attr[@name = 'declarations']" />
+                 </para>
+               </xsl:if>
+
+               <xsl:if test="count(attr[@name = 'definitions']/list/*) != 0">
+                 <para>
+                   <emphasis>Defined by:</emphasis>
+                   <xsl:apply-templates select="attr[@name = 'definitions']" />
+                 </para>
+               </xsl:if>
+               
              </listitem>
 
           </varlistentry>