[svn-commits] russell: trunk r280059 - in /trunk: ./ res/res_crypto.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jul 28 08:02:11 2010
New Revision: 280059

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280059
Log:
Merged revisions 280058 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280058 | russell | 2010-07-28 08:01:15 -0500 (Wed, 28 Jul 2010) | 2 lines
  
  s/init keys/keys init/
........

Modified:
    trunk/   (props changed)
    trunk/res/res_crypto.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jul 28 08:02:11 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815,279817,279850,279887,279916,279949,279953,280023,280058

Modified: trunk/res/res_crypto.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_crypto.c?view=diff&rev=280059&r1=280058&r2=280059
==============================================================================
--- trunk/res/res_crypto.c (original)
+++ trunk/res/res_crypto.c Wed Jul 28 08:02:11 2010
@@ -276,7 +276,7 @@
 		}
 		/* Keep it anyway */
 		key->delme = 0;
-		/* Print final notice about "init keys" when done */
+		/* Print final notice about "keys init" when done */
 		*not2 = 1;
 	}
 
@@ -505,7 +505,7 @@
 	}
 
 	if (note) {
-		ast_log(LOG_NOTICE, "Please run the command 'init keys' to enter the passcodes for the keys\n");
+		ast_log(LOG_NOTICE, "Please run the command 'keys init' to enter the passcodes for the keys\n");
 	}
 
 	/* Delete any keys that are no longer present */