diff --git a/appendices/migration53.xml b/appendices/migration53.xml index 1ecc4bf548..7591a6e8e7 100644 --- a/appendices/migration53.xml +++ b/appendices/migration53.xml @@ -2246,7 +2246,7 @@ try { The standard &php.ini; files have been re-organized and renamed. - php.ini-development contains settings recommded + php.ini-development contains settings recommended for use in development environments. php.ini-production contains settings recommended for use in production environments. diff --git a/appendices/migration54.xml b/appendices/migration54.xml index 3e121841ff..2d32442330 100644 --- a/appendices/migration54.xml +++ b/appendices/migration54.xml @@ -1,6 +1,6 @@ - + Migrating from PHP 5.3.x to PHP 5.4.x diff --git a/appendices/migration55.xml b/appendices/migration55.xml index cc7204d17c..47b8afde1e 100644 --- a/appendices/migration55.xml +++ b/appendices/migration55.xml @@ -1,6 +1,6 @@ - + Migrating from PHP 5.4.x to PHP 5.5.x diff --git a/appendices/migration73/incompatible.xml b/appendices/migration73/incompatible.xml index 44cac7264a..33635cb70c 100644 --- a/appendices/migration73/incompatible.xml +++ b/appendices/migration73/incompatible.xml @@ -74,7 +74,7 @@ while ($foo) { $obj->offsetGet("123") will be called instead of $obj->offsetGet(123). This matches existing behavior for non-literals. The behavior of arrays is not affected in any way, they - continue to implicitly convert integeral string keys to integers. + continue to implicitly convert integral string keys to integers. diff --git a/appendices/reserved.constants.xml b/appendices/reserved.constants.xml index b5f0aee62a..9842536fd7 100644 --- a/appendices/reserved.constants.xml +++ b/appendices/reserved.constants.xml @@ -2,7 +2,7 @@ diff --git a/chmonly/search.xml b/chmonly/search.xml index 274518d6a5..e6d0dc5606 100644 --- a/chmonly/search.xml +++ b/chmonly/search.xml @@ -247,7 +247,7 @@ The manual content and the user notes are separated to php_manual_LANG.chm and - php_manual_notes.chm. There were several resons + php_manual_notes.chm. There were several reasons to do this, including: diff --git a/features/commandline.xml b/features/commandline.xml index 4ae7b567a6..fb9bcaae7a 100644 --- a/features/commandline.xml +++ b/features/commandline.xml @@ -139,7 +139,7 @@ &false; Defaults to &false;, as it can be quite hard to read error messages - in the shell enviroment when they are cluttered up with uninterpreted + in the shell environment when they are cluttered up with uninterpreted HTML tags. @@ -660,7 +660,7 @@ array(370) { experienced - if appropriate, a bug report should be opened at &url.php.bugs;. It is still easy to run into trouble when trying to use variables - (shell or PHP) in commnad-line code, or using backslashes for + (shell or PHP) in command-line code, or using backslashes for escaping, so take great care when doing so. You have been warned! diff --git a/install/fpm/configuration.xml b/install/fpm/configuration.xml index 1a05a58336..c8574eddb1 100644 --- a/install/fpm/configuration.xml +++ b/install/fpm/configuration.xml @@ -758,7 +758,7 @@ php_admin_value[memory_limit] = 32M Settings defined with php_admin_value and php_admin_flag - cannot be overriden with ini_set. + cannot be overridden with ini_set. As of 5.3.3, PHP settings are also possible to be set in webserver. diff --git a/install/unix/index.xml b/install/unix/index.xml index f3747bf922..b358983cef 100644 --- a/install/unix/index.xml +++ b/install/unix/index.xml @@ -128,7 +128,7 @@ explanations running ./configure --help. Our manual documents the different options separately. You will find the core options in the appendix, - while the different extension specific options are descibed on the + while the different extension specific options are described on the reference pages. diff --git a/install/unix/nginx.xml b/install/unix/nginx.xml index b0499e2a7a..6d82aca8d1 100644 --- a/install/unix/nginx.xml +++ b/install/unix/nginx.xml @@ -33,7 +33,7 @@ - It is recomended that you visit the Nginx Wiki + It is recommended that you visit the Nginx Wiki install page in order to obtain and install Nginx on your system. diff --git a/install/windows/legacy/sambar.xml b/install/windows/legacy/sambar.xml index d27980b663..cc4325d98e 100644 --- a/install/windows/legacy/sambar.xml +++ b/install/windows/legacy/sambar.xml @@ -60,7 +60,7 @@ account used by the Sambar Server Service. The default account used for the Sambar Server Service is LocalSystem which will not have access to remote resources. The account can be amended by using the Services - option from within the Windows Control Panel Administation Tools. + option from within the Windows Control Panel Administration Tools. diff --git a/language-snippets.ent b/language-snippets.ent index ea812a449c..02c9f9caf9 100644 --- a/language-snippets.ent +++ b/language-snippets.ent @@ -658,7 +658,7 @@ font_indexA font resource, returned by