From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 28 Jul 2010 13:02:11 +0000 (+0000)
Subject: Merged revisions 280058 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2534
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bac4255db542db8d9bd0f7f0a15482cabd5e0fe;p=thirdparty%2Fasterisk.git

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/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_crypto.c b/res/res_crypto.c
index e7793a6aa8..4886b4f1a5 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -276,7 +276,7 @@ static struct ast_key *try_load_key(const char *dir, const char *fname, int ifd,
 		}
 		/* 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 @@ static void crypto_load(int ifd, int ofd)
 	}
 
 	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 */