<!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>[18632] trunk/wp-admin: Fix typos in documentation (wp-admin/).</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/18632">18632</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2011-09-03 14:18:10 +0000 (Sat, 03 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix typos in documentation (wp-admin/). See <a href="http://core.trac.wordpress.org/ticket/18560">#18560</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditformcommentphp">trunk/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystembasephp">trunk/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemssh2php">trunk/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformcommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-comment.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-comment.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/edit-form-comment.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="misc-pub-section curtime misc-pub-section-last">
</span><span class="cx"> <?php
</span><del>-// translators: Publish box date formt, see http://php.net/date
</del><ins>+// translators: Publish box date format, see http://php.net/date
</ins><span class="cx"> $datef = __( 'M j, Y @ G:i' );
</span><span class="cx"> $stamp = __('Submitted on: <b>%1$s</b>');
</span><span class="cx"> $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-base.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-base.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-filesystem-base.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -153,12 +153,12 @@
</span><span class="cx"> if ( defined($constant) && $folder === $dir )
</span><span class="cx"> return trailingslashit(constant($constant));
</span><span class="cx"> } elseif ( 'direct' == $this->method ) {
</span><del>- $folder = str_replace('\\', '/', $folder); //Windows path sanitiation
</del><ins>+ $folder = str_replace('\\', '/', $folder); //Windows path sanitisation
</ins><span class="cx"> return trailingslashit($folder);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
- $folder = str_replace('\\', '/', $folder); //Windows path sanitiation
</del><ins>+ $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows drive letter if it's there.
+ $folder = str_replace('\\', '/', $folder); //Windows path sanitisation
</ins><span class="cx">
</span><span class="cx"> if ( isset($this->cache[ $folder ] ) )
</span><span class="cx"> return $this->cache[ $folder ];
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( $loop )
</span><span class="cx"> return false; //Prevent this function from looping again.
</span><del>- //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
</del><ins>+ //As an extra last resort, Change back to / if the folder wasn't found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
</ins><span class="cx"> return $this->search_for_folder($folder, '/', true);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $file Path to the file.
</span><span class="cx"> * @param mixed $group A group name or number.
</span><del>- * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chgrp($file, $group, $recursive = false) {
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $file Path to the file.
</span><span class="cx"> * @param int $mode (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
</span><del>- * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param bool $recursive (optional) If set True changes file group recursively. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chmod($file, $mode = false, $recursive = false) {
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $file Path to the file.
</span><span class="cx"> * @param mixed $owner A user name or number.
</span><del>- * @param bool $recursive (optional) If set True changes file owner recursivly. Defaults to False.
</del><ins>+ * @param bool $recursive (optional) If set True changes file owner recursively. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chown($file, $owner, $recursive = false) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $pwd = @ftp_pwd($this->link);
</span><del>- if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesnt exist
</del><ins>+ if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
</ins><span class="cx"> return false;
</span><span class="cx"> $list = @ftp_rawlist($this->link, '-a', false);
</span><span class="cx"> @ftp_chdir($this->link, $pwd);
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ssh2.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-filesystem-ssh2.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function touch($file, $time = 0, $atime = 0) {
</span><del>- //Not implmented.
</del><ins>+ //Not implemented.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> *
</span><span class="cx"> * @param array $actions The list of actions
</span><del>- * @param bool $always_visible Wether the actions should be always visible
</del><ins>+ * @param bool $always_visible Whether the actions should be always visible
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function row_actions( $actions, $always_visible = false ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $clear_destination ) {
</span><del>- //We're going to clear the destination if theres something there
</del><ins>+ //We're going to clear the destination if there's something there
</ins><span class="cx"> $this->skin->feedback('remove_old');
</span><span class="cx"> $removed = true;
</span><span class="cx"> if ( $wp_filesystem->exists($remote_destination) )
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> else if ( ! $removed )
</span><span class="cx"> return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
</span><span class="cx"> } elseif ( $wp_filesystem->exists($remote_destination) ) {
</span><del>- //If we're not clearing the destination folder and something exists there allready, Bail.
</del><ins>+ //If we're not clearing the destination folder and something exists there already, Bail.
</ins><span class="cx"> //But first check to see if there are actually any files in the folder.
</span><span class="cx"> $_files = $wp_filesystem->dirlist($remote_destination);
</span><span class="cx"> if ( ! empty($_files) ) {
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> $delete_package = ($download != $package); // Do not delete a "local" file
</span><span class="cx">
</span><del>- //Unzip's the file into a temporary directory
</del><ins>+ //Unzips the file into a temporary directory
</ins><span class="cx"> $working_dir = $this->unpack_package( $download, $delete_package );
</span><span class="cx"> if ( is_wp_error($working_dir) ) {
</span><span class="cx"> $this->skin->error($working_dir);
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> $this->skin->error($result);
</span><span class="cx"> $this->skin->feedback('process_failed');
</span><span class="cx"> } else {
</span><del>- //Install Suceeded
</del><ins>+ //Install Succeeded
</ins><span class="cx"> $this->skin->feedback('process_success');
</span><span class="cx"> }
</span><span class="cx"> $this->skin->after();
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
</span><span class="cx"> add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
</span><del>- //'source_selection' => array(&$this, 'source_selection'), //theres a track ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
</del><ins>+ //'source_selection' => array(&$this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
</ins><span class="cx">
</span><span class="cx"> $this->run(array(
</span><span class="cx"> 'package' => $r->package,
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> )
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- // Cleanup our hooks, incase something else does a upgrade on this connection.
</del><ins>+ // Cleanup our hooks, in case something else does a upgrade on this connection.
</ins><span class="cx"> remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
</span><span class="cx"> remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
</span><span class="cx">
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx">
</span><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><del>- // Cleanup our hooks, incase something else does a upgrade on this connection.
</del><ins>+ // Cleanup our hooks, in case something else does a upgrade on this connection.
</ins><span class="cx"> remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
</span><span class="cx">
</span><span class="cx"> // Force refresh of plugin update information
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx">
</span><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><del>- // Cleanup our hooks, incase something else does a upgrade on this connection.
</del><ins>+ // Cleanup our hooks, in case something else does a upgrade on this connection.
</ins><span class="cx"> remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
</span><span class="cx"> remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
</span><span class="cx"> remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> return $return;
</span><span class="cx">
</span><span class="cx"> //Ensure stylesheet name hasnt changed after the upgrade:
</span><del>- // @TODO: Note, This doesnt handle the Template changing, or the Template name changing.
</del><ins>+ // @TODO: Note, This doesn't handle the Template changing, or the Template name changing.
</ins><span class="cx"> if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
</span><span class="cx"> $theme_info = $this->theme_info();
</span><span class="cx"> $stylesheet = $this->result['destination_name'];
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combiantion with the wp-admin/includes/update-core.php file
</del><ins>+ * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combination with the wp-admin/includes/update-core.php file
</ins><span class="cx"> *
</span><span class="cx"> * @TODO More Detailed docs, for methods as well.
</span><span class="cx"> *
</span><span class="lines">@@ -1562,4 +1562,4 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/dashboard.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -1023,7 +1023,7 @@
</span><span class="cx"> * Checks to see if all of the feed url in $check_urls are cached.
</span><span class="cx"> *
</span><span class="cx"> * If $check_urls is empty, look for the rss feed url found in the dashboard
</span><del>- * widget optios of $widget_id. If cached, call $callback, a function that
</del><ins>+ * widget options of $widget_id. If cached, call $callback, a function that
</ins><span class="cx"> * echoes out output for this widget. If not cache, echo a "Loading..." stub
</span><span class="cx"> * which is later replaced by AJAX call (see top of /wp-admin/index.php)
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/deprecated.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -37,7 +37,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"> * @since 2.0.0
</span><span class="cx"> * @deprecated 3.0.0
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/file.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Handle sideloads, which is the process of retriving a media item from another server instead of
</del><ins>+ * Handle sideloads, which is the process of retrieving a media item from another server instead of
</ins><span class="cx"> * a traditional media upload. This process involves sanitizing the filename, checking extensions
</span><span class="cx"> * for mime type, and moving the file to the appropriate directory within the uploads directory.
</span><span class="cx"> *
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Unzip's a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
</del><ins>+ * Unzips a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
</ins><span class="cx"> * Assumes that WP_Filesystem() has already been called and set up. Does not extract a root-level __MACOSX directory, if present.
</span><span class="cx"> *
</span><span class="cx"> * Attempts to increase the PHP Memory limit to 256M before uncompressing,
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !$wp_filesystem->connect() )
</span><del>- return false; //There was an erorr connecting to the server.
</del><ins>+ return false; //There was an error connecting to the server.
</ins><span class="cx">
</span><span class="cx"> // Set the permission constants if not already set.
</span><span class="cx"> if ( ! defined('FS_CHMOD_DIR') )
</span><span class="lines">@@ -846,7 +846,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Determines which Filesystem Method to use.
</span><del>- * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsoxkopen())
</del><ins>+ * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsockopen())
</ins><span class="cx"> *
</span><span class="cx"> * Note that the return value of this function can be overridden in 2 ways
</span><span class="cx"> * - By defining FS_METHOD in your <code>wp-config.php</code> file
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/image.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Calculated the new dimentions for a downsampled image.
</del><ins>+ * Calculated the new dimensions for a downsampled image.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> * @see wp_constrain_dimensions()
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/meta-boxes.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> </div><?php // /misc-pub-section ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-// translators: Publish box date formt, see http://php.net/date
</del><ins>+// translators: Publish box date format, see http://php.net/date
</ins><span class="cx"> $datef = __( 'M j, Y @ G:i' );
</span><span class="cx"> if ( 0 != $post->ID ) {
</span><span class="cx"> if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/plugin-install.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> $args->per_page = 24;
</span><span class="cx">
</span><span class="cx"> // Allows a plugin to override the WordPress.org API entirely.
</span><del>- // Use the filter 'plugins_api_result' to mearly add results.
</del><ins>+ // Use the filter 'plugins_api_result' to merely add results.
</ins><span class="cx"> // Please ensure that a object is returned from the following filters.
</span><span class="cx"> $args = apply_filters('plugins_api_args', $args, $action);
</span><span class="cx"> $res = apply_filters('plugins_api', false, $action, $args);
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if ( is_wp_error($api_tags) ) {
</span><span class="cx"> echo $api_tags->get_error_message();
</span><span class="cx"> } else {
</span><del>- //Set up the tags in a way which can be interprated by wp_generate_tag_cloud()
</del><ins>+ //Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
</ins><span class="cx"> $tags = array();
</span><span class="cx"> foreach ( (array)$api_tags as $tag )
</span><span class="cx"> $tags[ $tag['name'] ] = (object) array(
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function install_plugin_install_status($api, $loop = false) {
</span><del>- // this function is called recursivly, $loop prevents futhur loops.
</del><ins>+ // this function is called recursively, $loop prevents further loops.
</ins><span class="cx"> if ( is_array($api) )
</span><span class="cx"> $api = (object) $api;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/post.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
</span><span class="cx">
</span><span class="cx"> // Reunite any orphaned attachments with their parent
</span><del>- // Does this need to be udpated? ~ Mark
</del><ins>+ // Does this need to be updated? ~ Mark
</ins><span class="cx"> if ( !$draft_ids = get_user_option( 'autosave_draft_ids' ) )
</span><span class="cx"> $draft_ids = array();
</span><span class="cx"> if ( $draft_temp_id = (int) array_search( $post_ID, $draft_ids ) )
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/template.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> // If no priority given and id already present, use existing priority
</span><span class="cx"> if ( empty($priority) ) {
</span><span class="cx"> $priority = $a_priority;
</span><del>- // else if we're adding to the sorted priortiy, we don't know the title or callback. Glab them from the previously added context/priority.
</del><ins>+ // else if we're adding to the sorted priority, we don't know the title or callback. Grab them from the previously added context/priority.
</ins><span class="cx"> } elseif ( 'sorted' == $priority ) {
</span><span class="cx"> $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
</span><span class="cx"> $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> * do_settings_fields() in do_settings-sections()
</span><span class="cx"> *
</span><span class="cx"> * The $callback argument should be the name of a function that echoes out the
</span><del>- * html input tags for this setting field. Use get_option() to retrive existing
</del><ins>+ * html input tags for this setting field. Use get_option() to retrieve existing
</ins><span class="cx"> * values to show.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx"> * @param string $title Formatted title of the field. Shown as the label for the field during output.
</span><span class="cx"> * @param string $callback Function that fills the field with the desired form inputs. The function should echo its output.
</span><span class="cx"> * @param string $page The slug-name of the settings page on which to show the section (general, reading, writing, ...).
</span><del>- * @param string $section The slug-name of the section of the settingss page in which to show the box (default, ...).
</del><ins>+ * @param string $section The slug-name of the section of the settings page in which to show the box (default, ...).
</ins><span class="cx"> * @param array $args Additional arguments
</span><span class="cx"> */
</span><span class="cx"> function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
</span><span class="lines">@@ -1274,7 +1274,7 @@
</span><span class="cx"> sanitize_option( $setting, get_option($setting));
</span><span class="cx">
</span><span class="cx"> // If settings were passed back from options.php then use them
</span><del>- // Ignore transients if $sanitize is true, we dont' want the old values anyway
</del><ins>+ // Ignore transients if $sanitize is true, we don't want the old values anyway
</ins><span class="cx"> if ( isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors') ) {
</span><span class="cx"> $settings_errors = get_transient('settings_errors');
</span><span class="cx"> delete_transient('settings_errors');
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> * false otherwise. Defaults to true
</span><span class="cx"> * @param array|string $other_attributes Other attributes that should be output with the button,
</span><span class="cx"> * mapping attributes to their values, such as array( 'tabindex' => '1' ).
</span><del>- * These attributes will be ouput as attribute="value", such as tabindex="1".
</del><ins>+ * These attributes will be output as attribute="value", such as tabindex="1".
</ins><span class="cx"> * Defaults to no other attributes. Other attributes can also be provided as a
</span><span class="cx"> * string such as 'tabindex="1"', though the array format is typically cleaner.
</span><span class="cx"> */
</span><span class="lines">@@ -2180,7 +2180,7 @@
</span><span class="cx"> * false otherwise. Defaults to true
</span><span class="cx"> * @param array|string $other_attributes Other attributes that should be output with the button,
</span><span class="cx"> * mapping attributes to their values, such as array( 'tabindex' => '1' ).
</span><del>- * These attributes will be ouput as attribute="value", such as tabindex="1".
</del><ins>+ * These attributes will be output as attribute="value", such as tabindex="1".
</ins><span class="cx"> * Defaults to no other attributes. Other attributes can also be provided as a
</span><span class="cx"> * string such as 'tabindex="1"', though the array format is typically cleaner.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/update.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * Get available core updates
</span><span class="cx"> *
</span><span class="cx"> * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,
</span><del>- * set $options['available'] to false to skip not-dimissed updates.
</del><ins>+ * set $options['available'] to false to skip not-dismissed updates.
</ins><span class="cx"> * @return array Array of the update objects
</span><span class="cx"> */
</span><span class="cx"> function get_core_updates( $options = array() ) {
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/upgrade.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx">
</span><span class="cx"> if (!$got_gmt_fields) {
</span><span class="cx">
</span><del>- // Add or substract time to all dates, to get GMT dates
</del><ins>+ // Add or subtract time to all dates, to get GMT dates
</ins><span class="cx"> $add_hours = intval($diff_gmt_weblogger);
</span><span class="cx"> $add_minutes = intval(60 * ($diff_gmt_weblogger - $add_hours));
</span><span class="cx"> $wpdb->query("UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
</span><span class="lines">@@ -1607,7 +1607,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Copy files from the old locations to the site theme.
</span><del>- // TODO: This does not copy arbitarary include dependencies. Only the
</del><ins>+ // TODO: This does not copy arbitrary include dependencies. Only the
</ins><span class="cx"> // standard WP files are copied.
</span><span class="cx"> $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/user.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Simple function who's main purpose is to allow filtering of the
</span><span class="cx"> * list of roles in the $wp_roles object so that plugins can remove
</span><del>- * innappropriate ones depending on the situation or user making edits.
</del><ins>+ * inappropriate ones depending on the situation or user making edits.
</ins><span class="cx"> * Specifically because without filtering anyone with the edit_users
</span><span class="cx"> * capability can edit others to be administrators, even if they are
</span><span class="cx"> * only editors or authors. This filter allows admins to delegate
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> if ( ! get_user_option('default_password_nag') ) //Short circuit it.
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- //get_user_setting = JS saved UI setting. else no-js-falback code.
</del><ins>+ //get_user_setting = JS saved UI setting. else no-js-fallback code.
</ins><span class="cx"> if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
</span><span class="cx"> delete_user_setting('default_password_nag');
</span><span class="cx"> update_user_option($user_ID, 'default_password_nag', false, true);
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/includes/widgets.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> $query_arg['key'] = $key;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // We aren't showing a widget control, we're outputing a template for a mult-widget control
</del><ins>+ // We aren't showing a widget control, we're outputting a template for a multi-widget control
</ins><span class="cx"> if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
</span><span class="cx"> // number == -1 implies a template where id numbers are replaced by a generic '__i__'
</span><span class="cx"> $control['params'][0]['number'] = -1;
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (18631 => 18632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2011-09-03 03:01:11 UTC (rev 18631)
+++ trunk/wp-admin/menu.php 2011-09-03 14:18:10 UTC (rev 18632)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> $submenu['themes.php'][10] = array(__('Menus'), 'edit_theme_options', 'nav-menus.php' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Add 'Editor' to the bottom of the Appearence menu.
</del><ins>+// Add 'Editor' to the bottom of the Appearance menu.
</ins><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> add_action('admin_menu', '_add_themes_utility_last', 101);
</span><span class="cx"> function _add_themes_utility_last() {
</span></span></pre>
</div>
</div>
</body>
</html>