Skip to content

Commit

Permalink
Spelling and grammar fun. Fixes #11875 props cnorris23
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.automattic.com/wordpress/trunk@13382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
nacin committed Feb 24, 2010
1 parent d01197b commit 8bcc596
Show file tree
Hide file tree
Showing 23 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion wp-admin/includes/class-wp-filesystem-base.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class WP_Filesystem_Base {
/**
* Whether to display debug data for the connection or not.
* Whether to display debug data for the connection.
*
* @since 2.5
* @access public
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/misc.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function save_mod_rewrite_rules() {
$home_path = get_home_path();
$htaccess_file = $home_path.'.htaccess';

// If the file doesn't already exists check for write access to the directory and whether of not we have some rules.
// If the file doesn't already exists check for write access to the directory and whether we have some rules.
// else check for write access to the file.
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
if ( got_mod_rewrite() ) {
Expand Down Expand Up @@ -359,7 +359,7 @@ function codepress_footer_js() {
}

/**
* Determine whether to use CodePress or not.
* Determine whether to use CodePress.
*
* @since 2.8
**/
Expand Down
6 changes: 3 additions & 3 deletions wp-admin/includes/template.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function link_cat_row( $category, $name_override = false ) {
*
* @param any $checked One of the values to compare
* @param any $current (true) The other value to compare if not just true
* @param bool $echo Whether or not to echo or just return the string
* @param bool $echo Whether to echo or just return the string
*/
function checked( $checked, $current = true, $echo = true) {
return __checked_selected_helper( $checked, $current, $echo, 'checked' );
Expand All @@ -195,7 +195,7 @@ function checked( $checked, $current = true, $echo = true) {
*
* @param any selected One of the values to compare
* @param any $current (true) The other value to compare if not just true
* @param bool $echo Whether or not to echo or just return the string
* @param bool $echo Whether to echo or just return the string
*/
function selected( $selected, $current = true, $echo = true) {
return __checked_selected_helper( $selected, $current, $echo, 'selected' );
Expand All @@ -211,7 +211,7 @@ function selected( $selected, $current = true, $echo = true) {
*
* @param any $helper One of the values to compare
* @param any $current (true) The other value to compare if not just true
* @param bool $echo Whether or not to echo or just return the string
* @param bool $echo Whether to echo or just return the string
* @param string $type The type of checked|selected we are doing.
*/
function __checked_selected_helper( $helper, $current, $echo, $type) {
Expand Down
2 changes: 1 addition & 1 deletion wp-content/themes/default/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<style type="text/css" media="screen">

<?php
// Checks to see whether it needs a sidebar or not
// Checks to see whether it needs a sidebar
if ( empty($withcomments) && !is_single() ) {
?>
#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class WP_Role {
* PHP4 Constructor - Setup object properties.
*
* The list of capabilities, must have the key as the name of the capability
* and the value a boolean of whether it is granted to the role or not.
* and the value a boolean of whether it is granted to the role.
*
* @since 2.0.0
* @access public
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/category.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function &get_category( $category, $output = OBJECT, $filter = 'raw' ) {
* @since 2.1.0
*
* @param string $category_path URL containing category slugs.
* @param bool $full_match Optional. Whether should match full path or not.
* @param bool $full_match Optional. Whether full path should be matched.
* @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
* @return null|object|array Null on failure. Type is based on $output value.
*/
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/comment-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false
*
* @since 0.71
* @global string $wpcommentspopupfile The URL to use for the popup window
* @global int $wpcommentsjavascript Whether to use JavaScript or not. Set when function is called
* @global int $wpcommentsjavascript Whether to use JavaScript. Set when function is called
*
* @param int $width Optional. The width of the popup window
* @param int $height Optional. The height of the popup window
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ function sanitize_comment_cookies() {
}

/**
* Validates whether this comment is allowed to be made or not.
* Validates whether this comment is allowed to be made.
*
* @since 2.0.0
* @uses $wpdb
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/deprecated.php
Original file line number Diff line number Diff line change
Expand Up @@ -1255,8 +1255,8 @@ function gzip_compression() {
* @see get_comment()
*
* @param int $comment_ID The ID of the comment
* @param int $no_cache Whether to use the cache or not (casted to bool)
* @param bool $include_unapproved Whether to include unapproved comments or not
* @param int $no_cache Whether to use the cache (casted to bool)
* @param bool $include_unapproved Whether to include unapproved comments
* @return array The comment data
*/
function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/formatting.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function seems_utf8($str) {
* @param string $string The text which is to be encoded.
* @param mixed $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
* @param string $charset Optional. The character encoding of the string. Default is false.
* @param boolean $double_encode Optional. Whether or not to encode existing html entities. Default is false.
* @param boolean $double_encode Optional. Whether to encode existing html entities. Default is false.
* @return string The encoded text with HTML entities.
*/
function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
Expand Down Expand Up @@ -1110,7 +1110,7 @@ function force_balance_tags( $text ) {
* @since 0.71
*
* @param string $content The text about to be edited.
* @param bool $richedit Whether or not the $content should pass through htmlspecialchars(). Default false.
* @param bool $richedit Whether the $content should pass through htmlspecialchars(). Default false.
* @return string The text after the filter (and possibly htmlspecialchars()) has been run.
*/
function format_to_edit($content, $richedit = false) {
Expand Down
6 changes: 3 additions & 3 deletions wp-includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ function is_blog_installed() {
$tables = $wpdb->get_col('SHOW TABLES');
$wpdb->suppress_errors( $suppress );

$wp_tables = $wpdb->tables( 'all', true );
$wp_tables = $wpdb->tables( 'all' );
// Loop over the WP tables. If none exist, then scratch install is allowed.
// If one or more exist, suggest table repair since we got here because the options
// table could not be accessed.
Expand Down Expand Up @@ -1995,7 +1995,7 @@ function wp_get_original_referer() {
* @since 2.0.1
*
* @param string $target Full path to attempt to create.
* @return bool Whether the path was created or not. True if path already exists.
* @return bool Whether the path was created. True if path already exists.
*/
function wp_mkdir_p( $target ) {
// from php.net/mkdir user contributed notes
Expand Down Expand Up @@ -3028,7 +3028,7 @@ function absint( $maybeint ) {
* @since 2.5.0
*
* @param string $url
* @return bool Whether or not SSL access is available
* @return bool Whether SSL access is available
*/
function url_is_accessable_via_ssl($url)
{
Expand Down
14 changes: 7 additions & 7 deletions wp-includes/general-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function get_search_form($echo = true) {
* Display the Log In/Out link.
*
* Displays a link, which allows the user to navigate to the Log In page to log in
* or log out depending on whether or not they are currently logged in.
* or log out depending on whether they are currently logged in.
*
* @since 1.5.0
* @uses apply_filters() Calls 'loginout' hook on HTML link content.
Expand Down Expand Up @@ -1436,9 +1436,9 @@ function get_the_time( $d = '', $post = null ) {
* @since 2.0.0
*
* @param string $d Optional Either 'G', 'U', or php date format.
* @param bool $gmt Optional, default is false. Whether of not to return the gmt time.
* @param bool $gmt Optional, default is false. Whether to return the gmt time.
* @param int|object $post Optional post ID or object. Default is global $post object.
* @param bool $translate Whether to translate the time string or not
* @param bool $translate Whether to translate the time string
* @return string
*/
function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) { // returns timestamp
Expand Down Expand Up @@ -1486,9 +1486,9 @@ function get_the_modified_time($d = '') {
* @since 2.0.0
*
* @param string $d Optional, default is 'U'. Either 'G', 'U', or php date format.
* @param bool $gmt Optional, default is false. Whether of not to return the gmt time.
* @param bool $gmt Optional, default is false. Whether to return the gmt time.
* @param int|object $post Optional, default is global post object. A post_id or post object
* @param bool $translate Optional, default is false. Whether to translate the result or not
* @param bool $translate Optional, default is false. Whether to translate the result
* @return string Returns timestamp
*/
function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
Expand Down Expand Up @@ -1699,7 +1699,7 @@ function noindex() {
*
* @since 2.1.0
*
* @return bool Whether of not TinyMCE exists.
* @return bool Whether TinyMCE exists.
*/
function rich_edit_exists() {
global $wp_rich_edit_exists;
Expand All @@ -1709,7 +1709,7 @@ function rich_edit_exists() {
}

/**
* Whether or not the user should have a WYSIWIG editor.
* Whether the user should have a WYSIWIG editor.
*
* Checks that the user requires a WYSIWIG editor and that the editor is
* supported in the users browser.
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/kses.php
Original file line number Diff line number Diff line change
Expand Up @@ -739,10 +739,10 @@ function wp_kses_hair($attr, $allowed_protocols) {
* @since 1.0.0
*
* @param string $value Attribute value
* @param string $vless Whether the value is valueless or not. Use 'y' or 'n'
* @param string $vless Whether the value is valueless. Use 'y' or 'n'
* @param string $checkname What $checkvalue is checking for.
* @param mixed $checkvalue What constraint the value should pass
* @return bool Whether check passes (true) or not (false)
* @return bool Whether check passes
*/
function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
$ok = true;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/media.php
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ function wp_oembed_get( $url, $args = '' ) {
*
* @param string $format The format of URL that this provider can handle. You can use asterisks as wildcards.
* @param string $provider The URL to the oEmbed provider.
* @param boolean $regex Whether the $format parameter is in a regex format or not.
* @param boolean $regex Whether the $format parameter is in a regex format.
*/
function wp_oembed_add_provider( $format, $provider, $regex = false ) {
require_once( 'class-oembed.php' );
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/pluggable.php
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()

$phpmailer->ContentType = $content_type;

// Set whether it's plaintext or not, depending on $content_type
// Set whether it's plaintext, depending on $content_type
if ( $content_type == 'text/html' ) {
$phpmailer->IsHTML( true );
}
Expand Down Expand Up @@ -633,7 +633,7 @@ function wp_parse_auth_cookie($cookie = '', $scheme = '') {
* @since 2.5
*
* @param int $user_id User ID
* @param bool $remember Whether to remember the user or not
* @param bool $remember Whether to remember the user
*/
function wp_set_auth_cookie($user_id, $remember = false, $secure = '') {
if ( $remember ) {
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/post-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,8 @@ function get_the_password_form() {
/**
* Whether currently in a page template.
*
* This template tag allows you to determine whether or not you are in a page
* template. You can optional provide a template name and then the check will be
* This template tag allows you to determine if you are in a page template.
* You can optional provide a template name and then the check will be
* specific to that template.
*
* @since 2.5.0
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/post-thumbnail-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @since 2.9.0
*
* @param int $post_id Optional. Post ID.
* @return bool Whether post has an image attached (true) or not (false).
* @return bool Whether post has an image attached.
*/
function has_post_thumbnail( $post_id = NULL ) {
global $id;
Expand Down
4 changes: 2 additions & 2 deletions wp-includes/post.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ function create_initial_post_types() {
* @uses apply_filters() Calls 'get_attached_file' on file path and attachment ID.
*
* @param int $attachment_id Attachment ID.
* @param bool $unfiltered Whether to apply filters or not.
* @param bool $unfiltered Whether to apply filters.
* @return string The file path to the attached file.
*/
function get_attached_file( $attachment_id, $unfiltered = false ) {
Expand Down Expand Up @@ -1198,7 +1198,7 @@ function get_post_custom_values( $key = '', $post_id = 0 ) {
* @since 2.7.0
*
* @param int $post_id Optional. Post ID.
* @return bool Whether post is sticky (true) or not sticky (false).
* @return bool Whether post is sticky.
*/
function is_sticky($post_id = null) {
global $id;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/registration.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function validate_username( $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 or not. False
* '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.
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/taxonomy.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function get_taxonomy( $taxonomy ) {
* @uses $wp_taxonomies
*
* @param string $taxonomy Name of taxonomy object
* @return bool Whether the taxonomy exists or not.
* @return bool Whether the taxonomy exists.
*/
function is_taxonomy( $taxonomy ) {
global $wp_taxonomies;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
* @param int $user_id User ID
* @param string $option_name User option name.
* @param mixed $newvalue User option value.
* @param bool $global Optional. Whether option name is blog specific or not.
* @param bool $global Optional. Whether option name is blog specific.
* @return unknown
*/
function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
Expand Down
6 changes: 3 additions & 3 deletions wp-includes/wp-db.php
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ function show_errors( $show = true ) {
* @since 0.71
* @see wpdb::show_errors()
*
* @return bool Whether showing of errors was active or not
* @return bool Whether showing of errors was active
*/
function hide_errors() {
$show = $this->show_errors;
Expand Down Expand Up @@ -1427,7 +1427,7 @@ function bail( $message, $error_code = '500' ) {
}

/**
* Whether or not MySQL database is at least the required minimum version.
* Whether MySQL database is at least the required minimum version.
*
* @since 2.5.0
* @uses $wp_version
Expand All @@ -1443,7 +1443,7 @@ function check_database_version() {
}

/**
* Whether of not the database supports collation.
* Whether the database supports collation.
*
* Called when WordPress is generating the table scheme.
*
Expand Down
2 changes: 1 addition & 1 deletion wp-trackback.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/**
* trackback_response() - Respond with error or success XML message
*
* @param int|bool $error Whether there was an error or not
* @param int|bool $error Whether there was an error
* @param string $error_message Error message if an error occurred
*/
function trackback_response($error = 0, $error_message = '') {
Expand Down

0 comments on commit 8bcc596

Please sign in to comment.