From c1f7622512185b5680c9a3dd5f2b42d353227525 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 May 2010 15:14:50 +0000
Subject: [PATCH] * Improve obsolete/deprecated option warnings.

svn path=/nixos/trunk/; revision=21653
---
 modules/rename.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index dbbc23dcfdf..19cf11b4fca 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -13,17 +13,17 @@ let
   obsolete = from: to: {
     name = "Obsolete name";
     msg.use = x:
-      builtins.trace "Option '${from}' is used instead of '${to}'." x;
+      builtins.trace "Obsolete option `${from}' is used instead of `${to}'." x;
     msg.define = x:
-      builtins.trace "Option '${from}' is defined instead of '${to}'." x;
+      builtins.trace "Obsolete option `${from}' is defined instead of `${to}'." x;
   };
 
   deprecated = from: to: {
     name = "Deprecated name";
     msg.use = x:
-      abort "Option '${from}' is used instead of '${to}'.";
+      abort "Deprecated option `${from}' is used instead of `${to}'.";
     msg.define = x:
-      abort "Option '${from}' is defined instead of '${to}'.";
+      abort "Deprecated option `${from}' is defined instead of `${to}'.";
   };
 
 
@@ -38,9 +38,9 @@ let
       setTo = setAttrByPath (splitString "." to);
       setFrom = setAttrByPath (splitString "." from);
       toOf = attrByPath (splitString "." to)
-        (abort "Renaming Error: option '${to}' does not exists.");
+        (abort "Renaming error: option `${to}' does not exists.");
       fromOf = attrByPath (splitString "." from)
-        (abort "Internal Error: option '${from}' should be declared.");
+        (abort "Internal error: option `${from}' should be declared.");
     in
       [{
         options = setFrom (mkOption {