Skip to content

Commit 26e0bfa

Browse files
authored
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
1 parent 4cc5f02 commit 26e0bfa

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

docs/release-process.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ slightly different steps. We'll call attention where the steps differ.
169169
4. Using your local-only release branch, bump the version numbers in
170170
`main/php_version.h`, `Zend/zend.h`, `configure.ac`, and possibly
171171
`NEWS`.
172-
172+
173173
The date for NEWS should be the date of the announcement (Thursday),
174174
*not* the date of the tagging (Tuesday).
175-
175+
176176
For examples, see [Update versions for PHP 8.1.0beta3][] (for a pre-GA
177177
example) or [Update versions for PHP 8.1.6RC1][] along with
178178
[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.
506506
You can send a PR to [toot-together](https://github.com/derickr/toot-together/)
507507
with highlights from the NEWS file yourself, if you want.
508508
509-
* [Annonce 8.5.0alpha1](https://github.com/derickr/toot-together/pull/42)
510-
* [Annonce 8.5.0alpha2](https://github.com/derickr/toot-together/pull/47)
509+
* [Announce 8.5.0alpha1](https://github.com/derickr/toot-together/pull/42)
510+
* [Announce 8.5.0alpha2](https://github.com/derickr/toot-together/pull/47)
511511
512512
We post to [@[email protected]](https://fosstodon.org/@php).
513513

docs/source/miscellaneous/stubs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ generated. You can include this file conditionally, such as:
489489
#endif
490490
491491
When ``@generate-legacy-arginfo`` is passed the minimum PHP version ID that needs to be supported,
492-
then only one arginfo file is going to be generated, and ``#if`` prepocessor directives will ensure
492+
then only one arginfo file is going to be generated, and ``#if`` preprocessor directives will ensure
493493
compatibility with all the required PHP 8 versions.
494494

495495
PHP Version IDs are as follows: ``80000`` for PHP 8.0, ``80100`` for PHP PHP 8.1, ``80200`` for PHP

docs/source/miscellaneous/writing-tests.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ below illustrates a minimal test.
132132
string(32) "# hello All, I sAid hi planet! #"
133133
134134
As you can see the file is divided into several sections. The TEST section holds a one line title of
135-
the phpt test, this should be a simple description and shouldn't ever excede one line, if you need
135+
the phpt test, this should be a simple description and shouldn't ever exceed one line, if you need
136136
to write more explanation add comments in the body of the test case. The phpt files name is used
137137
when generating a .php file. The FILE section is used as the body of the .php file, so don't forget
138138
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):
580580
.. code:: text
581581
582582
--DESCRIPTION--
583-
This test covers both valid and invalid usages of filter_input() with INPUT_GET and INPUT_POST data and several differnet filter sanitizers.
583+
This test covers both valid and invalid usages of filter_input() with INPUT_GET and INPUT_POST data and several different filter sanitizers.
584584
585585
Example 1 (full): :ref:`sample001.phpt`
586586

@@ -1310,7 +1310,7 @@ Example 1 (full): :ref:`sample017.phpt`
13101310
``--FLAKY--``
13111311
-------------
13121312

1313-
**Description:** This section identifies this test as one that occassionally fails. If the test
1313+
**Description:** This section identifies this test as one that occasionally fails. If the test
13141314
actually fails, it will be retried one more time, and that result will be reported. The section
13151315
should include a brief description of why the test is flaky. Reasons for this include tests that
13161316
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
18841884
--DESCRIPTION--
18851885
This test covers both valid and invalid usages of
18861886
filter_input() with INPUT_GET and INPUT_POST data
1887-
and several differnt filter sanitizers.
1887+
and several different filter sanitizers.
18881888
--CREDITS--
18891889
Felipe Pena <felipe@php.net>
18901890
--INI--

sapi/fpm/www.conf.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ pm.max_spare_servers = 3
329329
; it must be associated with embraces to specify the name of the header:
330330
; - %{Content-Type}o
331331
; - %{X-Powered-By}o
332-
; - %{Transfert-Encoding}o
332+
; - %{Transfer-Encoding}o
333333
; - ....
334334
; %p: PID of the child that serviced the request
335335
; %P: PID of the parent of the child that serviced the request

0 commit comments

Comments
 (0)