Author: eelco Date: Fri Sep 9 11:06:28 2011 New Revision: 29124 URL: https://ssl.nixos.org/websvn/nix/?rev=29124&sc=1
Log: Modified: homepage/trunk/nix/index.tt homepage/trunk/nixos/index.tt Modified: homepage/trunk/nix/index.tt ============================================================================== --- homepage/trunk/nix/index.tt Fri Sep 9 09:55:49 2011 (r29123) +++ homepage/trunk/nix/index.tt Fri Sep 9 11:06:28 2011 (r29124) @@ -2,11 +2,7 @@ <h1>About Nix</h1> -<p>Nix is a <em>purely functional package manager</em>, released under - the terms of - the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html";>GNU - LGPLv2.1 or (at your option) any later version</a>. <em>Purely - functional</em> means +<p>Nix is a <em>purely functional package manager</em>. This means that it treats packages like values in purely functional programming languages such as Haskell — they are built by functions that don’t have side-effects, and they never change after they have been built. @@ -218,4 +214,11 @@ more…</a></p> +<h3>License</h3> + +<p>Nix is released under the terms of the <a +href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html";>GNU +LGPLv2.1 or (at your option) any later version</a>.</p> + + [% END %] Modified: homepage/trunk/nixos/index.tt ============================================================================== --- homepage/trunk/nixos/index.tt Fri Sep 9 09:55:49 2011 (r29123) +++ homepage/trunk/nixos/index.tt Fri Sep 9 11:06:28 2011 (r29124) @@ -5,9 +5,7 @@ <p><a href="screenshots/nixos-kde42-1.png"><img class="inlineNoBorder" src="screenshots/nixos-kde42-1-small.png" alt="NixOS screenshot" -/></a>NixOS is an experimental GNU/Linux distribution released under a - <a href="http://svn.nixos.org/repos/nix/nixos/trunk/COPYING";>permissive - MIT/X11 license</a>. NixOS aims to improve +/></a>NixOS is an experimental GNU/Linux distribution that aims to improve the state of the art in system configuration management. In existing distributions, actions such as upgrades are dangerous: upgrading a package can cause other packages to break, upgrading an entire system @@ -257,5 +255,9 @@ </ul> +<p>NixOS is released under a <a +href="http://svn.nixos.org/repos/nix/nixos/trunk/COPYING";>permissive +MIT/X11 license</a>.</p> + [% END %] _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
