<!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" />
<title>[18639] trunk/wp-includes: Fix typos in documentation (wp-includes/[i-z]).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18639">18639</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2011-09-05 19:08:15 +0000 (Mon, 05 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix typos in documentation (wp-includes/[i-z]). See <a href="http://core.trac.wordpress.org/ticket/18560">#18560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpdialogsjspopupdevjs">trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
<li><a href="#trunkwpincludesshortcodesphp">trunk/wp-includes/shortcodes.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswpdialogsjspopupdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> * Returns a window argument/parameter by name.
</span><span class="cx"> *
</span><span class="cx"> * @method getWindowArg
</span><del>- * @param {String} n Name of the window argument to retrive.
</del><ins>+ * @param {String} n Name of the window argument to retrieve.
</ins><span class="cx"> * @param {String} dv Optional default value to return.
</span><span class="cx"> * @return {String} Argument value or default value if it wasn't found.
</span><span class="cx"> */
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> * Returns a editor parameter/config option value.
</span><span class="cx"> *
</span><span class="cx"> * @method getParam
</span><del>- * @param {String} n Name of the editor config option to retrive.
</del><ins>+ * @param {String} n Name of the editor config option to retrieve.
</ins><span class="cx"> * @param {String} dv Optional default value to return.
</span><span class="cx"> * @return {String} Parameter value or default value if it wasn't found.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/l10n.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> * @param string $domain Unique identifier for retrieving translated strings
</span><span class="cx"> * @param string $abs_rel_path Optional. Relative path to ABSPATH of a folder,
</span><span class="cx"> * where the .mo file resides. Deprecated, but still functional until 2.7
</span><del>- * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precendence over $abs_rel_path
</del><ins>+ * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precedence over $abs_rel_path
</ins><span class="cx"> */
</span><span class="cx"> function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
</span><span class="cx"> $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/link-template.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -2415,7 +2415,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Inject rel=sortlink into head if a shortlink is defined for the current page.
</del><ins>+ * Inject rel=shortlink into head if a shortlink is defined for the current page.
</ins><span class="cx"> *
</span><span class="cx"> * Attached to the wp_head action.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/locale.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Stores the translated strings for 'am' and 'pm'.
</span><span class="cx"> *
</span><del>- * Also the capalized versions.
</del><ins>+ * Also the capitalized versions.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> * @var array
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/media.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Calculates the new dimentions for a downsampled image.
</del><ins>+ * Calculates the new dimensions for a downsampled image.
</ins><span class="cx"> *
</span><span class="cx"> * If either width or height are empty, no constraint is applied on
</span><span class="cx"> * that dimension.
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> $h = intval( $current_height * $ratio );
</span><span class="cx">
</span><span class="cx"> // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
</span><del>- // We also have issues with recursive calls resulting in an ever-changing result. Contraining to the result of a constraint should yield the original result.
</del><ins>+ // We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
</ins><span class="cx"> // Thus we look for dimensions that are one pixel shy of the max value and bump them up
</span><span class="cx"> if ( $did_width && $w == $max_width - 1 )
</span><span class="cx"> $w = $max_width; // Round it up
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx"> * @uses update_post_meta()
</span><span class="cx"> *
</span><span class="cx"> * @param array $attr Shortcode attributes.
</span><del>- * @param string $url The URL attempting to be embeded.
</del><ins>+ * @param string $url The URL attempting to be embedded.
</ins><span class="cx"> * @return string The embed HTML on success, otherwise the original URL.
</span><span class="cx"> */
</span><span class="cx"> function shortcode( $attr, $url = '' ) {
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> * @uses _wp_oembed_get_object()
</span><span class="cx"> * @uses WP_oEmbed::get_html()
</span><span class="cx"> *
</span><del>- * @param string $url The URL that should be embeded.
</del><ins>+ * @param string $url The URL that should be embedded.
</ins><span class="cx"> * @param array $args Addtional arguments and parameters.
</span><span class="cx"> * @return string The original URL on failure or the embed HTML on success.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/pluggable.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="cx"> $post = get_post($comment->comment_post_ID);
</span><span class="cx"> $user = get_userdata( $post->post_author );
</span><del>- // Send to the administation and to the post author if the author can modify the comment.
</del><ins>+ // Send to the administration and to the post author if the author can modify the comment.
</ins><span class="cx"> $email_to = array( get_option('admin_email') );
</span><span class="cx"> if ( user_can($user->ID, 'edit_comment', $comment_id) && !empty($user->user_email) && ( get_option('admin_email') != $user->user_email) )
</span><span class="cx"> $email_to[] = $user->user_email;
</span><span class="lines">@@ -1432,7 +1432,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Maintains compatibility between old version and the new cookie authentication
</span><span class="cx"> * protocol using PHPass library. The $hash parameter is the encrypted password
</span><del>- * and the function compares the plain text password when encypted similarly
</del><ins>+ * and the function compares the plain text password when encrypted similarly
</ins><span class="cx"> * against the already encrypted password to see if they match.
</span><span class="cx"> *
</span><span class="cx"> * For integration with other applications, this function can be overwritten to
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/plugin.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> * @param string $tag The filter hook to which the function to be removed is hooked.
</span><span class="cx"> * @param callback $function_to_remove The name of the function which should be removed.
</span><span class="cx"> * @param int $priority optional. The priority of the function (default: 10).
</span><del>- * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
</del><ins>+ * @param int $accepted_args optional. The number of arguments the function accepts (default: 1).
</ins><span class="cx"> * @return boolean Whether the function existed before it was removed.
</span><span class="cx"> */
</span><span class="cx"> function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx"> * @param string $tag The action hook to which the function to be removed is hooked.
</span><span class="cx"> * @param callback $function_to_remove The name of the function which should be removed.
</span><span class="cx"> * @param int $priority optional The priority of the function (default: 10).
</span><del>- * @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
</del><ins>+ * @param int $accepted_args optional. The number of arguments the function accepts (default: 1).
</ins><span class="cx"> * @return boolean Whether the function is removed.
</span><span class="cx"> */
</span><span class="cx"> function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> * @param string $tag Used in counting how many hooks were applied
</span><span class="cx"> * @param callback $function Used for creating unique id
</span><span class="cx"> * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
</span><del>- * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniqe id.
</del><ins>+ * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id.
</ins><span class="cx"> */
</span><span class="cx"> function _wp_filter_build_unique_id($tag, $function, $priority) {
</span><span class="cx"> global $wp_filter;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/post.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -1155,7 +1155,7 @@
</span><span class="cx"> * Builds an object with all post type labels out of a post type object
</span><span class="cx"> *
</span><span class="cx"> * Accepted keys of the label array in the post type object:
</span><del>- * - name - general name for the post type, usually plural. The same and overriden by $post_type_object->label. Default is Posts/Pages
</del><ins>+ * - name - general name for the post type, usually plural. The same and overridden by $post_type_object->label. Default is Posts/Pages
</ins><span class="cx"> * - singular_name - name for one object of this post type. Default is Post/Page
</span><span class="cx"> * - add_new - Default is Add New for both hierarchical and non-hierarchical types. When internationalizing this string, please use a {@link http://codex.wordpress.org/I18n_for_WordPress_Developers#Disambiguation_by_context gettext context} matching your post type. Example: <code>_x('Add New', 'product');</code>
</span><span class="cx"> * - add_new_item - Default is Add New Post/Add New Page
</span><span class="lines">@@ -1249,7 +1249,7 @@
</span><span class="cx"> * 'excerpt', 'page-attributes', 'thumbnail', and 'custom-fields'.
</span><span class="cx"> *
</span><span class="cx"> * Additionally, the 'revisions' feature dictates whether the post type will store revisions,
</span><del>- * and the 'comments' feature dicates whether the comments count will show on the edit screen.
</del><ins>+ * and the 'comments' feature dictates whether the comments count will show on the edit screen.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param string $post_type The post type for which to add the feature
</span><span class="lines">@@ -3269,7 +3269,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * function to traverse and return all the nested children post names of a root page.
</span><del>- * $children contains parent-chilren relations
</del><ins>+ * $children contains parent-children relations
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> */
</span><span class="lines">@@ -3911,7 +3911,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recomended to rely upon this.
</del><ins>+ if ( empty($url) ) //If any of the above options failed, Fallback on the GUID as used pre-2.7, not recommended to rely upon this.
</ins><span class="cx"> $url = get_the_guid( $post->ID );
</span><span class="cx">
</span><span class="cx"> $url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
</span><span class="lines">@@ -4466,7 +4466,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Will clean the attachment in the cache.
</span><span class="cx"> *
</span><del>- * Cleaning means delete from the cache. Optionaly will clean the term
</del><ins>+ * Cleaning means delete from the cache. Optionally will clean the term
</ins><span class="cx"> * object cache associated with the attachment ID.
</span><span class="cx"> *
</span><span class="cx"> * This function will not run if $_wp_suspend_cache_invalidation is not empty. See
</span><span class="lines">@@ -4664,7 +4664,7 @@
</span><span class="cx"> * Determines which fields of posts are to be saved in revisions.
</span><span class="cx"> *
</span><span class="cx"> * Does two things. If passed a post *array*, it will return a post array ready
</span><del>- * to be insterted into the posts table as a post revision. Otherwise, returns
</del><ins>+ * to be inserted into the posts table as a post revision. Otherwise, returns
</ins><span class="cx"> * an array whose keys are the post fields to be saved for post revisions.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/query.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -2137,7 +2137,7 @@
</span><span class="cx"> if ( intval($q['comments_popup']) )
</span><span class="cx"> $q['p'] = absint($q['comments_popup']);
</span><span class="cx">
</span><del>- // If an attachment is requested by number, let it supercede any post number.
</del><ins>+ // If an attachment is requested by number, let it supersede any post number.
</ins><span class="cx"> if ( $q['attachment_id'] )
</span><span class="cx"> $q['p'] = absint($q['attachment_id']);
</span><span class="cx">
</span><span class="lines">@@ -2288,7 +2288,7 @@
</span><span class="cx"> if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
</span><span class="cx"> $q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
</span><span class="cx"> } else {
</span><del>- $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailling slash
</del><ins>+ $q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $q['author_name'] = sanitize_title_for_query( $q['author_name'] );
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/script-loader.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> if ( empty($max_upload_size) )
</span><span class="cx"> $max_upload_size = __('not configured');
</span><span class="cx">
</span><del>- // error messagoe for both plupload and swfupload
</del><ins>+ // error message for both plupload and swfupload
</ins><span class="cx"> $uploader_l10n = array(
</span><span class="cx"> 'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
</span><span class="cx"> 'file_exceeds_size_limit' => __('This file exceeds the maximum upload size for this site.'),
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.3.1
</span><span class="cx"> *
</span><del>- * @param array $js_array JavaScript scripst array
</del><ins>+ * @param array $js_array JavaScript scripts array
</ins><span class="cx"> * @return array Reordered array, if needed.
</span><span class="cx"> */
</span><span class="cx"> function wp_prototype_before_jquery( $js_array ) {
</span></span></pre></div>
<a id="trunkwpincludesshortcodesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/shortcodes.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/shortcodes.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/shortcodes.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> * The regular expression combines the shortcode tags in the regular expression
</span><span class="cx"> * in a regex class.
</span><span class="cx"> *
</span><del>- * The regular expresion contains 6 different sub matches to help with parsing.
</del><ins>+ * The regular expression contains 6 different sub matches to help with parsing.
</ins><span class="cx"> *
</span><span class="cx"> * 1/6 - An extra [ or ] to allow for escaping shortcodes with double [[]]
</span><span class="cx"> * 2 - The shortcode name
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/taxonomy.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> * query_var - false to prevent queries, or string to customize query var
</span><span class="cx"> * (?$query_var=$term); default will use $taxonomy as query var.
</span><span class="cx"> *
</span><del>- * public - If the taxonomy should be publically queryable; //@TODO not implemented.
</del><ins>+ * public - If the taxonomy should be publicly queryable; //@TODO not implemented.
</ins><span class="cx"> * defaults to true.
</span><span class="cx"> *
</span><span class="cx"> * show_ui - If the WordPress UI admin tags UI should apply to this taxonomy;
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> * Defaults to public.
</span><span class="cx"> *
</span><span class="cx"> * show_tagcloud - false to prevent the taxonomy being listed in the Tag Cloud Widget;
</span><del>- * defaults to show_ui which defalts to public.
</del><ins>+ * defaults to show_ui which defaults to public.
</ins><span class="cx"> *
</span><span class="cx"> * 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.
</span><span class="cx"> *
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> * Builds an object with all taxonomy labels out of a taxonomy object
</span><span class="cx"> *
</span><span class="cx"> * Accepted keys of the label array in the taxonomy object:
</span><del>- * - name - general name for the taxonomy, usually plural. The same as and overriden by $tax->label. Default is Post Tags/Categories
</del><ins>+ * - name - general name for the taxonomy, usually plural. The same as and overridden by $tax->label. Default is Post Tags/Categories
</ins><span class="cx"> * - singular_name - name for one object of this taxonomy. Default is Post Tag/Category
</span><span class="cx"> * - search_items - Default is Search Tags/Search Categories
</span><span class="cx"> * - popular_items - This string isn't used on hierarchical taxonomies. Default is Popular Tags
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Sanitize Term all fields.
</span><span class="cx"> *
</span><del>- * Relys on sanitize_term_field() to sanitize the term. The difference is that
</del><ins>+ * Relies on sanitize_term_field() to sanitize the term. The difference is that
</ins><span class="cx"> * this function will sanitize <strong>all</strong> fields. The context is based
</span><span class="cx"> * on sanitize_term_field().
</span><span class="cx"> *
</span><span class="lines">@@ -1785,7 +1785,7 @@
</span><span class="cx"> * @uses wp_delete_term()
</span><span class="cx"> *
</span><span class="cx"> * @param int $cat_ID
</span><del>- * @return mixed Returns true if completes delete action; false if term doesnt exist;
</del><ins>+ * @return mixed Returns true if completes delete action; false if term doesn't exist;
</ins><span class="cx"> * Zero on attempted deletion of default Category; WP_Error object is also a possibility.
</span><span class="cx"> */
</span><span class="cx"> function wp_delete_category( $cat_ID ) {
</span><span class="lines">@@ -1810,7 +1810,7 @@
</span><span class="cx"> * 'all_with_object_id'.
</span><span class="cx"> *
</span><span class="cx"> * The fields argument also decides what will be returned. If 'all' or
</span><del>- * 'all_with_object_id' is choosen or the default kept intact, then all matching
</del><ins>+ * 'all_with_object_id' is chosen or the default kept intact, then all matching
</ins><span class="cx"> * terms objects will be returned. If either 'ids' or 'names' is used, then an
</span><span class="cx"> * array of all matching term ids or term names will be returned respectively.
</span><span class="cx"> *
</span><span class="lines">@@ -1918,7 +1918,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Adds a new term to the database. Optionally marks it as an alias of an existing term.
</span><span class="cx"> *
</span><del>- * Error handling is assigned for the nonexistance of the $taxonomy and $term
</del><ins>+ * Error handling is assigned for the nonexistence of the $taxonomy and $term
</ins><span class="cx"> * parameters before inserting. If both the term id and taxonomy exist
</span><span class="cx"> * previously, then an array will be returned that contains the term id and the
</span><span class="cx"> * contents of what is returned. The keys of the array are 'term_id' and
</span><span class="lines">@@ -2179,7 +2179,7 @@
</span><span class="cx"> * hierarchical and has a parent, it will append that parent to the $slug.
</span><span class="cx"> *
</span><span class="cx"> * If that still doesn't return an unique slug, then it try to append a number
</span><del>- * until it finds a number that is truely unique.
</del><ins>+ * until it finds a number that is truly unique.
</ins><span class="cx"> *
</span><span class="cx"> * The only purpose for $term is for appending a parent, if one exists.
</span><span class="cx"> *
</span><span class="lines">@@ -2385,7 +2385,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Updates the amount of terms in taxonomy.
</span><span class="cx"> *
</span><del>- * If there is a taxonomy callback applyed, then it will be called for updating
</del><ins>+ * If there is a taxonomy callback applied, then it will be called for updating
</ins><span class="cx"> * the count.
</span><span class="cx"> *
</span><span class="cx"> * The default action is to count what the amount of terms have the relationship
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/theme.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><del>- * @return array|string An arry of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.
</del><ins>+ * @return array|string An array of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.
</ins><span class="cx"> */
</span><span class="cx"> function get_theme_roots() {
</span><span class="cx"> global $wp_theme_directories;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/user.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -1443,8 +1443,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * A simpler way of inserting an user into the database.
</span><span class="cx"> *
</span><del>- * Creates a new user with just the username, password, and email. For a more
- * detail creation of a user, use wp_insert_user() to specify more infomation.
</del><ins>+ * Creates a new user with just the username, password, and email. For more
+ * complex user creation use wp_insert_user() to specify more information.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> * @see wp_insert_user() More complete way to create a new user
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/widgets.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $empty ) {
</span><del>- // If there are none, we register the widget's existance with a
</del><ins>+ // If there are none, we register the widget's existence with a
</ins><span class="cx"> // generic template
</span><span class="cx"> $this->_set(1);
</span><span class="cx"> $this->_register_one();
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> $settings = array();
</span><span class="cx">
</span><span class="cx"> if ( !array_key_exists('_multiwidget', $settings) ) {
</span><del>- // old format, conver if single widget
</del><ins>+ // old format, convert if single widget
</ins><span class="cx"> $settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> * The default for the name is "Sidebar #", with '#' being replaced with the
</span><span class="cx"> * number the sidebar is currently when greater than one. If first sidebar, the
</span><span class="cx"> * name will be just "Sidebar". The default for id is "sidebar-" followed by the
</span><del>- * number the sidebar creation is currently at. If the id is provided, and mutliple
</del><ins>+ * number the sidebar creation is currently at. If the id is provided, and multiple
</ins><span class="cx"> * sidebars are being defined, the id will have "-2" appended, and so on.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (18638 => 18639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2011-09-05 16:55:05 UTC (rev 18638)
+++ trunk/wp-includes/wp-db.php 2011-09-05 19:08:15 UTC (rev 18639)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> * Returns an array of WordPress tables.
</span><span class="cx"> *
</span><span class="cx"> * Also allows for the CUSTOM_USER_TABLE and CUSTOM_USER_META_TABLE to
</span><del>- * override the WordPress users and usersmeta tables that would otherwise
</del><ins>+ * override the WordPress users and usermeta tables that would otherwise
</ins><span class="cx"> * be determined by the prefix.
</span><span class="cx"> *
</span><span class="cx"> * The scope argument can take one of the following:
</span><span class="lines">@@ -1289,7 +1289,7 @@
</span><span class="cx"> * @param string $output Optional. one of ARRAY_A | ARRAY_N | OBJECT constants. Return an associative array (column => value, ...),
</span><span class="cx"> * a numerically indexed array (0 => value, ...) or an object ( ->column = value ), respectively.
</span><span class="cx"> * @param int $y Optional. Row to return. Indexed from 0.
</span><del>- * @return mixed Database query result in format specifed by $output or null on failure
</del><ins>+ * @return mixed Database query result in format specified by $output or null on failure
</ins><span class="cx"> */
</span><span class="cx"> function get_row( $query = null, $output = OBJECT, $y = 0 ) {
</span><span class="cx"> $this->func_call = "\$db->get_row(\"$query\",$output,$y)";
</span></span></pre>
</div>
</div>
</body>
</html>