Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 18055)
+++ wp-includes/post-template.php	(working copy)
@@ -579,9 +579,6 @@
 
 /**
  * Page Template Functions for usage in Themes
- *
- * @package WordPress
- * @subpackage Template
  */
 
 /**
@@ -1255,8 +1252,6 @@
 /**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses date_i18n()
@@ -1306,8 +1301,6 @@
  *   (int)    left   : what revision is currently being diffed against right -
  *                     used in form-table format.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses wp_get_post_revisions()
Index: wp-includes/plugin.php
===================================================================
--- wp-includes/plugin.php	(revision 18055)
+++ wp-includes/plugin.php	(working copy)
@@ -49,8 +49,6 @@
  * is even a string. It is up to you to take care and this is done for
  * optimization purposes, so everything is as quick as possible.
  *
- * @package WordPress
- * @subpackage Plugin
  * @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)']']
@@ -74,8 +72,6 @@
 /**
  * Check if any filter has been registered for a hook.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5
  * @global array $wp_filter Stores all of the filters
  *
@@ -119,8 +115,6 @@
  * $value = apply_filters('example_filter', 'filter me', 'arg1', 'arg2');
  * </code>
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 0.71
  * @global array $wp_filter Stores all of the filters
  * @global array $merged_filters Merges the filter hooks using this function.
@@ -183,8 +177,6 @@
  * @see apply_filters() This function is identical, but the arguments passed to the
  * functions hooked to <tt>$tag</tt> are supplied using an array.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 3.0.0
  * @global array $wp_filter Stores all of the filters
  * @global array $merged_filters Merges the filter hooks using this function.
@@ -244,8 +236,6 @@
  * when the hook was added. This goes for both filters and actions. No warning
  * will be given on removal failure.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 1.2
  *
  * @param string $tag The filter hook to which the function to be removed is hooked.
@@ -297,8 +287,6 @@
 /**
  * Retrieve the name of the current filter or action.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5
  *
  * @return string Hook name of the current filter or action.
@@ -319,8 +307,6 @@
  *
  * @uses add_filter() Adds an action. Parameter list and functionality are the same.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 1.2
  *
  * @param string $tag The name of the action to which the $function_to_add is hooked.
@@ -346,8 +332,6 @@
  * @see apply_filters() This function works similar with the exception that
  * nothing is returned and only the functions or methods are called.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 1.2
  * @global array $wp_filter Stores all of the filters
  * @global array $wp_actions Increments the amount of times action was triggered.
@@ -412,8 +396,6 @@
 /**
  * Retrieve the number times an action is fired.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.1
  * @global array $wp_actions Increments the amount of times action was triggered.
  *
@@ -435,8 +417,6 @@
  * @see do_action() This function is identical, but the arguments passed to the
  * functions hooked to <tt>$tag</tt> are supplied using an array.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.1
  * @global array $wp_filter Stores all of the filters
  * @global array $wp_actions Increments the amount of times action was triggered.
@@ -493,8 +473,6 @@
 /**
  * Check if any action has been registered for a hook.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5
  * @see has_filter() has_action() is an alias of has_filter().
  *
@@ -513,8 +491,6 @@
  * method can be used to remove default functions attached to a specific filter
  * hook and possibly replace them with a substitute.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 1.2
  *
  * @param string $tag The action hook to which the function to be removed is hooked.
@@ -549,8 +525,6 @@
  *
  * This method extracts the name of a plugin from its filename.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 1.5
  *
  * @access private
@@ -573,8 +547,7 @@
 
 /**
  * Gets the filesystem directory path (with trailing slash) for the plugin __FILE__ passed in
- * @package WordPress
- * @subpackage Plugin
+ *
  * @since 2.8
  *
  * @param string $file The filename of the plugin (__FILE__)
@@ -586,8 +559,7 @@
 
 /**
  * Gets the URL directory path (with trailing slash) for the plugin __FILE__ passed in
- * @package WordPress
- * @subpackage Plugin
+ *
  * @since 2.8
  *
  * @param string $file The filename of the plugin (__FILE__)
@@ -609,8 +581,6 @@
  * wp-content/plugin/sample.php the name of this hook will be
  * 'activate_sample.php'.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.0
  *
  * @param string $file The filename of the plugin including the path.
@@ -634,8 +604,6 @@
  * wp-content/plugin/sample.php the name of this hook will be
  * 'activate_sample.php'.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.0
  *
  * @param string $file The filename of the plugin including the path.
@@ -696,8 +664,6 @@
  * functions. This function does not check for the existence of the all hook, so
  * it will fail unless the all hook exists prior to this function call.
  *
- * @package WordPress
- * @subpackage Plugin
  * @since 2.5
  * @access private
  *
@@ -735,8 +701,6 @@
  * Functions and static method callbacks are just returned as strings and
  * shouldn't have any speed penalty.
  *
- * @package WordPress
- * @subpackage Plugin
  * @access private
  * @since 2.2.3
  * @link http://trac.wordpress.org/ticket/3875
Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 18055)
+++ wp-includes/taxonomy.php	(working copy)
@@ -104,8 +104,6 @@
 /**
  * Get a list of registered taxonomy objects.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  * @uses $wp_taxonomies
  * @see register_taxonomy
@@ -134,8 +132,6 @@
  * <code><?php $taxonomies = get_object_taxonomies('post'); ?></code> Should
  * result in <code>Array('category', 'post_tag')</code>
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wp_taxonomies
@@ -174,8 +170,6 @@
  * The get_taxonomy function will first check that the parameter string given
  * is a taxonomy object and if it is, it will return it.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wp_taxonomies
@@ -198,8 +192,6 @@
  *
  * Formerly is_taxonomy(), introduced in 2.3.0.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  *
  * @uses $wp_taxonomies
@@ -221,8 +213,6 @@
  *
  * A false return value might also mean that the taxonomy does not exist.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses taxonomy_exists() Checks whether taxonomy exists
@@ -280,8 +270,6 @@
  *
  * labels - An array of labels for this taxonomy. You can see accepted values in {@link get_taxonomy_labels()}. By default tag labels are used for non-hierarchical types and category labels for hierarchical ones.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wp_taxonomies Inserts new taxonomy object into the list
  * @uses $wp_rewrite Adds rewrite tags and permastructs
@@ -419,8 +407,6 @@
 /**
  * Add an already registered taxonomy to an object type.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  * @uses $wp_taxonomies Modifies taxonomy object
  *
@@ -462,8 +448,6 @@
  * using PHP sort family functions or using the database by using $args with
  * either ASC or DESC array. The value should be in the key named 'order'.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -528,6 +512,8 @@
 /**
  * Container class for a multiple taxonomy query.
  *
+ * @package WordPress
+ * @subpackage Taxonomy
  * @since 3.1.0
  */
 class WP_Tax_Query {
@@ -814,8 +800,6 @@
  * example, if 'category', it would be 'get_category' as the filter name. Useful
  * for custom taxonomies or plugging into default taxonomies.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -887,8 +871,6 @@
  * If $value does not exist, the return value will be false. If $taxonomy exists
  * and $field and $value combinations exist, the Term will be returned.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -953,8 +935,6 @@
  *
  * Will return an empty array if $term does not exist in $taxonomy.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -993,8 +973,6 @@
  * reasons and for simplicity of usage. See sanitize_term_field() for more
  * information.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term_field() Passes the return value in sanitize_term_field on success.
@@ -1026,8 +1004,6 @@
  * Return value is sanitize_term() and usage is for sanitizing the term for
  * editing. Function is for contextual and simplicity.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term() Passes the return value on success
@@ -1129,8 +1105,6 @@
  * The 'parent' argument is different from 'child_of' in that a term X is considered a 'parent'
  * of term Y only if term X is the father of term Y, not its grandfather or great-grandfather, etc.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1420,8 +1394,6 @@
  *
  * Formerly is_term(), introduced in 2.3.0.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 3.0.0
  *
  * @uses $wpdb
@@ -1489,8 +1461,6 @@
  *
  * The $term is expected to be either an array or an object.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses sanitize_term_field Used to sanitize all fields in a term
@@ -1544,8 +1514,6 @@
  * without creating your own filter function. Simply create a function that
  * hooks into the filter you need.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1603,8 +1571,6 @@
  *
  * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses get_terms()
@@ -1636,8 +1602,6 @@
  * a particular taxonomy or taxonomies. Does not remove the term or
  * taxonomy itself.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -1673,8 +1637,7 @@
  *
  * The $args 'force_default' will force the term supplied as default to be
  * assigned even if the object was not going to be termless
- * @package WordPress
- * @subpackage Taxonomy
+ *
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -1801,8 +1764,6 @@
  * terms objects will be returned. If either 'ids' or 'names' is used, then an
  * array of all matching term ids or term names will be returned respectively.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -1936,8 +1897,6 @@
  * second check succeeds, the term will be inserted and the term id will be
  * given.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2070,8 +2029,6 @@
  * A term has no meaning until it is given context by defining which taxonomy it
  * exists under.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2168,8 +2125,6 @@
  *
  * The only purpose for $term is for appending a parent, if one exists.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2241,8 +2196,6 @@
  * For what can be overrode in $args, check the term scheme can contain and stay
  * away from the term keys.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses $wpdb
@@ -2376,8 +2329,6 @@
  * The default action is to count what the amount of terms have the relationship
  * of term ID. Once that is done, then update the database.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2456,8 +2407,6 @@
  * term IDs have to exist within the taxonomy $object_type for the deletion to
  * take place.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @see get_object_taxonomies() for more on $object_type
@@ -2482,8 +2431,6 @@
 /**
  * Will remove all of the term ids from the cache.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses $wpdb
  *
@@ -2543,8 +2490,6 @@
 /**
  * Retrieves the taxonomy relationship to the term object id.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @uses wp_cache_get() Retrieves taxonomy relationship from cache
@@ -2572,8 +2517,6 @@
  * lot of terms that exist in a lot of taxonomies. The amount of time increases
  * for each term and it also increases for each taxonomy the term belongs to.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  * @uses wp_get_object_terms() Used to get terms from the database to update
  *
@@ -2632,8 +2575,6 @@
 /**
  * Updates Terms to Taxonomy in cache.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @since 2.3.0
  *
  * @param array $terms List of Term objects to change
@@ -2657,8 +2598,6 @@
 /**
  * Retrieves children of taxonomy as Term IDs.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  *
@@ -2693,8 +2632,6 @@
  * If $terms is an array of objects, then _get_term_children returns an array of objects.
  * If $terms is an array of IDs, then _get_term_children returns an array of IDs.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  *
@@ -2750,8 +2687,6 @@
  * Recalculates term counts by including items from child terms. Assumes all
  * relevant children are already in the $terms argument.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  * @uses $wpdb
@@ -2816,8 +2751,6 @@
  * Private function for the default callback for post_tag and category
  * taxonomies.
  *
- * @package WordPress
- * @subpackage Taxonomy
  * @access private
  * @since 2.3.0
  * @uses $wpdb
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 18055)
+++ wp-includes/post.php	(working copy)
@@ -633,8 +633,6 @@
  *
  * Arguments prefixed with an _underscore shouldn't be used by plugins and themes.
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses Inserts new post status object into the list
  *
@@ -699,8 +697,6 @@
 /**
  * Retrieve a post status object by name
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses
  * @see register_post_status
@@ -721,8 +717,6 @@
 /**
  * Get a list of all registered post status objects.
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_statuses
  * @see register_post_status
@@ -801,8 +795,6 @@
 /**
  * Retrieve a post type object by name
  *
- * @package WordPress
- * @subpackage Post
  * @since 3.0.0
  * @uses $wp_post_types
  * @see register_post_type
@@ -823,8 +815,6 @@
 /**
  * Get a list of all registered post type objects.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.9.0
  * @uses $wp_post_types
  * @see register_post_type
@@ -2235,8 +2225,6 @@
  * is set to 'all'. There are other defaults that can be overridden in
  * {@link wp_get_object_terms()}.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.3.0
  *
  * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here
@@ -2256,8 +2244,6 @@
  * is set to 'all'. There are other defaults that can be overridden in
  * {@link wp_get_object_terms()}.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.8.0
  *
  * @uses wp_get_object_terms() Gets the tags for returning. Args can be found here
@@ -2842,8 +2828,6 @@
  *
  * @uses wp_set_post_tags() Same first two parameters, but the last parameter is always set to true.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.3.0
  *
  * @param int $post_id Post ID
@@ -4231,8 +4215,6 @@
  *
  * @usedby update_page_cache() Aliased by this function.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 1.5.1
  *
  * @param array $posts Array of post objects
@@ -4256,8 +4238,6 @@
  * This function not run if $_wp_suspend_cache_invalidation is not empty. See
  * wp_suspend_cache_invalidation().
  *
- * @package WordPress
- * @subpackage Cache
  * @since 2.0.0
  *
  * @uses do_action() Calls 'clean_post_cache' on $id before adding children (if any).
@@ -4302,8 +4282,6 @@
  *
  * @see update_post_cache() Posts and pages are the same, alias is intentional
  *
- * @package WordPress
- * @subpackage Cache
  * @since 1.5.1
  *
  * @param array $pages list of page objects
@@ -4318,8 +4296,6 @@
  * Clean (read: delete) page from cache that matches $id. Will also clean cache
  * associated with 'all_page_ids' and 'get_pages'.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 2.0.0
  *
  * @uses do_action() Will call the 'clean_page_cache' hook action.
@@ -4338,8 +4314,6 @@
 /**
  * Call major cache updating functions for list of Post objects.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 1.5.0
  *
  * @uses $wpdb
@@ -4393,8 +4367,6 @@
  * metadata cache for the posts. Therefore, the functions, which call this
  * function, do not need to perform SQL queries on their own.
  *
- * @package WordPress
- * @subpackage Cache
  * @since 2.1.0
  *
  * @uses $wpdb
@@ -4415,8 +4387,6 @@
  * This function will not run if $_wp_suspend_cache_invalidation is not empty. See
  * wp_suspend_cache_invalidation().
  *
- * @package WordPress
- * @subpackage Cache
  * @since 3.0.0
  *
  * @uses do_action() Calls 'clean_attachment_cache' on $id.
@@ -4610,8 +4580,6 @@
  * to be insterted into the posts table as a post revision. Otherwise, returns
  * an array whose keys are the post fields to be saved for post revisions.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  * @access private
  * @uses apply_filters() Calls '_wp_post_revision_fields' on 'title', 'content' and 'excerpt' fields.
@@ -4661,8 +4629,6 @@
  *
  * Typically used immediately prior to post updates.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses _wp_put_post_revision()
@@ -4717,8 +4683,6 @@
  * Returns a post object containing the information that was autosaved for the
  * specified post.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @param int $post_id The post ID.
@@ -4752,8 +4716,6 @@
 /**
  * Internally used to hack WP_Query into submission.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @param object $query WP_Query object
@@ -4765,8 +4727,6 @@
 /**
  * Determines if the specified post is a revision.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @param int|object $post Post ID or post object.
@@ -4781,8 +4741,6 @@
 /**
  * Determines if the specified post is an autosave.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @param int|object $post Post ID or post object.
@@ -4799,8 +4757,6 @@
 /**
  * Inserts post data into the posts table as a post revision.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses wp_insert_post()
@@ -4835,8 +4791,6 @@
 /**
  * Gets a post revision.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses get_post()
@@ -4871,8 +4825,6 @@
  *
  * Can restore a past revision using all fields of the post revision, or only selected fields.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses wp_get_post_revision()
@@ -4917,8 +4869,6 @@
  *
  * Deletes the row from the posts table corresponding to the specified revision.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses wp_get_post_revision()
@@ -4944,8 +4894,6 @@
 /**
  * Returns all revisions of specified post.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses get_children()
Index: wp-includes/comment.php
===================================================================
--- wp-includes/comment.php	(revision 18055)
+++ wp-includes/comment.php	(working copy)
@@ -376,8 +376,6 @@
  * Comments have a limited set of valid status values, this provides the comment
  * status values and descriptions.
  *
- * @package WordPress
- * @subpackage Post
  * @since 2.7.0
  *
  * @return array List of comment statuses.
@@ -1918,8 +1916,6 @@
  * Removes comment ID from the comment cache.
  *
  * @since 2.3.0
- * @package WordPress
- * @subpackage Cache
  *
  * @param int|array $ids Comment ID or array of comment IDs to remove from cache
  */
@@ -1938,8 +1934,6 @@
  * cache using the comment group with the key using the ID of the comments.
  *
  * @since 2.3.0
- * @package WordPress
- * @subpackage Cache
  *
  * @param array $comments Array of comment row objects
  */
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 18055)
+++ wp-includes/functions.php	(working copy)
@@ -314,8 +314,6 @@
  * If the option was serialized then it will be unserialized when it is returned.
  *
  * @since 1.5.0
