Index: plugin.php
===================================================================
--- plugin.php	(revision 6278)
+++ plugin.php	(working copy)
@@ -7,19 +7,9 @@
  * The API callback examples reference functions, but can be methods of classes.
  * To hook methods, you'll need to pass an array one of two ways.
  *
- * For static methods (you won't have access to the <tt>$this</tt> variable in the
- * method):
- * <code>array('class_name', 'method_name');</code>
- *
- * The second method will need the reference to the object to have access to the
- * method.
- * <code>array(&$this, 'method_name');</code>
- * <code>
- * $obj = new myObject();
- * array(&$obj, 'method_name');
- * </code>
  * Any of the syntaxes explained in the PHP documentation for the
- * {@link http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback 'callback' type} are valid.
+ * {@link http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback 'callback'}
+ * type are valid.
  *
  * Also see the {@link http://codex.wordpress.org/Plugin_API Plugin API} for more information
  * and examples on how to use a lot of these functions.
@@ -30,7 +20,7 @@
  */
 
 /**
- * Hooks a function or method to a specific filter action.
+ * add_filter() - Hooks a function or method to a specific filter action.
  *
  * Filters are the hooks that WordPress launches to modify text of various types
  * before adding it to the database or sending it to the browser screen. Plugins
@@ -58,7 +48,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 0.71
  * @global array $wp_filter Stores all of the filters added in the form of
  *	wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
  * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, it doesn't need to run through that process.
@@ -79,7 +69,7 @@
 }
 
 /**
- * Call the functions added to a filter hook.
+ * apply_filters() - Call the functions added to a filter hook.
  *
  * The callback functions attached to filter hook <tt>$tag</tt> are invoked by
  * calling this function. This function can be used to create a new filter hook
@@ -91,13 +81,14 @@
  * function example_hook($string, $arg1, $arg2)
  * {
  *		//Do stuff
+ *		return $string;
  * }
  * $value = apply_filters('example_filter', 'filter me', 'arg1', 'arg2');
  * </code>
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 0.71
  * @global array $wp_filter Stores all of the filters
  * @global array $merge_filters Merges the filter hooks using this function.
  *
@@ -132,7 +123,7 @@
 }
 
 /**
- * Merge the filter functions of a specific filter hook with generic filter functions.
+ * merge_filters() - Merge the filter functions of a specific filter hook with generic filter functions.
  *
  * It is possible to defined generic filter functions using the filter hook
  * <em>all</e>. These functions are called for every filter tag. This function
@@ -164,7 +155,7 @@
 }
 
 /**
- * Removes a function from a specified filter hook.
+ * remove_filter() - Removes a function from a specified filter hook.
  *
  * This function removes a function attached to a specified filter hook. This
  * method can be used to remove default functions attached to a specific filter
@@ -176,7 +167,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 1.2
  *
  * @param string $tag The filter hook to which the function to be removed is hooked.
  * @param callback $function_to_remove The name of the function which should be removed.
@@ -196,7 +187,7 @@
 }
 
 /**
- * Hooks a function on to a specific action.
+ * add_action() - Hooks a function on to a specific action.
  *
  * Actions are the hooks that the WordPress core launches at specific points
  * during execution, or when specific events occur. Plugins can specify that
@@ -207,7 +198,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 1.2
  *
  * @param string $tag The name of the action to which the <tt>$function_to-add</tt> is hooked.
  * @param callback $function_to_add The name of the function you wish to be called.
@@ -219,7 +210,7 @@
 }
 
 /**
- * Execute functions hooked on a specific action hook.
+ * do_action() - Execute functions hooked on a specific action hook.
  *
  * This function invokes all functions attached to action hook <tt>$tag</tt>.
  * It is possible to create new action hooks by simply calling this function,
@@ -232,7 +223,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 1.2
  * @global array $wp_filter Stores all of the filters
  * @global array $wp_actions Increments the amount of times action was triggered.
  *
@@ -271,7 +262,7 @@
 }
 
 /**
- * Return the number times an action is fired.
+ * did_action() - Return the number times an action is fired.
  *
  * @package WordPress
  * @subpackage Plugin
@@ -291,7 +282,7 @@
 }
 
 /**
- * Execute functions hooked on a specific action hook, specifying arguments in an array.
+ * do_action_ref_array() - Execute functions hooked on a specific action hook, specifying arguments in an array.
  *
  * @see do_action() This function is identical, but the arguments passed to
  * the functions hooked to <tt>$tag</tt> are supplied using an array.
@@ -331,7 +322,7 @@
 }
 
 /**
- * Removes a function from a specified action hook.
+ * remove_action() - Removes a function from a specified action hook.
  *
  * This function removes a function attached to a specified action hook. This
  * method can be used to remove default functions attached to a specific filter
@@ -341,7 +332,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 1.2
  *
  * @param string $tag The action hook to which the function to be removed is hooked.
  * @param callback $function_to_remove The name of the function which should be removed.
@@ -358,7 +349,7 @@
 //
 
 /**
- * Gets the basename of a plugin.
+ * plugin_basename() - Gets the basename of a plugin.
  *
  * This method extract the name of a plugin from its filename.
  *
@@ -379,7 +370,7 @@
 }
 
 /**
- * Hook a function on a plugin activation action hook.
+ * register_activation_hook() - Hook a function on a plugin activation action hook.
  *
  * When a plugin is activated, the action 'activate_PLUGINNAME' hook is
  * activated. In the name of this hook, PLUGINNAME is replaced with the name of
@@ -392,7 +383,7 @@
  *
  * @package WordPress
  * @subpackage Plugin
- * @since 1.5
+ * @since 2.0
  *
  * @access private
  *
@@ -405,7 +396,7 @@
 }
 
 /**
- * Hook a function on a plugin deactivation action hook.
+ * register_deactivation_hook() - Hook a function on a plugin deactivation action hook.
  *
  * When a plugin is deactivated, the action 'deactivate_PLUGINNAME' hook is
  * deactivated. In the name of this hook, PLUGINNAME is replaced with the name of
@@ -431,7 +422,7 @@
 }
 
 /**
- * Build Unique ID for storage and retrieval
+ * _wp_filter_build_unique_id() - Build Unique ID for storage and retrieval
  *
  * The old way to serialize the callback caused issues and this function is the
  * solution. It works by checking for objects and creating an a new property in