diff options
| author | Veres Lajos <vlajos@gmail.com> | 2014-02-14 17:16:17 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-02-14 17:16:17 +0200 |
| commit | a7ec000f3526076fce684557bee0324a3f8b70ad (patch) | |
| tree | fc319990ed875f4946f741d96fe3376b1715a539 /sapi | |
| parent | 23d952ed60766be772fe72dcdc61407c6231dc18 (diff) | |
| download | php-git-a7ec000f3526076fce684557bee0324a3f8b70ad.tar.gz | |
a few typofixes
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/tests/apparmor.phpt | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_help.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/fpm/tests/apparmor.phpt b/sapi/fpm/tests/apparmor.phpt index cf9bd71118..e0f051998f 100644 --- a/sapi/fpm/tests/apparmor.phpt +++ b/sapi/fpm/tests/apparmor.phpt @@ -3,7 +3,7 @@ FPM: Apparmor Test --DESCRIPTION-- This test tries to launches a pool which tries to change to non existing apparmor hat a. Test succeeds if apparmor is not running or hat is non -existant. +existent. --SKIPIF-- <?php include "skipif.inc"; @@ -39,7 +39,7 @@ EOT; - failed to change to new confinement something in apparmor went wrong - exited with code 70 - Change to successful; Hat not existant (Process gets killed by apparmor) + Change to successful; Hat not existent (Process gets killed by apparmor) */ var_dump(run_fpm_till('/(SIGSEGV|failed to query apparmor confinement|failed to change to new confinement|exited with code 70)/', $cfg)); diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index a02cb41c14..d2fea8d7c7 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -268,7 +268,7 @@ PHPDBG_HELP(break) /* {{{ */ phpdbg_writeln(EMPTY); phpdbg_writeln("\t%sbreak op ZEND_ADD", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sb O ZEND_ADD", phpdbg_get_prompt(TSRMLS_C)); - phpdbg_writeln("\tWill break on every occurence of the opcode provided"); + phpdbg_writeln("\tWill break on every occurrence of the opcode provided"); phpdbg_writeln(EMPTY); phpdbg_writeln("\t%sbreak del 1", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sb d 1", phpdbg_get_prompt(TSRMLS_C)); @@ -574,7 +574,7 @@ PHPDBG_HELP(options) /* {{{ */ phpdbg_writeln(" -c\t-c/my/php.ini\t\tSet php.ini file to load"); phpdbg_writeln(" -d\t-dmemory_limit=4G\tSet a php.ini directive"); phpdbg_writeln(" -n\tN/A\t\t\tDisable default php.ini"); - phpdbg_writeln(" -q\tN/A\t\t\tSupress welcome banner"); + phpdbg_writeln(" -q\tN/A\t\t\tSuppress welcome banner"); phpdbg_writeln(" -e\t-emytest.php\t\tSet execution context"); phpdbg_writeln(" -v\tN/A\t\t\tEnable oplog output"); phpdbg_writeln(" -s\tN/A\t\t\tEnable stepping"); |