From 9ef07d859b23840e1a5d7d7125a6982720afa391 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Nov 2013 16:44:03 +0100
Subject: [PATCH] Include the NixOS version in the manual

In particular, this will make it clear what version of the manual is
shown at http://nixos.org/nixos/manual/.
---
 nixos/doc/manual/default.nix                 | 5 ++---
 nixos/doc/manual/manual.xml                  | 1 +
 nixos/modules/services/misc/nixos-manual.nix | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index db3245fcc07..6d5039e8177 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,6 +1,4 @@
-{ pkgs, options
-, revision ? "master"
-}:
+{ pkgs, options, version, revision }:
 
 with pkgs.lib;
 
@@ -60,6 +58,7 @@ in rec {
     buildCommand = ''
       ln -s $sources/*.xml . # */
       ln -s ${optionsDocBook} options-db.xml
+      echo "${version}" > version
 
       # Check the validity of the manual sources.
       xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index dfbd865b505..6e13281cbd9 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -5,6 +5,7 @@
   <info>
 
     <title>NixOS Manual</title>
+    <subtitle>Version <xi:include href="version" parse="text" /></subtitle>
 
     <author>
       <personname>
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 885b8fa2d0c..1a8b85db329 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -23,6 +23,7 @@ let
 
   manual = import ../../../doc/manual {
     inherit pkgs;
+    version = config.system.nixosVersion;
     revision = config.system.nixosRevision;
     options = eval.options;
   };