More pedantry. "Setup" is not a verb. http://notaverb.com/setup

markjaquith · markjaquith · commit 8bca8131a6e1 · 2010-03-17T04:39:50.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@13725 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
@@ -47,7 +47,7 @@ function Custom_Background($admin_header_callback = '', $admin_image_div_callbac
 	}
 
 	/**
-	 * Setup the hooks for the Custom Background admin page.
+	 * Set up the hooks for the Custom Background admin page.
 	 *
 	 * @since unknown
 	 */
@@ -84,7 +84,7 @@ function step() {
 	}
 
 	/**
-	 * Setup the enqueue for the JavaScript files.
+	 * Set up the enqueue for the JavaScript files.
 	 *
 	 * @since unknown
 	 */
@@ -96,7 +96,7 @@ function js_includes() {
 	}
 
 	/**
-	 * Setup the enqueue for the CSS files
+	 * Set up the enqueue for the CSS files
 	 *
 	 * @since unknown
 	 */
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
@@ -49,7 +49,7 @@ function Custom_Image_Header($admin_header_callback, $admin_image_div_callback =
 	}
 
 	/**
-	 * Setup the hooks for the Custom Header admin page.
+	 * Set up the hooks for the Custom Header admin page.
 	 *
 	 * @since unknown
 	 */
@@ -85,7 +85,7 @@ function step() {
 	}
 
 	/**
-	 * Setup the enqueue for the JavaScript files.
+	 * Set up the enqueue for the JavaScript files.
 	 *
 	 * @since unknown
 	 */
