Commit: 42497c72fbe85db79ae81668f9c4de6721b51cea Author: Pascal Borreli <[email protected]> Wed, 21 May 2014 22:57:36 +0100 Parents: 049a8724d53ab6394697039cd569f178fec4f560 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=42497c72fbe85db79ae81668f9c4de6721b51cea Log: Fixed typos Changed paths: M build-setup.php M error.php M git-php.php M include/prepend.inc M license/index.php M manual/add-note.php M mirroring.php M my.php M urlhowto.php Diff: diff --git a/build-setup.php b/build-setup.php index 435b00d..7928a52 100644 --- a/build-setup.php +++ b/build-setup.php @@ -45,7 +45,7 @@ site_header("Operating System Preparation", array("current" => "community")); </p> <p> The following table shows what is required for Microsoft Windows users to build PHP: -<p/> +</p> <table> <tr> <th>PHP</th> @@ -156,7 +156,7 @@ site_header("Operating System Preparation", array("current" => "community")); </ul> </p> <p> - The <i>configure</i> script has the ability to customize almost every aspect of PHP, to ellicit help at the console pass <i>--help</i> + The <i>configure</i> script has the ability to customize almost every aspect of PHP, to elicit help at the console pass <i>--help</i> as the only argument to <i>configure</i></p> <p> When <i>configure</i> executes, it saves the options passed in to a re-usable <i>config.nice</i> which executes <i>configure</i> when invoked. diff --git a/error.php b/error.php index 14423a7..46f803b 100644 --- a/error.php +++ b/error.php @@ -77,7 +77,7 @@ if (preg_match("!(.*\\.php)3$!", $URI, $array)) { // ============================================================================ // BC: handle moving english manual down into its own directory (also supports -// default language manual accessibilty on mirror sites through /manual/filename) +// default language manual accessibility on mirror sites through /manual/filename) // @todo do we rely on this? how about removing it... if (preg_match("!^manual/([^/]*)$!", $URI, $array)) { if (!isset($INACTIVE_ONLINE_LANGUAGES[$array[1]])) { @@ -221,7 +221,7 @@ $manual_page_moves = array( // entry point changed 'installation' => 'install', - // was splitted among platforms (don't know where to redirect) + // was split among platforms (don't know where to redirect) 'install.apache' => 'install', 'install.apache2' => 'install', 'install.netscape-enterprise'=> 'install', @@ -472,7 +472,7 @@ $external_redirects = array( "rest/readme.mailinglist_rules" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=README.MAILINGLIST_RULES;hb=HEAD";, "rest/readme.git-rules" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=README.GIT-RULES;hb=HEAD";, "rest/coding_standards" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=CODING_STANDARDS;hb=HEAD";, - "sunglasses" => "https://www.youtube.com/watch?v=dQw4w9WgXcQ";, // Temporary easiter egg for bug#66144 + "sunglasses" => "https://www.youtube.com/watch?v=dQw4w9WgXcQ";, // Temporary easter egg for bug#66144 ); // ============================================================================ diff --git a/git-php.php b/git-php.php index 5661f79..f193ece 100644 --- a/git-php.php +++ b/git-php.php @@ -101,7 +101,7 @@ if (count($_POST) && (!isset($_POST['purpose']) || !is_array($_POST['purpose']) ); // Error while posting if ($error) { - $error = "An error occured when trying to create the account: $error."; + $error = "An error occurred when trying to create the account: $error."; } } diff --git a/include/prepend.inc b/include/prepend.inc index ba35c69..3e50658 100644 --- a/include/prepend.inc +++ b/include/prepend.inc @@ -43,7 +43,7 @@ if (ini_get("date.timezone") === "" && function_exists("date_default_timezone_se } -/* Compatability with the PHP webserver.. */ +/* Compatibility with the PHP webserver.. */ if (!isset($_SERVER["SERVER_ADDR"])) { $_SERVER["SERVER_ADDR"] = "127.0.0.1"; } diff --git a/license/index.php b/license/index.php index 7c5e5a2..b86b403 100644 --- a/license/index.php +++ b/license/index.php @@ -85,7 +85,7 @@ site_header("License Information", array("current" => "help")); <a name="faq-lic"></a> <h2>Frequently Asked Questions</h2> -<!-- Selecetd FAQ points from former page on License Information [v 1.13] --> +<!-- Selected FAQ points from former page on License Information [v 1.13] --> <!-- Comments ref.old versions of PHP license prior to v3.0 have been removed --> <h3>Use of the "PHP" name</h3> diff --git a/manual/add-note.php b/manual/add-note.php index f4b796c..0df867d 100644 --- a/manual/add-note.php +++ b/manual/add-note.php @@ -75,7 +75,7 @@ if ($process) { $error = "Your note is too short. Trying to test the notes system? Save us the trouble of deleting your test, and don't. It works."; } - // Chek if any line is too long + // Check if any line is too long else { // Split the note by whitespace, and check length diff --git a/mirroring.php b/mirroring.php index 9a05bdb..87bed00 100644 --- a/mirroring.php +++ b/mirroring.php @@ -187,7 +187,7 @@ site_header( The other is via the SQLite3 extension. These extensions are both compiled into PHP by default. Note: Some Linux distributions disable many extensions in their package systems, including SQLite. Please make sure you install the - "php5-sqlite" (or similiar) package if using such a system. + "php5-sqlite" (or similar) package if using such a system. </p> <h2>Setup Apache VirtualHost</h2> diff --git a/my.php b/my.php index a58fda1..3902081 100644 --- a/my.php +++ b/my.php @@ -24,7 +24,7 @@ if (isset($_POST['my_lang']) && isset($langs[$_POST['my_lang']])) { unset($langs[$_POST['my_lang']]); } -// We have recevied a cookie and it is an available language +// We have received a cookie and it is an available language elseif (isset($langs[myphpnet_language()])) { // Add this as first option, selected diff --git a/urlhowto.php b/urlhowto.php index 6ae6863..80b76f9 100644 --- a/urlhowto.php +++ b/urlhowto.php @@ -81,7 +81,7 @@ function a($href) { <li>Other language pages (e.g. <?php a("oop") ?>)</li> </ul> <p> - Since there are several manual pages that could potentionally match the query + Since there are several manual pages that could potentially match the query (extension, class, function name..) you are encouraged to use their prefix/suffix: </p> <ul> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
