<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13725] trunk: More pedantry.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13725">13725</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-03-17 04:39:50 +0000 (Wed, 17 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More pedantry. "Setup" is not a verb. http://notaverb.com/setup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpcronphp">trunk/wp-cron.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
<li><a href="#trunkwpincludesrssphp">trunk/wp-includes/rss.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-admin/custom-background.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the hooks for the Custom Background admin page.
</del><ins>+ * Set up the hooks for the Custom Background admin page.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the enqueue for the JavaScript files.
</del><ins>+ * Set up the enqueue for the JavaScript files.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the enqueue for the CSS files
</del><ins>+ * Set up the enqueue for the CSS files
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-admin/custom-header.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the hooks for the Custom Header admin page.
</del><ins>+ * Set up the hooks for the Custom Header admin page.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the enqueue for the JavaScript files.
</del><ins>+ * Set up the enqueue for the JavaScript files.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> */
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the enqueue for the CSS files
</del><ins>+ * Set up the enqueue for the CSS files
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-admin/includes/nav-menu.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> $menu_item->post_parent = 0;
</span><span class="cx">
</span><span class="cx"> if ( 0 == $menu_item->post_parent ) {
</span><del>- // Setup the menu item
</del><ins>+ // Set up the menu item
</ins><span class="cx"> $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
</span><span class="cx"> $attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
</span><span class="cx">
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> if ( !empty($sub_menu_items) && !is_wp_error($sub_menu_items) ) {
</span><span class="cx"> $output .= '<ul class="sub-menu menu-item-type-'. $object_type .'">';
</span><span class="cx"> foreach ( $sub_menu_items as $menu_item ) {
</span><del>- // Setup the menu item
</del><ins>+ // Set up the menu item
</ins><span class="cx"> $menu_item = wp_setup_nav_menu_item( $menu_item, $object_type, $object );
</span><span class="cx"> $attributes = ( 'backend' == $context ) ? ' id="menu-item-'. $i .'" value="'. $i .'"' : '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-cron.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-cron.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-cron.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * WordPress Cron Implementation for hosts, which do not offer CRON or for which
</span><del>- * the user has not setup a CRON job pointing to this file.
</del><ins>+ * the user has not set up a CRON job pointing to this file.
</ins><span class="cx"> *
</span><span class="cx"> * The HTTP request to this file will not slow down the visitor who happens to
</span><span class="cx"> * visit when the cron job is needed to run.
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> define('DOING_CRON', true);
</span><span class="cx">
</span><span class="cx"> if ( !defined('ABSPATH') ) {
</span><del>- /** Setup WordPress environment */
</del><ins>+ /** Set up WordPress environment */
</ins><span class="cx"> require_once('./wp-load.php');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/capabilities.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the object properties.
</del><ins>+ * Set up the object properties.
</ins><span class="cx"> *
</span><span class="cx"> * The role key is set to the current prefix for the $wpdb object with
</span><span class="cx"> * 'user_roles' appended. If the $wp_user_roles global is set, then it will
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> var $capabilities;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP4 Constructor - Setup object properties.
</del><ins>+ * PHP4 Constructor - Set up object properties.
</ins><span class="cx"> *
</span><span class="cx"> * The list of capabilities, must have the key as the name of the capability
</span><span class="cx"> * and the value a boolean of whether it is granted to the role.
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup capability object properties.
</del><ins>+ * Set up capability object properties.
</ins><span class="cx"> *
</span><span class="cx"> * Will set the value for the 'cap_key' property to current database table
</span><span class="cx"> * prefix, followed by 'capabilities'. Will then check to see if the
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/class-http.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * PHP5 style Constructor - Setup available transport if not available.
</del><ins>+ * PHP5 style Constructor - Set up available transport if not available.
</ins><span class="cx"> *
</span><span class="cx"> * PHP4 does not have the 'self' keyword and since WordPress supports PHP4,
</span><span class="cx"> * the class needs to be used for the static call.
</span><span class="cx"> *
</span><del>- * The transport are setup to save time. This should only be called once, so
</del><ins>+ * The transport are set up to save time. This should only be called once, so
</ins><span class="cx"> * the overhead should be fine.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //fsockopen has issues with 'localhost' with IPv6 with certain versions of PHP, It attempts to connect to ::1,
</span><del>- // which fails when the server is not setup for it. For compatibility, always connect to the IPv4 address.
</del><ins>+ // which fails when the server is not set up for it. For compatibility, always connect to the IPv4 address.
</ins><span class="cx"> if ( 'localhost' == strtolower($fsockopen_host) )
</span><span class="cx"> $fsockopen_host = '127.0.0.1';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/classes.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the WordPress Globals.
</del><ins>+ * Set up the WordPress Globals.
</ins><span class="cx"> *
</span><span class="cx"> * The query_vars property will be extracted to the GLOBALS. So care should
</span><span class="cx"> * be taken when naming global variables that might interfere with the
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the current user.
</del><ins>+ * Set up the current user.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the Loop based on the query variables.
</del><ins>+ * Set up the Loop based on the query variables.
</ins><span class="cx"> *
</span><span class="cx"> * @uses WP::$query_vars
</span><span class="cx"> * @since 2.0.0
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/formatting.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
</span><span class="cx"> $stop = count($textarr);
</span><span class="cx">
</span><del>- // No need to setup these variables more than once
</del><ins>+ // No need to set up these variables more than once
</ins><span class="cx"> if (!$static_setup) {
</span><span class="cx"> /* translators: opening curly quote */
</span><span class="cx"> $opening_quote = _x('&#8220;', 'opening curly quote');
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/functions.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the WordPress query.
</del><ins>+ * Set up the WordPress query.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/ms-settings.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Used to setup and fix common variables and include
</del><ins>+ * Used to set up and fix common variables and include
</ins><span class="cx"> * the Multisite procedural and class library.
</span><span class="cx"> *
</span><span class="cx"> * Allows for some configuration in wp-config.php (see ms-default-constants.php)
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/nav-menu-template.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( $menu_items as $key => $menu_item ) {
</span><del>- // Setup the $menu_item variables
</del><ins>+ // Set up the $menu_item variables
</ins><span class="cx"> $menu_item = wp_setup_nav_menu_item( $menu_item, 'frontend' );
</span><span class="cx">
</span><span class="cx"> $type = $menu_item->append;
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/query.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup The Loop with query parameters.
</del><ins>+ * Set up The Loop with query parameters.
</ins><span class="cx"> *
</span><span class="cx"> * This will override the current WordPress Loop and shouldn't be used more than
</span><span class="cx"> * once. This must not be used within the WordPress Loop.
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Destroy the previous query and setup a new query.
</del><ins>+ * Destroy the previous query and set up a new query.
</ins><span class="cx"> *
</span><span class="cx"> * This should be used after {@link query_posts()} and before another {@link
</span><span class="cx"> * query_posts()}. This will remove obscure bugs that occur when the previous
</span><del>- * wp_query object is not destroyed properly before another is setup.
</del><ins>+ * wp_query object is not destroyed properly before another is set up.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses $wp_query
</span><span class="lines">@@ -2466,7 +2466,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the next post and iterate current post index.
</del><ins>+ * Set up the next post and iterate current post index.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @access public
</span><span class="lines">@@ -2760,7 +2760,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup global post data.
</del><ins>+ * Set up global post data.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/registration.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the default contact methods
</del><ins>+ * Set up the default contact methods
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since
</span></span></pre></div>
<a id="trunkwpincludesrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rss.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rss.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/rss.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> $this->parser = $parser;
</span><span class="cx">
</span><span class="cx"> # pass in parser, and a reference to this object
</span><del>- # setup handlers
</del><ins>+ # set up handlers
</ins><span class="cx"> #
</span><span class="cx"> xml_set_object( $this->parser, $this );
</span><span class="cx"> xml_set_element_handler($this->parser,
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">
</span><span class="cx"> // else attempt a conditional get
</span><span class="cx">
</span><del>- // setup headers
</del><ins>+ // set up headers
</ins><span class="cx"> if ( $cache_status == 'STALE' ) {
</span><span class="cx"> $rss = $cache->get( $url );
</span><span class="cx"> if ( isset($rss->etag) and $rss->last_modified ) {
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup constants with default values, unless user overrides.
</del><ins>+ * Set up constants with default values, unless user overrides.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> * @package External
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/script-loader.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> require( ABSPATH . WPINC . '/functions.wp-styles.php' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup WordPress scripts to load by default for Administration Panels.
</del><ins>+ * Set up WordPress scripts to load by default for Administration Panels.
</ins><span class="cx"> *
</span><span class="cx"> * Localizes a few of the scripts.
</span><span class="cx"> * $scripts->add_data( 'script-handle', 'group', 1 ); queues the script for the footer
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/user.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup global user vars.
</del><ins>+ * Set up global user vars.
</ins><span class="cx"> *
</span><span class="cx"> * Used by set_current_user() for back compat. Might be deprecated in the
</span><span class="cx"> * future.
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> * @global string $user_pass_md5 MD5 of the user's password
</span><span class="cx"> * @global string $user_identity The display name of the user
</span><span class="cx"> *
</span><del>- * @param int $for_user_id Optional. User ID to setup global data.
</del><ins>+ * @param int $for_user_id Optional. User ID to set up global data.
</ins><span class="cx"> */
</span><span class="cx"> function setup_userdata($for_user_id = '') {
</span><span class="cx"> global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-includes/wp-db.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
</span><span class="cx"> <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>
</span><span class="cx"> </ul>
</span><del>-<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' );
</del><ins>+<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' );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/wp-settings.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Used to setup and fix common variables and include
</del><ins>+ * Used to set up and fix common variables and include
</ins><span class="cx"> * the WordPress procedural and class library.
</span><span class="cx"> *
</span><span class="cx"> * Allows for some configuration in wp-config.php (see default-constants.php)
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (13724 => 13725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-03-16 23:11:30 UTC (rev 13724)
+++ trunk/xmlrpc.php 2010-03-17 04:39:50 UTC (rev 13725)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup blog options property.
</del><ins>+ * Set up blog options property.
</ins><span class="cx"> *
</span><span class="cx"> * Passes property through 'xmlrpc_blog_options' filter.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>