[svn-commits] seanbright: trunk r409780 - in /trunk: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Mar  5 06:06:48 2014
New Revision: 409780

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409780
Log:
Fix references to 'keys' CLI commands in astgenkey
........

Merged revisions 409777 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 409778 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 409779 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/astgenkey
    trunk/contrib/scripts/astgenkey.8

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/contrib/scripts/astgenkey
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/astgenkey?view=diff&rev=409780&r1=409779&r2=409780
==============================================================================
--- trunk/contrib/scripts/astgenkey (original)
+++ trunk/contrib/scripts/astgenkey Wed Mar  5 06:06:48 2014
@@ -32,7 +32,7 @@
 	echo "need to be moved to /var/lib/asterisk/keys if you want"
 	echo "to use them, and any private keys (.key files) will"
 	echo "need to be initialized at runtime either by running"
-	echo "Asterisk with the '-i' option, or with the 'init keys'"
+	echo "Asterisk with the '-i' option, or with the 'keys init'"
 	echo "command once Asterisk is running."
 	echo ""
 	echo "Press ENTER to continue or ^C to cancel."

Modified: trunk/contrib/scripts/astgenkey.8
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/astgenkey.8?view=diff&rev=409780&r1=409779&r2=409780
==============================================================================
--- trunk/contrib/scripts/astgenkey.8 (original)
+++ trunk/contrib/scripts/astgenkey.8 Wed Mar  5 06:06:48 2014
@@ -94,7 +94,7 @@
 To see the currently-installed keys from the asterisk CLI, use the command
 
 .RS
-show keys
+keys show
 .RE
 
 .SH OPTIONS