Index: src/wp-includes/bookmark-template.php =================================================================== --- src/wp-includes/bookmark-template.php (revision 29106) +++ src/wp-includes/bookmark-template.php (working copy) @@ -20,26 +20,27 @@ * used by themes. * * The defaults for overwriting are: - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'show_description' - Default is 0 (integer). Whether to show the description - * of the bookmark. - * 'show_images' - Default is 1 (integer). Whether to show link image if - * available. - * 'show_name' - Default is 0 (integer). Whether to show link name if - * available. - * 'before' - Default is '
  • ' (string). The html or text to prepend to each - * bookmarks. - * 'after' - Default is '
    • ' (string). The html or text to append to each - * bookmarks. - * 'link_before' - Default is '' (string). The html or text to prepend to each - * bookmarks inside the tag. - * 'link_after' - Default is '' (string). The html or text to append to each - * bookmarks inside the tag. - * 'between' - Default is '\n' (string). The string for use in between the link, - * description, and image. - * 'show_rating' - Default is 0 (integer). Whether to show the link rating. * + * - 'show_updated' - Default is 0 (integer). Will show the time of when the + * bookmark was last updated. + * - 'show_description' - Default is 0 (integer). Whether to show the description + * of the bookmark. + * - 'show_images' - Default is 1 (integer). Whether to show link image if + * available. + * - 'show_name' - Default is 0 (integer). Whether to show link name if + * available. + * - 'before' - Default is '
  • ' (string). The html or text to prepend to each + * bookmarks. + * - 'after' - Default is '
    • ' (string). The html or text to append to each + * bookmarks. + * - 'link_before' - Default is '' (string). The html or text to prepend to each + * bookmarks inside the     tag. + * - 'link_after' - Default is '' (string). The html or text to append to each + * bookmarks inside the tag. + * - 'between' - Default is '\n' (string). The string for use in between the link, + * description, and image. + * - 'show_rating' - Default is 0 (integer). Whether to show the link rating. + * * @since 2.1.0 * @access private * @@ -148,52 +149,54 @@ * Retrieve or echo all of the bookmarks. * * List of default arguments are as follows: - * 'orderby' - Default is 'name' (string). How to order the links by. String is - * based off of the bookmark scheme. - * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either - * ascending or descending order. - * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to - * display. - * 'category' - Default is empty string (string). Include the links in what - * category ID(s). - * 'category_name' - Default is empty string (string). Get links by category - * name. - * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide - * links marked as 'invisible'. - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'echo' - Default is 1 (integer). Whether to echo (default) or return the - * formatted bookmarks. - * 'categorize' - Default is 1 (integer). Whether to show links listed by - * category (default) or show links in one column. - * 'show_description' - Default is 0 (integer). Whether to show the description - * of the bookmark. * + * - 'orderby' - Default is 'name' (string). How to order the links by. String is + * based off of the bookmark scheme. + * - 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either + * ascending or descending order. + * - 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to + * display. + * - 'category' - Default is empty string (string). Include the links in what + * category ID(s). + * - 'category_name' - Default is empty string (string). Get links by category + * name. + * - 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide + * links marked as 'invisible'. + * - 'show_updated' - Default is 0 (integer). Will show the time of when the + * bookmark was last updated. + * - 'echo' - Default is 1 (integer). Whether to echo (default) or return the + * formatted bookmarks. + * - 'categorize' - Default is 1 (integer). Whether to show links listed by + * category (default) or show links in one column. + * - 'show_description' - Default is 0 (integer). Whether to show the description + * of the bookmark. + * * These options define how the Category name will appear before the category * links are displayed, if 'categorize' is 1. If 'categorize' is 0, then it will * display for only the 'title_li' string and only if 'title_li' is not empty. - * 'title_li' - Default is 'Bookmarks' (translatable string). What to show - * before the links appear. - * 'title_before' - Default is '

    ' (string). The HTML or text to show before - * the 'title_li' string. - * 'title_after' - Default is '

    ' (string). The HTML or text to show after - * the 'title_li' string. - * 'class' - Default is 'linkcat' (string). The CSS class to use for the - * 'title_li'. * - * 'category_before' - Default is '
  • '. String must - * contain '%id' and '%class' to get - * the id of the category and the 'class' argument. These are used for - * formatting in themes. - * Argument will be displayed before the 'title_before' argument. - * 'category_after' - Default is '
    • ' (string). The HTML or text that will - * appear after the list of links. + * - 'title_li' - Default is 'Bookmarks' (translatable string). What to show + * before the links appear. + * - 'title_before' - Default is '

    ' (string). The HTML or text to show before + * the 'title_li' string. + * - 'title_after' - Default is '

    ' (string). The HTML or text to show after + * the 'title_li' string. + * - 'class' - Default is 'linkcat' (string). The CSS class to use for the + * 'title_li'. + * - 'category_before' - Default is '
  • '. String must + * contain '%id' and '%class' to get the id of the category + * and the 'class' argument. These are used for formatting + * in themes. Argument will be displayed before the + * 'title_before' argument. + * - 'category_after' - Default is '
    • ' (string). The HTML or text that will + * appear after the list of links. * * These are only used if 'categorize' is set to 1 or true. - * 'category_orderby' - Default is 'name'. How to order the bookmark category - * based on term scheme. - * 'category_order' - Default is 'ASC'. Set the order by either ASC (ascending) - * or DESC (descending). + * + * - 'category_orderby' - Default is 'name'. How to order the bookmark category + * based on term scheme. + * - 'category_order' - Default is 'ASC'. Set the order by either ASC (ascending) + * or DESC (descending). * * @see _walk_bookmarks() For other arguments that can be set in this function * and passed to _walk_bookmarks(). Index: src/wp-includes/bookmark.php =================================================================== --- src/wp-includes/bookmark.php (revision 29106) +++ src/wp-includes/bookmark.php (working copy) @@ -92,25 +92,26 @@ * results will be stored to the cache. * * List of default arguments are as follows: - * 'orderby' - Default is 'name' (string). How to order the links by. String is - * based off of the bookmark scheme. - * 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either - * ascending or descending order. - * 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to - * display. - * 'category' - Default is empty string (string). Include the links in what - * category ID(s). - * 'category_name' - Default is empty string (string). Get links by category - * name. - * 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide - * links marked as 'invisible'. - * 'show_updated' - Default is 0 (integer). Will show the time of when the - * bookmark was last updated. - * 'include' - Default is empty string (string). Include bookmark ID(s) - * separated by commas. - * 'exclude' - Default is empty string (string). Exclude bookmark ID(s) - * separated by commas. * + * - 'orderby' - Default is 'name' (string). How to order the links by. String is + * based off of the bookmark scheme. + * - 'order' - Default is 'ASC' (string). Either 'ASC' or 'DESC'. Orders in either + * ascending or descending order. + * - 'limit' - Default is -1 (integer) or show all. The amount of bookmarks to + * display. + * - 'category' - Default is empty string (string). Include the links in what + * category ID(s). + * - 'category_name' - Default is empty string (string). Get links by category + * name. + * - 'hide_invisible' - Default is 1 (integer). Whether to show (default) or hide + * links marked as 'invisible'. + * - 'show_updated' - Default is 0 (integer). Will show the time of when the + * bookmark was last updated. + * - 'include' - Default is empty string (string). Include bookmark ID(s) + * separated by commas. + * - 'exclude' - Default is empty string (string). Exclude bookmark ID(s) + * separated by commas. + * * @since 2.1.0 * @uses $wpdb Database Object * @link http://codex.wordpress.org/Template_Tags/get_bookmarks Index: src/wp-includes/functions.php =================================================================== --- src/wp-includes/functions.php (revision 29106) +++ src/wp-includes/functions.php (working copy) @@ -1703,13 +1703,14 @@ * directory is not writable by the server. * * On success, the returned array will have many indices: - * 'path' - base directory and sub directory or full path to upload directory. - * 'url' - base url and sub directory or absolute URL to upload directory. - * 'subdir' - sub directory if uploads use year/month folders option is on. - * 'basedir' - path without subdir. - * 'baseurl' - URL path without subdir. - * 'error' - set to false. * + * - 'path' - base directory and sub directory or full path to upload directory. + * - 'url' - base url and sub directory or absolute URL to upload directory. + * - 'subdir' - sub directory if uploads use year/month folders option is on. + * - 'basedir' - path without subdir. + * - 'baseurl' - URL path without subdir. + * - 'error' - set to false. + * * @since 2.0.0 * * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null. Index: src/wp-includes/post-template.php =================================================================== --- src/wp-includes/post-template.php (revision 29106) +++ src/wp-includes/post-template.php (working copy) @@ -1112,19 +1112,16 @@ * wp_list_pages()} function. Check that function for more info on those * arguments. * - * + * - sort_column - How to sort the list of pages. Defaults to + * 'menu_order, post_title'. Use column for posts table. + * - menu_class - Class to use for the div ID which contains the page list. + * Defaults to 'menu'. + * - echo - Whether to echo list or return it. Defaults to echo. + * - link_before - Text before show_home argument text. + * - link_after - Text after show_home argument text. + * - show_home - If you set this argument, then it will display the link to the + * home page. The show_home argument really just needs to be set + * to the value of the text of the link. * * @since 2.7.0 * Index: src/wp-includes/post.php =================================================================== --- src/wp-includes/post.php (revision 29106) +++ src/wp-includes/post.php (working copy) @@ -1588,6 +1588,7 @@ * Build an object with all post type labels out of a post type object * * Accepted keys of the label array in the post type object: + * * - name - general name for the post type, usually plural. The same and overridden * by $post_type_object->label. Default is Posts/Pages * - singular_name - name for one object of this post type. Default is Post/Page @@ -1810,19 +1811,20 @@ * Retrieve list of latest posts or posts matching criteria. * * The defaults are as follows: - * 'numberposts' - Default is 5. Total number of posts to retrieve. - * 'offset' - Default is 0. See {@link WP_Query::query()} for more. - * 'category' - What category to pull the posts from. - * 'orderby' - Default is 'date', which orders based on post_date. How to order the posts. - * 'order' - Default is 'DESC'. The order to retrieve the posts. - * 'include' - See {@link WP_Query::query()} for more. - * 'exclude' - See {@link WP_Query::query()} for more. - * 'meta_key' - See {@link WP_Query::query()} for more. - * 'meta_value' - See {@link WP_Query::query()} for more. - * 'post_type' - Default is 'post'. Can be 'page', or 'attachment' to name a few. - * 'post_parent' - The parent of the post or post type. - * 'post_status' - Default is 'publish'. Post status to retrieve. * + * - 'numberposts' - Default is 5. Total number of posts to retrieve. + * - 'offset' - Default is 0. See {@link WP_Query::query()} for more. + * - 'category' - What category to pull the posts from. + * - 'orderby' - Default is 'date', which orders based on post_date. How to order the posts. + * - 'order' - Default is 'DESC'. The order to retrieve the posts. + * - 'include' - See {@link WP_Query::query()} for more. + * - 'exclude' - See {@link WP_Query::query()} for more. + * - 'meta_key' - See {@link WP_Query::query()} for more. + * - 'meta_value' - See {@link WP_Query::query()} for more. + * - 'post_type' - Default is 'post'. Can be 'page', or 'attachment' to name a few. + * - 'post_parent' - The parent of the post or post type. + * - 'post_status' - Default is 'publish'. Post status to retrieve. + * * @since 1.2.0 * * @todo Tie to WP_Query default args hash notation. Index: src/wp-includes/taxonomy.php =================================================================== --- src/wp-includes/taxonomy.php (revision 29106) +++ src/wp-includes/taxonomy.php (working copy) @@ -1213,49 +1213,36 @@ * * The list of arguments that $args can contain, which will overwrite the defaults: * - * orderby - Default is 'name'. Can be name, count, term_group, slug or nothing - * (will use term_id), Passing a custom value other than these will cause it to - * order based on the custom value. + * - orderby - Default is 'name'. Can be name, count, term_group, slug or nothing + * (will use term_id), Passing a custom value other than these will + * cause it to order based on the custom value. + * - order - Default is ASC. Can use DESC. + * - hide_empty - Default is true. Will not return empty terms, which means + * terms whose count is 0 according to the given taxonomy. + * - exclude - Default is an empty array. An array, comma- or space-delimited string + * of term ids to exclude from the return array. If 'include' is + * non-empty, 'exclude' is ignored. + * - exclude_tree - Default is an empty array. An array, comma- or space-delimited + * string of term ids to exclude from the return array, along + * with all of their descendant terms according to the primary + * taxonomy. If 'include' is non-empty, 'exclude_tree' is ignored. + * - include - Default is an empty array. An array, comma- or space-delimited string + * of term ids to include in the return array. + * - number - The maximum number of terms to return. Default is to return them all. + * - offset - The number by which to offset the terms query. + * - fields - Default is 'all', which returns an array of term objects. + * If 'fields' is 'ids' or 'names', returns an array of integers or + * strings, respectively. + * - slug - Returns terms whose "slug" matches this value. Default is empty string. + * - hierarchical - Whether to include terms that have non-empty descendants + * (even if 'hide_empty' is set to true). + * - search - Returned terms' names will contain the value of 'search', + * case-insensitive. Default is an empty string. + * - name__like - Returned terms' names will contain the value of 'name__like', + * case-insensitive. Default is empty string. + * - description__like - Returned terms' descriptions will contain the value of + * 'description__like', case-insensitive. Default is empty string. * - * order - Default is ASC. Can use DESC. - * - * hide_empty - Default is true. Will not return empty terms, which means - * terms whose count is 0 according to the given taxonomy. - * - * exclude - Default is an empty array. An array, comma- or space-delimited string - * of term ids to exclude from the return array. If 'include' is non-empty, - * 'exclude' is ignored. - * - * exclude_tree - Default is an empty array. An array, comma- or space-delimited - * string of term ids to exclude from the return array, along with all of their - * descendant terms according to the primary taxonomy. If 'include' is non-empty, - * 'exclude_tree' is ignored. - * - * include - Default is an empty array. An array, comma- or space-delimited string - * of term ids to include in the return array. - * - * number - The maximum number of terms to return. Default is to return them all. - * - * offset - The number by which to offset the terms query. - * - * fields - Default is 'all', which returns an array of term objects. - * If 'fields' is 'ids' or 'names', returns an array of - * integers or strings, respectively. - * - * slug - Returns terms whose "slug" matches this value. Default is empty string. - * - * hierarchical - Whether to include terms that have non-empty descendants - * (even if 'hide_empty' is set to true). - * - * search - Returned terms' names will contain the value of 'search', - * case-insensitive. Default is an empty string. - * - * name__like - Returned terms' names will contain the value of 'name__like', - * case-insensitive. Default is empty string. - * - * description__like - Returned terms' descriptions will contain the value of - * 'description__like', case-insensitive. Default is empty string. - * * The argument 'pad_counts', if set to true will include the quantity of a term's * children in the quantity of each term's "count" object variable. * Index: src/wp-includes/user.php =================================================================== --- src/wp-includes/user.php (revision 29106) +++ src/wp-includes/user.php (working copy) @@ -1252,27 +1252,30 @@ * used, either 'include' or 'exclude', but not both. * * The available arguments are as follows: - *
      - *
    1. show_option_all - Text to show all and whether HTML option exists.
      2. - *
    2. show_option_none - Text for show none and whether HTML option exists.
      3. - *
    3. option_none_value - Value to use when no option is selected.
      4. - *
    4. hide_if_only_one_author - Don't create the dropdown if there is only one user.
      5. - *
    5. orderby - SQL order by clause for what order the users appear. Default is 'display_name'.
      6. - *
    6. order - Default is 'ASC'. Can also be 'DESC'.
      7. - *
    7. include - User IDs to include.
      8. - *
    8. exclude - User IDs to exclude.
      9. - *
    9. multi - Default is 'false'. Whether to skip the ID attribute on the 'select' element. A 'true' value is overridden when id argument is set.
      10. - *
    10. show - Default is 'display_name'. User table column to display. If the selected item is empty then the user_login will be displayed in parentheses
      11. - *
    11. echo - Default is '1'. Whether to display or retrieve content.
      12. - *
    12. selected - Which User ID is selected.
      13. - *
    13. include_selected - Always include the selected user ID in the dropdown. Default is false.
      14. - *
    14. name - Default is 'user'. Name attribute of select element.
      15. - *
    15. id - Default is the value of the 'name' parameter. ID attribute of select element.
      16. - *
    16. class - Class attribute of select element.
      17. - *
    17. blog_id - ID of blog (Multisite only). Defaults to ID of current blog.
      18. - *
    18. who - Which users to query. Currently only 'authors' is supported. Default is all users.
      19. - *
    * + * - show_option_all - Text to show all and whether HTML option exists. + * - show_option_none - Text for show none and whether HTML option exists. + * - option_none_value - Value to use when no option is selected. + * - hide_if_only_one_author - Don't create the dropdown if there is only one user. + * - orderby - SQL order by clause for what order the users appear. Default is + * 'display_name'. + * - order - Default is 'ASC'. Can also be 'DESC'. + * - include - User IDs to include. + * - exclude - User IDs to exclude. + * - multi - Default is 'false'. Whether to skip the ID attribute on the 'select' + * element. A 'true' value is overridden when id argument is set. + * - show - Default is 'display_name'. User table column to display. If the + * selected item is empty then the user_login will be displayed in + * parentheses. + * - echo - Default is '1'. Whether to display or retrieve content. + * - selected - Which User ID is selected. + * - include_selected - Always include the selected user ID in the dropdown. Default is false. + * - name - Default is 'user'. Name attribute of select element. + * - id - Default is the value of the 'name' parameter. ID attribute of select element. + * - class - Class attribute of select element. + * - blog_id - ID of blog (Multisite only). Defaults to ID of current blog. + * - who - Which users to query. Currently only 'authors' is supported. Default is all users. + * * @since 2.3.0 * * @global wpdb $wpdb WordPress database object for queries. @@ -1565,27 +1568,29 @@ * called, 'pre_user_description' that can be hooked into. * * The $userdata array can contain the following fields: - * 'ID' - An integer that will be used for updating an existing user. - * 'user_pass' - A string that contains the plain text password for the user. - * 'user_login' - A string that contains the user's username for logging in. - * 'user_nicename' - A string that contains a URL-friendly name for the user. - * The default is the user's username. - * 'user_url' - A string containing the user's URL for the user's web site. - * 'user_email' - A string containing the user's email address. - * 'display_name' - A string that will be shown on the site. Defaults to user's - * username. It is likely that you will want to change this, for appearance. - * 'nickname' - The user's nickname, defaults to the user's username. - * 'first_name' - The user's first name. - * 'last_name' - The user's last name. - * 'description' - A string containing content about the user. - * 'rich_editing' - A string for whether to enable the rich editor. False - * if not empty. - * 'user_registered' - The date the user registered. Format is 'Y-m-d H:i:s'. - * 'role' - A string used to set the user's role. - * 'jabber' - User's Jabber account. - * 'aim' - User's AOL IM account. - * 'yim' - User's Yahoo IM account. * + * - 'ID' - An integer that will be used for updating an existing user. + * - 'user_pass' - A string that contains the plain text password for the user. + * - 'user_login' - A string that contains the user's username for logging in. + * - 'user_nicename' - A string that contains a URL-friendly name for the user. + * The default is the user's username. + * - 'user_url' - A string containing the user's URL for the user's web site. + * - 'user_email' - A string containing the user's email address. + * - 'display_name' - A string that will be shown on the site. Defaults to user's + * username. It is likely that you will want to change this, + * for appearance. + * - 'nickname' - The user's nickname, defaults to the user's username. + * - 'first_name' - The user's first name. + * - 'last_name' - The user's last name. + * - 'description' - A string containing content about the user. + * - 'rich_editing' - A string for whether to enable the rich editor. False + * if not empty. + * - 'user_registered' - The date the user registered. Format is 'Y-m-d H:i:s'. + * - 'role' - A string used to set the user's role. + * - 'jabber' - User's Jabber account. + * - 'aim' - User's AOL IM account. + * - 'yim' - User's Yahoo IM account. + * * @since 2.0.0 * * @global wpdb $wpdb WordPress database object for queries.