Merged revisions 321337 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

Also revert -r321331 and -r321332.

........
  r321337 | rmudgett | 2011-05-27 17:06:43 -0500 (Fri, 27 May 2011) | 7 lines
  
  The app_privacy args have undocumented "options" position, interferes with "context" position.
  
  * Add documention for unused "options" position to match existing code.
  
  (closes issue #19273)
  Reported by: mdavenport
........


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

CHANGES

@@ -134,10 +134,6 @@ pbx_lua
    stopped and restarted using the autoservice_stop() and autoservice_start()
    functions.
 
-PrivacyManager
---------------------------
- * Removed unused options position since there are no more options defined.
-
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
 ------------------------------------------------------------------------------

UPGRADE.txt

@@ -50,8 +50,5 @@ pbx_lua:
  - the autoservice now defaults to being on by default
  - autoservice_start() and autoservice_start() no longer return a value.
 
-PrivacyManager:
- - Removed unused options position since there are no more options defined.
-
 ===========================================================
 ===========================================================

apps/app_privacy.c

@@ -53,6 +53,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			<parameter name="minlength">
 				<para>Minimum allowable digits in the input callerid number. Defaults to <literal>10</literal>.</para>
 			</parameter>
+			<parameter name="options">
+				<para>Position reserved for options.</para>
+			</parameter>
 			<parameter name="context">
 				<para>Context to check the given callerid against patterns.</para>
 			</parameter>
@@ -92,10 +95,8 @@ static int privacy_exec(struct ast_channel *chan, const char *data)
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(maxretries);
 		AST_APP_ARG(minlength);
-		AST_APP_ARG(checkcontext);
-
-		/* This must be last in the list until we actually have some options again. :) */
 		AST_APP_ARG(options);
+		AST_APP_ARG(checkcontext);
 	);
 
 	if (chan->caller.id.number.valid