diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-18 09:05:16 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-18 09:05:16 +0400 |
| commit | 8b3c2cc47eb91c8c97fb0f511c735511be7b8bc5 (patch) | |
| tree | 9cb697d316cf5670cb3147e14dabe6981d8c9a38 /sapi/phpdbg/phpdbg_help.c | |
| parent | b1c2e14954cc86db7bbf413907925d6fd2ead367 (diff) | |
| parent | 3e79907b0abb0a9d0ff1580febb9d70dc095195c (diff) | |
| download | php-git-8b3c2cc47eb91c8c97fb0f511c735511be7b8bc5.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Updated NEWS for d790ec
Correct typo in comments: 'initialized'
typofixes
typofixes
Fixes missing Reflector interface constraints being enforced by the engine
Fixed version id
Update NEWS
Update NEWS
Fix another failing test
Add NEWS
Better version checking
Better version checking
Better version checking
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_help.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index 1e58dc69ca..c552529930 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -362,7 +362,7 @@ phpdbg_help_text_t phpdbg_help_text[] = { " **-c** **-c**/my/php.ini Set php.ini file to load" CR " **-d** **-d**memory_limit=4G Set a php.ini directive" CR " **-n** Disable default php.ini" CR -" **-q** Supress welcome banner" CR +" **-q** Suppress welcome banner" CR " **-v** Enable oplog output" CR " **-s** Enable stepping" CR " **-b** Disable colour" CR @@ -545,7 +545,7 @@ phpdbg_help_text_t phpdbg_help_text[] = { " $P break ZEND_ADD" CR " $P b ZEND_ADD" CR -" Break on any occurence of the opcode ZEND_ADD" CR CR +" Break on any occurrence of the opcode ZEND_ADD" CR CR " $P break del 2" CR " $P b ~ 2" CR |