Commit 26e0bfa3413 for php.net
commit 26e0bfa34138b029910c690747ffc4183f6ba3be
Author: René Schleusner <r.schleuse@gmail.com>
Date: Fri Dec 5 20:20:40 2025 +0100
Fixed some typos in docs and fpm pool config (GH-20587)
* Fix some typos in docs
* Fix typo in output header example of fpm pool config
diff --git a/docs/release-process.md b/docs/release-process.md
index 08b95df5351..e053728feb0 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -169,10 +169,10 @@ slightly different steps. We'll call attention where the steps differ.
4. Using your local-only release branch, bump the version numbers in
`main/php_version.h`, `Zend/zend.h`, `configure.ac`, and possibly
`NEWS`.
-
+
The date for NEWS should be the date of the announcement (Thursday),
*not* the date of the tagging (Tuesday).
-
+
For examples, see [Update versions for PHP 8.1.0beta3][] (for a pre-GA
example) or [Update versions for PHP 8.1.6RC1][] along with
[Update NEWS for PHP 8.1.6RC1][] (for a post-GA example).
@@ -506,8 +506,8 @@ slightly different steps. We'll call attention where the steps differ.
You can send a PR to [toot-together](https://github.com/derickr/toot-together/)
with highlights from the NEWS file yourself, if you want.
- * [Annonce 8.5.0alpha1](https://github.com/derickr/toot-together/pull/42)
- * [Annonce 8.5.0alpha2](https://github.com/derickr/toot-together/pull/47)
+ * [Announce 8.5.0alpha1](https://github.com/derickr/toot-together/pull/42)
+ * [Announce 8.5.0alpha2](https://github.com/derickr/toot-together/pull/47)
We post to [@php@fosstodon.org](https://fosstodon.org/@php).
diff --git a/docs/source/miscellaneous/stubs.rst b/docs/source/miscellaneous/stubs.rst
index 616d3068955..395034afe8d 100644
--- a/docs/source/miscellaneous/stubs.rst
+++ b/docs/source/miscellaneous/stubs.rst
@@ -489,7 +489,7 @@ generated. You can include this file conditionally, such as:
#endif
When ``@generate-legacy-arginfo`` is passed the minimum PHP version ID that needs to be supported,
-then only one arginfo file is going to be generated, and ``#if`` prepocessor directives will ensure
+then only one arginfo file is going to be generated, and ``#if`` preprocessor directives will ensure
compatibility with all the required PHP 8 versions.
PHP Version IDs are as follows: ``80000`` for PHP 8.0, ``80100`` for PHP PHP 8.1, ``80200`` for PHP
diff --git a/docs/source/miscellaneous/writing-tests.rst b/docs/source/miscellaneous/writing-tests.rst
index fd09d80f127..4c46dad638b 100644
--- a/docs/source/miscellaneous/writing-tests.rst
+++ b/docs/source/miscellaneous/writing-tests.rst
@@ -132,7 +132,7 @@ below illustrates a minimal test.
string(32) "# hello All, I sAid hi planet! #"
As you can see the file is divided into several sections. The TEST section holds a one line title of
-the phpt test, this should be a simple description and shouldn't ever excede one line, if you need
+the phpt test, this should be a simple description and shouldn't ever exceed one line, if you need
to write more explanation add comments in the body of the test case. The phpt files name is used
when generating a .php file. The FILE section is used as the body of the .php file, so don't forget
to open and close your php tags. The EXPECT section is the part used as a comparison to see if the
@@ -580,7 +580,7 @@ Example 1 (snippet):
.. code:: text
--DESCRIPTION--
- This test covers both valid and invalid usages of filter_input() with INPUT_GET and INPUT_POST data and several differnet filter sanitizers.
+ This test covers both valid and invalid usages of filter_input() with INPUT_GET and INPUT_POST data and several different filter sanitizers.
Example 1 (full): :ref:`sample001.phpt`
@@ -1310,7 +1310,7 @@ Example 1 (full): :ref:`sample017.phpt`
``--FLAKY--``
-------------
-**Description:** This section identifies this test as one that occassionally fails. If the test
+**Description:** This section identifies this test as one that occasionally fails. If the test
actually fails, it will be retried one more time, and that result will be reported. The section
should include a brief description of why the test is flaky. Reasons for this include tests that
rely on relatively precise timing, or temporary disc states. Available as of PHP 8.1.22 and 8.2.9,
@@ -1884,7 +1884,7 @@ sample001.phpt
--DESCRIPTION--
This test covers both valid and invalid usages of
filter_input() with INPUT_GET and INPUT_POST data
- and several differnt filter sanitizers.
+ and several different filter sanitizers.
--CREDITS--
Felipe Pena <felipe@php.net>
--INI--
diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in
index 69df3e66300..f39e371ea70 100644
--- a/sapi/fpm/www.conf.in
+++ b/sapi/fpm/www.conf.in
@@ -329,7 +329,7 @@ pm.max_spare_servers = 3
; it must be associated with embraces to specify the name of the header:
; - %{Content-Type}o
; - %{X-Powered-By}o
-; - %{Transfert-Encoding}o
+; - %{Transfer-Encoding}o
; - ....
; %p: PID of the child that serviced the request
; %P: PID of the parent of the child that serviced the request