From 966f6e0fb061c9664769fec341f28949cc098b6f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Jan 2007 10:31:36 +0000
Subject: [PATCH] * More refactoring.

svn path=/nixos/trunk/; revision=7534
---
 README                                               | 8 ++++----
 {instances => configuration}/examples/basic.nix      | 0
 {instances => configuration}/examples/svn-server.nix | 0
 {instances => configuration}/rescue-cd.nix           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {instances => configuration}/examples/basic.nix (100%)
 rename {instances => configuration}/examples/svn-server.nix (100%)
 rename {instances => configuration}/rescue-cd.nix (98%)

diff --git a/README b/README
index 4409f77bd1d..406a95871a3 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@
 
 - Build the ISO image:
 
-  $ nix-build instances/rescue-cd.nix -A rescueCD
+  $ nix-build configuration/rescue-cd.nix -A rescueCD
 
   This gives you an image in result/iso/nixos.iso.
 
@@ -43,9 +43,9 @@
 - The installation is declarative; you need to make a description of
   the configuration that is to be built and activated.  The
   configuration is specified in a Nix expression.  See
-  instances/examples for example machine configurations.  You can copy
-  and edit one of those (e.g., instances/examples/basic.nix to
-  my-config.nix).  See configuration/options.nix for available
+  configuration/examples for example machine configurations.  You can
+  copy and edit one of those (e.g., configuration/examples/basic.nix
+  to my-config.nix).  See system/options.nix for available
   configuration settings.  The text editor "nano" is available.
 
   In particular you need to specify boot.rootDevice and
diff --git a/instances/examples/basic.nix b/configuration/examples/basic.nix
similarity index 100%
rename from instances/examples/basic.nix
rename to configuration/examples/basic.nix
diff --git a/instances/examples/svn-server.nix b/configuration/examples/svn-server.nix
similarity index 100%
rename from instances/examples/svn-server.nix
rename to configuration/examples/svn-server.nix
diff --git a/instances/rescue-cd.nix b/configuration/rescue-cd.nix
similarity index 98%
rename from instances/rescue-cd.nix
rename to configuration/rescue-cd.nix
index 8e201762b74..20284c0ac9b 100644
--- a/instances/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -19,7 +19,7 @@ rec {
   };
 
 
-  system = import ../configuration/system.nix {
+  system = import ../system/system.nix {
     inherit configuration;
     stage2Init = "/init";
   };