summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyson Andre <tysonandre775@hotmail.com>2019-10-19 12:42:57 -0400
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-19 19:19:28 +0200
commit38f388fba47bec08393486cfcb99e8aec72cb614 (patch)
tree6feb13807b671e22d5c79f3f25a5d97b2d15826c
parent550a2df0434db44586af7533fa84e284b2980827 (diff)
downloadphp-git-38f388fba47bec08393486cfcb99e8aec72cb614.tar.gz
Fix miscellaneous typos in docs
-rw-r--r--UPGRADING4
-rw-r--r--ext/intl/ERROR_CONVENTIONS.md2
-rw-r--r--ext/ldap/tests/README.md2
-rw-r--r--ext/snmp/tests/README.md2
-rw-r--r--php.ini-development2
-rw-r--r--sapi/phpdbg/xml.md2
6 files changed, 7 insertions, 7 deletions
diff --git a/UPGRADING b/UPGRADING
index f9a3828e7b..c91d90fbf7 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -673,7 +673,7 @@ PHP 7.4 UPGRADE NOTES
generated for exceptions.
- opcache.preload_user
- . New INI directive to specifiy the user account under which preloading code
+ . New INI directive to specify the user account under which preloading code
is executed, if it was to be run as root otherwise (which is not allowed
for security reasons).
@@ -702,7 +702,7 @@ PHP 7.4 UPGRADE NOTES
- The OpenSSL default config path has been changed to
"C:\Program Files\Common Files\SSL\openssl.cnf" and
- "C:\Program Files (x86)\Common Files\SSL\openssl.cnf", repectively.
+ "C:\Program Files (x86)\Common Files\SSL\openssl.cnf", respectively.
========================================
13. Migration to pkg-config
diff --git a/ext/intl/ERROR_CONVENTIONS.md b/ext/intl/ERROR_CONVENTIONS.md
index 9ba05ba712..863b9f1b8d 100644
--- a/ext/intl/ERROR_CONVENTIONS.md
+++ b/ext/intl/ERROR_CONVENTIONS.md
@@ -106,7 +106,7 @@ Example:
```c
U_CFUNC PHP_FUNCTION(breakiter_set_text)
{
- /* ... variable declations ... */
+ /* ... variable declarations ... */
BREAKITER_METHOD_INIT_VARS; /* macro also resets global error */
object = getThis();
diff --git a/ext/ldap/tests/README.md b/ext/ldap/tests/README.md
index ef96f7b3c1..77b55e9e04 100644
--- a/ext/ldap/tests/README.md
+++ b/ext/ldap/tests/README.md
@@ -51,7 +51,7 @@ end
```
Now you will have a virtual machine up and running on IP-Address `192.168.10.33`
-listening on port 369 for incomming LDAP-connections. The machine is already
+listening on port 369 for incoming LDAP-connections. The machine is already
configured to execute the LDAP-Tests.
The next step is to go into the PHP-Source-directory. Configure and make the
diff --git a/ext/snmp/tests/README.md b/ext/snmp/tests/README.md
index ce6bf2d4dc..819d43e12d 100644
--- a/ext/snmp/tests/README.md
+++ b/ext/snmp/tests/README.md
@@ -39,7 +39,7 @@ in `snmp_include.inc`.
`/usr/local/etc/snmp/snmpd.conf` on FreeBSD) with `snmpd.conf` supplied.
Before launching daemon make sure that there is no file
-`/var/net-snmp/snmpd.conf`. Delete it if exists. Ingoring to to so will fail
+`/var/net-snmp/snmpd.conf`. Delete it if exists. Forgetting to do so will fail
SNMPv3 tests.
* Place `ext/snmp/tests/bigtest` near `snmpd.conf`, tune path to it in
diff --git a/php.ini-development b/php.ini-development
index 7c8649d4c7..3aefcd071d 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1940,7 +1940,7 @@ ldap.max_links = -1
;openssl.capath=
[ffi]
-; FFI API restriction. Possibe values:
+; FFI API restriction. Possible values:
; "preload" - enabled in CLI scripts and preloaded files (default)
; "false" - always disabled
; "true" - always enabled
diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md
index 3fff8d2bc1..b62b479cee 100644
--- a/sapi/phpdbg/xml.md
+++ b/sapi/phpdbg/xml.md
@@ -516,7 +516,7 @@ set
### prompt ###
-- without other args, a &lt;setpromt str="" /> tag is emitted where the value of the str attribue is the value of the prompt
+- without other args, a &lt;setpromt str="" /> tag is emitted where the value of the str attribute is the value of the prompt
- when there is another arg, the prompt is changed to that arg, no further xml answer
### break ###