@@ -99,7 +99,7 @@ function js_includes() {
 	}
 
 	/**
-	 * Setup the enqueue for the CSS files
+	 * Set up the enqueue for the CSS files
 	 *
 	 * @since 2.7
 	 */
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
@@ -313,7 +313,7 @@ function wp_nav_menu_get_items( $menu_items, $object_type, $object = null, $cont
 			$menu_item->post_parent = 0;
 		
 		if ( 0 == $menu_item->post_parent ) {
-			// Setup the menu item
+			// Set up the menu item
 			$menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );			
 			$attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
 			
@@ -371,7 +371,7 @@ function wp_get_nav_menu_sub_items( $childof, $object_type, $object = null, $con
 	if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
 		$output .= '<ul class="sub-menu menu-item-type-'. $object_type .'">';
 		foreach ( $sub_menu_items as $menu_item ) {
-			// Setup the menu item
+			// Set up the menu item
 			$menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
 			$attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
 
diff --git a/wp-cron.php b/wp-cron.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * WordPress Cron Implementation for hosts, which do not offer CRON or for which
- * the user has not setup a CRON job pointing to this file.
+ * the user has not set up a CRON job pointing to this file.
  *
  * The HTTP request to this file will not slow down the visitor who happens to
  * visit when the cron job is needed to run.
@@ -22,7 +22,7 @@
 define('DOING_CRON', true);
 
 if ( !defined('ABSPATH') ) {
-	/** Setup WordPress environment */
+	/** Set up WordPress environment */
 	require_once('./wp-load.php');
 }
 
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
@@ -85,7 +85,7 @@ function WP_Roles() {
 	}
 
 	/**
-	 * Setup the object properties.
+	 * Set up the object properties.
 	 *
 	 * The role key is set to the current prefix for the $wpdb object with
 	 * 'user_roles' appended. If the $wp_user_roles global is set, then it will
@@ -269,7 +269,7 @@ class WP_Role {
 	var $capabilities;
 
 	/**
-	 * PHP4 Constructor - Setup object properties.
+	 * PHP4 Constructor - Set up 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.
@@ -500,7 +500,7 @@ function WP_User( $id, $name = '' ) {
 	}
 
 	/**
-	 * Setup capability object properties.
+	 * Set up capability object properties.
 	 *
 	 * Will set the value for the 'cap_key' property to current database table
 	 * prefix, followed by 'capabilities'. Will then check to see if the
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
@@ -50,12 +50,12 @@ function WP_Http() {
 	}
 
 	/**
-	 * PHP5 style Constructor - Setup available transport if not available.
+	 * PHP5 style Constructor - Set up available transport if not available.
 	 *
 	 * PHP4 does not have the 'self' keyword and since WordPress supports PHP4,
 	 * the class needs to be used for the static call.
 	 *
-	 * The transport are setup to save time. This should only be called once, so
+	 * The transport are set up to save time. This should only be called once, so
 	 * the overhead should be fine.
 	 *
 	 * @since 2.7.0
@@ -650,7 +650,7 @@ function request($url, $args = array()) {
 		}
 
 		//fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,
-		// which fails when the server is not setup for it. For compatibility, always connect to the IPv4 address.
+		// which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.
 		if ( 'localhost' == strtolower($fsockopen_host) )
 			$fsockopen_host = '127.0.0.1';
 
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
@@ -409,7 +409,7 @@ function build_query_string() {
 	}
 
 	/**
-	 * Setup the WordPress Globals.
+	 * Set up the WordPress Globals.
 	 *
 	 * The query_vars property will be extracted to the GLOBALS. So care should
 	 * be taken when naming global variables that might interfere with the
@@ -440,7 +440,7 @@ function register_globals() {
 	}
 
 	/**
-	 * Setup the current user.
+	 * Set up the current user.
 	 *
 	 * @since 2.0.0
 	 */
@@ -449,7 +449,7 @@ function init() {
 	}
 
 	/**
-	 * Setup the Loop based on the query variables.
+	 * Set up the Loop based on the query variables.
 	 *
 	 * @uses WP::$query_vars
 	 * @since 2.0.0
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
@@ -34,7 +34,7 @@ function wptexturize($text) {
 	$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 	$stop = count($textarr);
 
-	// No need to setup these variables more than once
+	// No need to set up these variables more than once
 	if (!$static_setup) {
 		/* translators: opening curly quote */
 		$opening_quote = _x('&#8220;', 'opening curly quote');
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -1475,7 +1475,7 @@ function wp_remote_fopen( $uri ) {
 }
 
 /**
- * Setup the WordPress query.
+ * Set up the WordPress query.
  *
  * @since 2.0.0
  *
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Used to setup and fix common variables and include
+ * Used to set up and fix common variables and include
  * the Multisite procedural and class library.
  *
  * Allows for some configuration in wp-config.php (see ms-default-constants.php)
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
@@ -113,7 +113,7 @@ function wp_get_nav_menu( $args = array() ) {
 	}
 	
 	foreach ( $menu_items as $key => $menu_item ) {
-		// Setup the $menu_item variables
+		// Set up the $menu_item variables
 		$menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
 
 		$type = $menu_item->append;
diff --git a/wp-includes/query.php b/wp-includes/query.php
@@ -45,7 +45,7 @@ function set_query_var($var, $value) {
 }
 
 /**
- * Setup The Loop with query parameters.
+ * Set up The Loop with query parameters.
  *
  * This will override the current WordPress Loop and shouldn't be used more than
  * once. This must not be used within the WordPress Loop.
@@ -63,11 +63,11 @@ function &query_posts($query) {
 }
 
 /**
- * Destroy the previous query and setup a new query.
+ * Destroy the previous query and set up a new query.
  *
  * This should be used after {@link query_posts()} and before another {@link
  * query_posts()}. This will remove obscure bugs that occur when the previous
- * wp_query object is not destroyed properly before another is setup.
+ * wp_query object is not destroyed properly before another is set up.
  *
  * @since 2.3.0
  * @uses $wp_query
@@ -2466,7 +2466,7 @@ function &get_posts() {
 	}
 
 	/**
-	 * Setup the next post and iterate current post index.
+	 * Set up the next post and iterate current post index.
 	 *
 	 * @since 1.5.0
 	 * @access public
@@ -2760,7 +2760,7 @@ function wp_old_slug_redirect () {
 }
 
 /**
- * Setup global post data.
+ * Set up global post data.
  *
  * @since 1.5.0
  *
diff --git a/wp-includes/registration.php b/wp-includes/registration.php
@@ -314,7 +314,7 @@ function wp_create_user($username, $password, $email = '') {
 
 
 /**
- * Setup the default contact methods
+ * Set up the default contact methods
  *
  * @access private
  * @since
diff --git a/wp-includes/rss.php b/wp-includes/rss.php
@@ -67,7 +67,7 @@ function MagpieRSS ($source) {
 		$this->parser = $parser;
 
 		# pass in parser, and a reference to this object
-		# setup handlers
+		# set up handlers
 		#
 		xml_set_object( $this->parser, $this );
 		xml_set_element_handler($this->parser,
@@ -461,7 +461,7 @@ function fetch_rss ($url) {
 
 		// else attempt a conditional get
 
-		// setup headers
+		// set up headers
 		if ( $cache_status == 'STALE' ) {
 			$rss = $cache->get( $url );
 			if ( isset($rss->etag) and $rss->last_modified ) {
@@ -611,7 +611,7 @@ function _response_to_rss ($resp) {
 }
 
 /**
- * Setup constants with default values, unless user overrides.
+ * Set up constants with default values, unless user overrides.
  *
  * @since unknown
  * @package External
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -37,7 +37,7 @@
 require( ABSPATH . WPINC . '/functions.wp-styles.php' );
 
 /**
- * Setup WordPress scripts to load by default for Administration Panels.
+ * Set up WordPress scripts to load by default for Administration Panels.
  *
  * Localizes a few of the scripts.
  * $scripts->add_data( 'script-handle', 'group', 1 ); queues the script for the footer
diff --git a/wp-includes/user.php b/wp-includes/user.php
@@ -476,7 +476,7 @@ function count_users($strategy = 'time') {
 //
 
 /**
- * Setup global user vars.
+ * Set up global user vars.
  *
  * Used by set_current_user() for back compat. Might be deprecated in the
  * future.
@@ -491,7 +491,7 @@ function count_users($strategy = 'time') {
  * @global string $user_pass_md5 MD5 of the user's password
  * @global string $user_identity The display name of the user
  *
- * @param int $for_user_id Optional. User ID to setup global data.
+ * @param int $for_user_id Optional. User ID to set up global data.
  */
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
@@ -735,7 +735,7 @@ function select( $db, &$dbh ) {
 <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
 <li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
 </ul>
-<p>If you don\'t know how to setup a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' );
+<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' );
 			return;
 		}
 	}
diff --git a/wp-settings.php b/wp-settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Used to setup and fix common variables and include
+ * Used to set up and fix common variables and include
  * the WordPress procedural and class library.
  *
  * Allows for some configuration in wp-config.php (see default-constants.php)
diff --git a/xmlrpc.php b/xmlrpc.php
@@ -369,7 +369,7 @@ function set_custom_fields($post_id, $fields) {
 	}
 
 	/**
-	 * Setup blog options property.
+	 * Set up blog options property.
 	 *
 	 * Passes property through 'xmlrpc_blog_options' filter.
 	 *

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ function Custom_Background($admin_header_callback = '', $admin_image_div_callbac`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * Setup the hooks for the Custom Background admin page.`
	`50`	`+ * Set up the hooks for the Custom Background admin page.`
`51`	`51`	`*`
`52`	`52`	`* @since unknown`
`53`	`53`	`*/`
`@@ -84,7 +84,7 @@ function step() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * Setup the enqueue for the JavaScript files.`
	`87`	`+ * Set up the enqueue for the JavaScript files.`
`88`	`88`	`*`
`89`	`89`	`* @since unknown`
`90`	`90`	`*/`
`@@ -96,7 +96,7 @@ function js_includes() {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * Setup the enqueue for the CSS files`
	`99`	`+ * Set up the enqueue for the CSS files`
`100`	`100`	`*`
`101`	`101`	`* @since unknown`
`102`	`102`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function Custom_Image_Header($admin_header_callback, $admin_image_div_callback =`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * Setup the hooks for the Custom Header admin page.`
	`52`	`+ * Set up the hooks for the Custom Header admin page.`
`53`	`53`	`*`
`54`	`54`	`* @since unknown`
`55`	`55`	`*/`
`@@ -85,7 +85,7 @@ function step() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * Setup the enqueue for the JavaScript files.`
	`88`	`+ * Set up the enqueue for the JavaScript files.`
`89`	`89`	`*`
`90`	`90`	`* @since unknown`
`91`	`91`	`*/`
`@@ -99,7 +99,7 @@ function js_includes() {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/**`
`102`		`- * Setup the enqueue for the CSS files`
	`102`	`+ * Set up the enqueue for the CSS files`
`103`	`103`	`*`
`104`	`104`	`* @since 2.7`
`105`	`105`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function WP_Roles() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * Setup the object properties.`
	`88`	`+ * Set up the object properties.`
`89`	`89`	`*`
`90`	`90`	`* The role key is set to the current prefix for the $wpdb object with`
`91`	`91`	`* 'user_roles' appended. If the $wp_user_roles global is set, then it will`
`@@ -269,7 +269,7 @@ class WP_Role {`
`269`	`269`	`var $capabilities;`
`270`	`270`
`271`	`271`	`/**`
`272`		`- * PHP4 Constructor - Setup object properties.`
	`272`	`+ * PHP4 Constructor - Set up object properties.`
`273`	`273`	`*`
`274`	`274`	`* The list of capabilities, must have the key as the name of the capability`
`275`	`275`	`* and the value a boolean of whether it is granted to the role.`
`@@ -500,7 +500,7 @@ function WP_User( $id, $name = '' ) {`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`/**`
`503`		`- * Setup capability object properties.`
	`503`	`+ * Set up capability object properties.`
`504`	`504`	`*`
`505`	`505`	`* Will set the value for the 'cap_key' property to current database table`
`506`	`506`	`* prefix, followed by 'capabilities'. Will then check to see if the`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ function WP_Http() {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
`53`		`- * PHP5 style Constructor - Setup available transport if not available.`
	`53`	`+ * PHP5 style Constructor - Set up available transport if not available.`
`54`	`54`	`*`
`55`	`55`	`* PHP4 does not have the 'self' keyword and since WordPress supports PHP4,`
`56`	`56`	`* the class needs to be used for the static call.`
`57`	`57`	`*`
`58`		`- * The transport are setup to save time. This should only be called once, so`
	`58`	`+ * The transport are set up to save time. This should only be called once, so`
`59`	`59`	`* the overhead should be fine.`
`60`	`60`	`*`
`61`	`61`	`* @since 2.7.0`
`@@ -650,7 +650,7 @@ function request($url, $args = array()) {`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`//fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,`
`653`		`- // which fails when the server is not setup for it. For compatibility, always connect to the IPv4 address.`
	`653`	`+ // which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.`
`654`	`654`	`if ( 'localhost' == strtolower($fsockopen_host) )`
`655`	`655`	`$fsockopen_host = '127.0.0.1';`
`656`	`656`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ function build_query_string() {`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`/**`
`412`		`- * Setup the WordPress Globals.`
	`412`	`+ * Set up the WordPress Globals.`
`413`	`413`	`*`
`414`	`414`	`* The query_vars property will be extracted to the GLOBALS. So care should`
`415`	`415`	`* be taken when naming global variables that might interfere with the`
`@@ -440,7 +440,7 @@ function register_globals() {`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`/**`
`443`		`- * Setup the current user.`
	`443`	`+ * Set up the current user.`
`444`	`444`	`*`
`445`	`445`	`* @since 2.0.0`
`446`	`446`	`*/`
`@@ -449,7 +449,7 @@ function init() {`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`/**`
`452`		`- * Setup the Loop based on the query variables.`
	`452`	`+ * Set up the Loop based on the query variables.`
`453`	`453`	`*`
`454`	`454`	`* @uses WP::$query_vars`
`455`	`455`	`* @since 2.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1475,7 +1475,7 @@ function wp_remote_fopen( $uri ) {`
`1475`	`1475`	`}`
`1476`	`1476`
`1477`	`1477`	`/**`
`1478`		`- * Setup the WordPress query.`
	`1478`	`+ * Set up the WordPress query.`
`1479`	`1479`	`*`
`1480`	`1480`	`* @since 2.0.0`
`1481`	`1481`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/**`
`3`		`- * Used to setup and fix common variables and include`
	`3`	`+ * Used to set up and fix common variables and include`
`4`	`4`	`* the Multisite procedural and class library.`
`5`	`5`	`*`
`6`	`6`	`* Allows for some configuration in wp-config.php (see ms-default-constants.php)`