Merged revisions 321330 via svnmerge from

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

........
  r321330 | rmudgett | 2011-05-27 16:31:25 -0500 (Fri, 27 May 2011) | 8 lines
  
  The app_privacy args have undocumented "options" position, interferes with "context" position.
  
  * Add documention for unused "options" position to match existing code.
  The trunk(v1.10) version will remove the unused options position.
  
  (closes issue #19273)
  Reported by: mdavenport
........


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

CHANGES

@@ -134,6 +134,10 @@ 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 ----------------
 ------------------------------------------------------------------------------

apps/app_privacy.c

@@ -92,8 +92,10 @@ 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(options);
 		AST_APP_ARG(checkcontext);
+
+		/* This must be last in the list until we actually have some options again. :) */
+		AST_APP_ARG(options);
 	);
 
 	if (chan->caller.id.number.valid