- * @package WordPress
- * @subpackage Option
  * @uses apply_filters() Calls 'pre_option_$option' before checking the option.
  * 	Any value other than false will "short-circuit" the retrieval of the option
  *	and return the returned value. You should not try to override special options,
@@ -395,8 +393,6 @@
  * and 'notoptions' options.
  *
  * @since 2.2.0
- * @package WordPress
- * @subpackage Option
  *
  * @param string $option Option name.
  */
@@ -411,8 +407,6 @@
  *
  * @uses attr Sanitizes value.
  * @since 1.5.0
- * @package WordPress
- * @subpackage Option
  *
  * @param string $option Option name.
  */
@@ -424,8 +418,6 @@
  * Loads and caches all autoloaded options, if available or all options.
  *
  * @since 2.2.0
- * @package WordPress
- * @subpackage Option
  *
  * @return array List of all options.
  */
@@ -457,8 +449,6 @@
  * Loads and caches certain often requested site options if is_multisite() and a peristent cache is not being used.
  *
  * @since 3.0.0
- * @package WordPress
- * @subpackage Option
  *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
@@ -497,8 +487,6 @@
  * to set whether an option is autoloaded, then you need to use the add_option().
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Option
  *
  * @uses apply_filters() Calls 'pre_update_option_$option' hook to allow overwriting the
  * 	option value to be stored.
