Skip to content

Commit 0436bc8

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix miscellaneous typos in docs
2 parents 23f3b54 + 38f388f commit 0436bc8

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

ext/intl/ERROR_CONVENTIONS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Example:
106106
```c
107107
U_CFUNC PHP_FUNCTION(breakiter_set_text)
108108
{
109-
/* ... variable declations ... */
109+
/* ... variable declarations ... */
110110
BREAKITER_METHOD_INIT_VARS; /* macro also resets global error */
111111
object = getThis();
112112

ext/ldap/tests/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ end
5151
```
5252

5353
Now you will have a virtual machine up and running on IP-Address `192.168.10.33`
54-
listening on port 369 for incomming LDAP-connections. The machine is already
54+
listening on port 369 for incoming LDAP-connections. The machine is already
5555
configured to execute the LDAP-Tests.
5656

5757
The next step is to go into the PHP-Source-directory. Configure and make the

ext/snmp/tests/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ in `snmp_include.inc`.
3939
`/usr/local/etc/snmp/snmpd.conf` on FreeBSD) with `snmpd.conf` supplied.
4040

4141
Before launching daemon make sure that there is no file
42-
`/var/net-snmp/snmpd.conf`. Delete it if exists. Ingoring to to so will fail
42+
`/var/net-snmp/snmpd.conf`. Delete it if exists. Forgetting to do so will fail
4343
SNMPv3 tests.
4444

4545
* Place `ext/snmp/tests/bigtest` near `snmpd.conf`, tune path to it in

php.ini-development

+1-1
Original file line numberDiff line numberDiff line change
@@ -1910,7 +1910,7 @@ ldap.max_links = -1
19101910
;openssl.capath=
19111911

19121912
[ffi]
1913-
; FFI API restriction. Possibe values:
1913+
; FFI API restriction. Possible values:
19141914
; "preload" - enabled in CLI scripts and preloaded files (default)
19151915
; "false" - always disabled
19161916
; "true" - always enabled

sapi/phpdbg/xml.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ set
516516

517517
### prompt ###
518518

519-
- without other args, a <setpromt str="" /> tag is emitted where the value of the str attribue is the value of the prompt
519+
- without other args, a <setpromt str="" /> tag is emitted where the value of the str attribute is the value of the prompt
520520
- when there is another arg, the prompt is changed to that arg, no further xml answer
521521

522522
### break ###

0 commit comments

Comments
 (0)