Merge branches 'fix-style' and 'master' into fix-style

svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
parent d745c21aab
commit 7aa27dfee2
19 changed files with 361 additions and 82 deletions
--- a/doc/manual/default.nix
+++ b/doc/manual/default.nix
@@ -38,6 +38,8 @@ let
        ${pkgs.docbook5_xsl}/xml/xsl/docbook/html/docbook.xsl \
        ./manual.xml
      cp ${./style.css} $out/style.css
+      ensureDir $out/nix-support
+      echo "doc manual $out" >> $out/nix-support/hydra-build-products
    '';
  };

--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -15,6 +15,7 @@

    <copyright>
      <year>2007</year>
+      <year>2008</year>
      <holder>Eelco Dolstra</holder>
    </copyright>