@@ -575,8 +563,6 @@
  * options the same as the ones which are protected and to not add options
  * that were already added.
  *
- * @package WordPress
- * @subpackage Option
  * @since 1.0.0
  *
  * @uses do_action() Calls 'add_option' hook before adding the option.
@@ -649,8 +635,6 @@
 /**
  * Removes option by name. Prevents removal of protected WordPress options.
  *
- * @package WordPress
- * @subpackage Option
  * @since 1.2.0
  *
  * @uses do_action() Calls 'delete_option' hook before option is deleted.
@@ -693,8 +677,6 @@
  * Delete a transient
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses do_action() Calls 'delete_transient_$transient' hook before transient is deleted.
  * @uses do_action() Calls 'deleted_transient' hook on success.
@@ -735,8 +717,6 @@
  * 	the transient value.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @param string $transient Transient name. Expected to not be SQL-escaped
  * @return mixed Value of transient
@@ -778,8 +758,6 @@
  * it will be serialized before it is set.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_set_transient_$transient' hook to allow overwriting the
  * 	transient value to be stored.
@@ -827,8 +805,6 @@
  * cookie exists (different browser used), adds the last saved cookie restoring
  * the settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  */
 function wp_user_settings() {
@@ -870,8 +846,6 @@
 /**
  * Retrieve user interface setting value based on setting name.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @param string $name The name of the setting.
@@ -891,8 +865,6 @@
  * Both $name and $value can contain only ASCII letters, numbers and underscores.
  * This function has to be used before any output has started as it calls setcookie().
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @param string $name The name of the setting.
@@ -921,8 +893,6 @@
  * Deleting settings would reset them to the defaults.
  * This function has to be used before any output has started as it calls setcookie().
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @param mixed $names The name or array of names of the setting to be deleted.
@@ -952,8 +922,6 @@
 /**
  * Retrieve all user interface settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  *
  * @return array the last saved user settings or empty array.
@@ -986,8 +954,6 @@
 /**
  * Private. Set all user interface settings.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @param unknown $all
@@ -1017,8 +983,6 @@
 /**
  * Delete the user settings of the current user.
  *
- * @package WordPress
- * @subpackage Option
  * @since 2.7.0
  */
 function delete_all_user_settings() {
@@ -1053,8 +1017,6 @@
  * If the title element is not part of the XML, then the default post title from
  * the $post_default_title will be used instead.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @global string $post_default_title Default XMLRPC post title.
@@ -1079,8 +1041,6 @@
  * used. The return type then would be what $post_default_category. If the
  * category is found, then it will always be an array.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @global string $post_default_category Default XMLRPC post category.
@@ -1102,8 +1062,6 @@
 /**
  * XMLRPC XML content without title and category elements.
  *
- * @package WordPress
- * @subpackage XMLRPC
  * @since 0.71
  *
  * @param string $content XMLRPC XML Request content
@@ -1123,8 +1081,6 @@
  * to be used in anywhere.
  *
  * @see fopen() for mode options.
- * @package WordPress
- * @subpackage Debug
  * @since 0.71
  * @uses $debug Used for whether debugging is enabled.
  *
@@ -1148,8 +1104,6 @@
  * Technically, this can be used to write to any file handle when the global
  * $debug is set to 1 or true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 0.71
  * @uses $debug Used for whether debugging is enabled.
  *
@@ -1168,8 +1122,6 @@
  * Technically, this can be used to close any file handle when the global $debug
  * is set to 1 or true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 0.71
  * @uses $debug Used for whether debugging is enabled.
  *
@@ -1188,7 +1140,6 @@
  * remove enclosures that are no longer in the post. This is called as
  * pingbacks and trackbacks.
  *
- * @package WordPress
  * @since 1.5.0
  *
  * @uses $wpdb
@@ -1933,8 +1884,6 @@
 /**
  * Retrieve URL with nonce added to URL query.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $actionurl URL to add nonce action
@@ -1969,8 +1918,6 @@
  * The input name will be whatever $name value you gave. The input value will be
  * the nonce creation value.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $action Optional. Action name.
@@ -1997,8 +1944,6 @@
  * The referer link is the current Request URI from the server super global. The
  * input name is '_wp_http_referer', in case you wanted to check manually.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param bool $echo Whether to echo or return the referer field.
@@ -2020,8 +1965,6 @@
  * value of {@link wp_referer_field()}, if that was posted already or it will
  * be the current page, if it doesn't exist.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param bool $echo Whether to echo the original http referer
@@ -2040,8 +1983,6 @@
 /**
  * Retrieve referer from '_wp_http_referer', HTTP referer, or current page respectively.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @return string|bool False on failure. Referer URL on success.
@@ -2061,8 +2002,6 @@
 /**
  * Retrieve original referer that was posted, if it exists.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @return string|bool False if no original referer or original referer if set.
@@ -2425,7 +2364,6 @@
 /**
  * Retrieve the file type based on the extension name.
  *
- * @package WordPress
  * @since 2.5.0
  * @uses apply_filters() Calls 'ext2type' hook on default supported types.
  *
@@ -2638,8 +2576,6 @@
  * hook are the localized "Are you sure you want to do this?" message with the
  * extra text (the text after the underscore).
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $action Nonce action.
@@ -2726,8 +2662,6 @@
  * If the action has the nonce explain message, then it will be displayed along
  * with the "Are you sure?" message.
  *
- * @package WordPress
- * @subpackage Security
  * @since 2.0.4
  *
  * @param string $action The nonce action.
@@ -2908,7 +2842,6 @@
  * development environment.
  *
  * @access private
- * @package WordPress
  * @since 2.2.0
  *
  * @param string $url URL for the home location
@@ -2928,7 +2861,6 @@
  * your localhost while not having to change the database to your URL.
  *
  * @access private
- * @package WordPress
  * @since 2.2.0
  *
  * @param string $url URL to set the WordPress site location.
@@ -2950,8 +2882,6 @@
  * keys. These keys are then returned in the $input array.
  *
  * @access private
- * @package WordPress
- * @subpackage MCE
  * @since 2.1.0
  *
  * @param array $input MCE plugin array.
@@ -3365,8 +3295,6 @@
  *
  * This function is to be used in every function that is deprecated.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
@@ -3403,8 +3331,6 @@
  *
  * This function is to be used in every file that is deprecated.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 2.5.0
  * @access private
  *
@@ -3449,8 +3375,6 @@
  *
  * The current behavior is to trigger a user error if WP_DEBUG is true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 3.0.0
  * @access private
  *
@@ -3485,8 +3409,6 @@
  *
  * The current behavior is to trigger a user error if WP_DEBUG is true.
  *
- * @package WordPress
- * @subpackage Debug
  * @since 3.1.0
  * @access private
  *
@@ -3712,8 +3634,6 @@
  * Retrieve site option value based on name of option.
  *
  * @see get_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses apply_filters() Calls 'pre_site_option_$option' before checking the option.
@@ -3764,8 +3684,6 @@
  * Add a new site option.
  *
  * @see add_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses apply_filters() Calls 'pre_add_site_option_$option' hook to allow overwriting the
@@ -3808,8 +3726,6 @@
  * Removes site option by name.
  *
  * @see delete_option()
- * @package WordPress
- * @subpackage Option
  * @since 2.8.0
  *
  * @uses do_action() Calls 'pre_delete_site_option_$option' hook before option is deleted.
@@ -3851,8 +3767,6 @@
  *
  * @see update_option()
  * @since 2.8.0
- * @package WordPress
- * @subpackage Option
  *
  * @uses apply_filters() Calls 'pre_update_site_option_$option' hook to allow overwriting the
  * 	option value to be stored.
@@ -3899,8 +3813,6 @@
  * Delete a site transient
  *
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses do_action() Calls 'delete_site_transient_$transient' hook before transient is deleted.
  * @uses do_action() Calls 'deleted_site_transient' hook on success.
@@ -3934,8 +3846,6 @@
  *
  * @see get_transient()
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_site_transient_$transient' hook before checking the transient.
  * 	Any value other than false will "short-circuit" the retrieval of the transient
@@ -3983,8 +3893,6 @@
  *
  * @see set_transient()
  * @since 2.9.0
- * @package WordPress
- * @subpackage Transient
  *
  * @uses apply_filters() Calls 'pre_set_site_transient_$transient' hook to allow overwriting the
  * 	transient value to be stored.
@@ -4025,9 +3933,7 @@
 /**
  * is main site
  *
- *
  * @since 3.0.0
- * @package WordPress
  *
  * @param int $blog_id optional blog id to test (default current blog)
  * @return bool True if not multisite or $blog_id is main site
@@ -4047,9 +3953,7 @@
 /**
  * Whether global terms are enabled.
  *
- *
  * @since 3.0.0
- * @package WordPress
  *
  * @return bool True if multisite and global terms enabled
  */
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 18055)
+++ wp-includes/link-template.php	(working copy)
@@ -502,8 +502,6 @@
  * anchor. If no link text is specified, default text is used. If no post ID is
  * specified, the current post is used.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param string $link_text Descriptive text.
@@ -525,8 +523,6 @@
  * Returns a link to the feed for all posts by a given author. A specific feed
  * can be requested or left blank to get the default feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int $author_id ID of an author.
@@ -563,8 +559,6 @@
  * Returns a link to the feed for all post in a given category. A specific feed
  * can be requested or left blank to get the default feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int $cat_id ID of a category.
@@ -1929,7 +1923,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @uses get_home_url()
@@ -1949,7 +1942,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param  int $blog_id   (optional) Blog ID. Defaults to current blog.
@@ -1984,7 +1976,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @uses get_site_url()
@@ -2004,7 +1995,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param int $blog_id (optional) Blog ID. Defaults to current blog.
@@ -2043,7 +2033,6 @@
 /**
  * Retrieve the url to the admin area for the current site.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional path relative to the admin url
@@ -2057,7 +2046,6 @@
 /**
  * Retrieve the url to the admin area for a given site.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param int $blog_id (optional) Blog ID. Defaults to current blog.
@@ -2077,7 +2065,6 @@
 /**
  * Retrieve the url to the includes directory.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the includes url.
@@ -2095,7 +2082,6 @@
 /**
  * Retrieve the url to the content directory.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the content url.
@@ -2116,7 +2102,6 @@
  * Retrieve the url to the plugins directory or to a specific file within that directory.
  * You can hardcode the plugin slug in $path or pass __FILE__ as a second argument to get the correct folder name.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param string $path Optional. Path relative to the plugins url.
@@ -2158,7 +2143,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional. Path relative to the site url.
@@ -2198,7 +2182,6 @@
  * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
  * overridden.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param  string $path   (optional) Path relative to the home url.
@@ -2227,7 +2210,6 @@
 /**
  * Retrieve the url to the admin area for the network.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional path relative to the admin url
@@ -2249,7 +2231,6 @@
 /**
  * Retrieve the url to the admin area for the current user.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @param string $path Optional path relative to the admin url
@@ -2268,7 +2249,6 @@
 /**
  * Retrieve the url to the admin area for either the current blog or the network depending on context.
  *
- * @package WordPress
  * @since 3.1.0
  *
  * @param string $path Optional path relative to the admin url
@@ -2347,7 +2327,6 @@
 /**
  * Output rel=canonical for singular queries
  *
- * @package WordPress
  * @since 2.9.0
 */
 function rel_canonical() {
Index: wp-includes/class-wp-walker.php
===================================================================
--- wp-includes/class-wp-walker.php	(revision 18055)
+++ wp-includes/class-wp-walker.php	(working copy)
@@ -251,7 +251,6 @@
  	 * and number of elements per page, this function first determines all top level root elements
  	 * belonging to that page, then lists them and all of their children in hierarchical order.
  	 *
- 	 * @package WordPress
  	 * @since 2.7
  	 * @param int $max_depth = 0 means display all levels; $max_depth > 0 specifies the number of display levels.
  	 * @param int $page_num the specific page number, beginning with 1.
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 18055)
+++ wp-includes/general-template.php	(working copy)
@@ -2114,7 +2114,6 @@
  * $file is a file relative to wp-admin/ without its ".css" extension. A
  * stylesheet link to that generated URL is printed.
  *
- * @package WordPress
  * @since 2.3.0
  * @uses $wp_styles WordPress Styles Object
  *
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php	(revision 18055)
+++ wp-includes/deprecated.php	(working copy)
@@ -1687,8 +1687,6 @@
  * dots added to the end. If there is content left over, then dots will be added
  * and the rest of the content will be removed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses apply_filters() Calls 'the_content_rss' on the content before processing.
  * @see get_the_content() For the $more_link_text, $stripteaser, and $more_file
Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php	(revision 18055)
+++ wp-includes/feed.php	(working copy)
@@ -16,8 +16,6 @@
  * Everything will be stripped of tags and characters converted, when the values
  * are retrieved for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.5.1
  * @uses apply_filters() Calls 'get_bloginfo_rss' hook with two parameters.
  * @see get_bloginfo() For the list of possible values to display.
@@ -37,8 +35,6 @@
  * Everything will be stripped of tags and characters converted, when the values
  * are retrieved for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses apply_filters() Calls 'bloginfo_rss' hook with two parameters.
  * @see get_bloginfo() For the list of possible values to display.
@@ -55,8 +51,6 @@
  * The default feed is 'rss2', unless a plugin changes it through the
  * 'default_feed' filter.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5
  * @uses apply_filters() Calls 'default_feed' hook on the default feed string.
  *
@@ -69,8 +63,6 @@
 /**
  * Retrieve the blog title for the feed title.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  * @uses apply_filters() Calls 'get_wp_title_rss' hook on title.
  * @uses wp_title() See function for $sep parameter usage.
@@ -89,8 +81,6 @@
 /**
  * Display the blog title for display of the feed title.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  * @uses apply_filters() Calls 'wp_title_rss' on the blog title.
  * @see wp_title() $sep parameter usage.
@@ -104,8 +94,6 @@
 /**
  * Retrieve the current post title for the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.0.0
  * @uses apply_filters() Calls 'the_title_rss' on the post title.
  *
@@ -120,8 +108,6 @@
 /**
  * Display the post title in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses get_the_title_rss() Used to retrieve current post title.
  */
@@ -132,8 +118,6 @@
 /**
  * Retrieve the post content for feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.9.0
  * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
  * @see get_the_content()
@@ -152,8 +136,6 @@
 /**
  * Display the post content for feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.9.0
  * @uses apply_filters() Calls 'the_content_feed' on the content before processing.
  * @see get_the_content()
@@ -167,8 +149,6 @@
 /**
  * Display the post excerpt for the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @uses apply_filters() Calls 'the_excerpt_rss' hook on the excerpt.
  */
@@ -180,8 +160,6 @@
 /**
  * Display the permalink to the post for use in feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.3.0
  * @uses apply_filters() Call 'the_permalink_rss' on the post permalink
  */
@@ -202,8 +180,6 @@
 /**
  * Display the feed GUID for the current comment.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
@@ -215,8 +191,6 @@
 /**
  * Retrieve the feed GUID for the current comment.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
@@ -243,8 +217,6 @@
 /**
  * Retrieve the current comment author for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.0.0
  * @uses apply_filters() Calls 'comment_author_rss' hook on comment author.
  * @uses get_comment_author()
@@ -258,8 +230,6 @@
 /**
  * Display the current comment author in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.0.0
  */
 function comment_author_rss() {
@@ -269,8 +239,6 @@
 /**
  * Display the current comment content for use in the feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 1.0.0
  * @uses apply_filters() Calls 'comment_text_rss' filter on comment content.
  * @uses get_comment_text()
@@ -288,8 +256,6 @@
  * retrieved and have feed markup added, so that they can easily be added to the
  * RSS2, Atom, or RSS1 and RSS0.91 RDF feeds.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.1.0
  * @uses apply_filters()
  *
@@ -333,8 +299,6 @@
 /**
  * Display the post categories in the feed.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 0.71
  * @see get_the_category_rss() For better explanation.
  *
@@ -349,8 +313,6 @@
  *
  * The two possible values are either 'xhtml' or 'html'.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.2.0
  */
 function html_type_rss() {
@@ -374,8 +336,6 @@
  * enclosure(s) consist of enclosure HTML tag(s) with a URI and other
  * attributes.
  *
- * @package WordPress
- * @subpackage Template
  * @since 1.5.0
  * @uses apply_filters() Calls 'rss_enclosure' hook on rss enclosure.
  * @uses get_post_custom() To get the current post enclosure metadata.
@@ -410,8 +370,6 @@
  * metadata field and parses the value to display the enclosure(s). The
  * enclosure(s) consist of link HTML tag(s) with a URI and other attributes.
  *
- * @package WordPress
- * @subpackage Template
  * @since 2.2.0
  * @uses apply_filters() Calls 'atom_enclosure' hook on atom enclosure.
  * @uses get_post_custom() To get the current post enclosure metadata.
@@ -442,8 +400,6 @@
  *
  * @link http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.3.1
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5
  *
  * @param string $data Input string
@@ -480,8 +436,6 @@
  *
  * Generate a correct link for the atom:self element.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.5
  */
 function self_link() {
@@ -498,8 +452,6 @@
 /**
  * Return the content type for specified feed type.
  *
- * @package WordPress
- * @subpackage Feed
  * @since 2.8.0
  */
 function feed_content_type( $type = '' ) {
Index: wp-app.php
===================================================================
--- wp-app.php	(revision 18055)
+++ wp-app.php	(working copy)
@@ -2,6 +2,8 @@
 /**
  * Atom Publishing Protocol support for WordPress
  *
+ * @package WordPress
+ * @subpackage Publishing
  * @version 1.0.5-dc
  */
 
@@ -45,8 +47,6 @@
  *
  * @since 2.2.0
  * @uses $app_logging
- * @package WordPress
- * @subpackage Logging
  *
  * @param string $label Type of logging
  * @param string $msg Information describing logging reason.
Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 18055)
+++ xmlrpc.php	(working copy)
@@ -76,8 +76,6 @@
  * logIO() - Writes logging info to a file.
  *
  * @uses $xmlrpc_logging
- * @package WordPress
- * @subpackage Logging
  *
  * @param string $io Whether input or output
  * @param string $msg Information describing logging reason.
Index: wp-admin/includes/class-wp-filesystem-base.php
===================================================================
--- wp-admin/includes/class-wp-filesystem-base.php	(revision 18055)
+++ wp-admin/includes/class-wp-filesystem-base.php	(working copy)
@@ -9,6 +9,8 @@
 /**
  * Base WordPress Filesystem class for which Filesystem implementations extend
  *
+ * @package WordPress
+ * @subpackage Filesystem
  * @since 2.5
  */
 class WP_Filesystem_Base {
Index: wp-admin/includes/post.php
===================================================================
--- wp-admin/includes/post.php	(revision 18055)
+++ wp-admin/includes/post.php	(working copy)
@@ -11,7 +11,6 @@
  *
  * Manipulates $_POST directly.
  *
- * @package WordPress
  * @since 2.6.0
  *
  * @param bool $update Are we updating a pre-existing post?
@@ -1294,8 +1293,6 @@
 /**
  * Creates autosave data for the specified post from $_POST data.
  *
- * @package WordPress
- * @subpackage Post_Revisions
  * @since 2.6.0
  *
  * @uses _wp_translate_postdata()
@@ -1326,7 +1323,6 @@
 /**
  * Save draft or manually autosave for showing preview.
  *
- * @package WordPress
  * @since 2.7.0
  *
  * @uses wp_write_post()
@@ -1388,7 +1384,6 @@
 /**
  * Adds the TinyMCE editor used on the Write and Edit screens.
  *
- * @package WordPress
  * @since 2.7.0
  *
  * TinyMCE is loaded separately from other Javascript by using wp-tinymce.php. It outputs concatenated
Index: wp-admin/install-helper.php
===================================================================
--- wp-admin/install-helper.php	(revision 18055)
+++ wp-admin/install-helper.php	(working copy)
@@ -55,8 +55,6 @@
  * Create database table, if it doesn't already exist.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
  * @uses $wpdb
  *
  * @param string $table_name Database table name.
@@ -87,8 +85,6 @@
  * Add column to database table, if column doesn't already exist in table.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
  * @uses $wpdb
  * @uses $debug
  *
@@ -122,8 +118,6 @@
  * Drop column from database table, if it exists.
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
  * @uses $wpdb
  *
  * @param string $table_name Table name
@@ -166,8 +160,6 @@
  *      Extra
  *
  * @since 1.0.0
- * @package WordPress
- * @subpackage Plugin
  *
  * @param string $table_name Table name
  * @param string $col_name Column name
Index: wp-admin/options-general.php
===================================================================
--- wp-admin/options-general.php	(revision 18055)
+++ wp-admin/options-general.php	(working copy)
@@ -19,9 +19,6 @@
 
 /**
  * Display JavaScript on the page.
- *
- * @package WordPress
- * @subpackage General_Settings_Screen
  */
 function add_js() {
 ?>
Index: wp-admin/press-this.php
===================================================================
--- wp-admin/press-this.php	(revision 18055)
+++ wp-admin/press-this.php	(working copy)
@@ -19,8 +19,6 @@
 /**
  * Press It form handler.
  *
- * @package WordPress
- * @subpackage Press_This
  * @since 2.6.0
  *
  * @return int Post ID
@@ -196,8 +194,6 @@
 		/**
 		 * Retrieve all image URLs from given URI.
 		 *
-		 * @package WordPress
-		 * @subpackage Press_This
 		 * @since 2.6.0
 		 *
 		 * @param string $uri
Index: wp-admin/options-reading.php
===================================================================
--- wp-admin/options-reading.php	(revision 18055)
+++ wp-admin/options-reading.php	(working copy)
@@ -17,9 +17,6 @@
 
 /**
  * Display JavaScript on the page.
- *
- * @package WordPress
- * @subpackage Reading_Settings_Screen
  */
 function add_js() {
 ?>
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 18055)
+++ wp-admin/setup-config.php	(working copy)
@@ -74,8 +74,6 @@
  *
  * @ignore
  * @since 2.3.0
- * @package WordPress
- * @subpackage Installer_WP_Config
  */
 function display_header() {
 	header( 'Content-Type: text/html; charset=utf-8' );
Index: wp-admin/install.php
===================================================================
--- wp-admin/install.php	(revision 18055)
+++ wp-admin/install.php	(working copy)
@@ -47,8 +47,6 @@
  * Display install header.
  *
  * @since 2.5.0
- * @package WordPress
- * @subpackage Installer
  */
 function display_header() {
 	header( 'Content-Type: text/html; charset=utf-8' );
@@ -70,8 +68,6 @@
  * Display installer setup form.
  *
  * @since 2.8.0
- * @package WordPress
- * @subpackage Installer
  */
 function display_setup_form( $error = null ) {
 	global $wpdb;
Index: wp-admin/link-parse-opml.php
===================================================================
--- wp-admin/link-parse-opml.php	(revision 18055)
+++ wp-admin/link-parse-opml.php	(working copy)
@@ -70,8 +70,6 @@
  *
  * @since 0.71
  * @access private
- * @package WordPress
- * @subpackage Dummy
  *
  * @param mixed $parser XML Parser resource.
  * @param string $tagName XML tag name.
Index: wp-admin/options-permalink.php
===================================================================
--- wp-admin/options-permalink.php	(revision 18055)
+++ wp-admin/options-permalink.php	(working copy)
@@ -30,9 +30,6 @@
 
 /**
  * Display JavaScript on the page.
- *
- * @package WordPress
- * @subpackage Permalink_Settings_Screen
  */
 function add_js() {
 	?>
