diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
| commit | e07feeaf8b91f16a89e9903b461042a0f6a63ac0 (patch) | |
| tree | 4a94cd382fcffefff920f7733562e1860a66cc44 /sapi/phpdbg | |
| parent | 9b6836ebd36eccc9e81ca51e2efe172e1d334f0b (diff) | |
| parent | d4f42289ddde002cb4d3ed9d1a4f2219f68df48e (diff) | |
| download | php-git-e07feeaf8b91f16a89e9903b461042a0f6a63ac0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/xml.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ec65a22f12..c624669785 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1571,7 +1571,7 @@ phpdbg_out: #ifdef _WIN32 } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) { - phpdbg_error("segfault", "", "Access violation (Segementation fault) encountered\ntrying to abort cleanly..."); + phpdbg_error("segfault", "", "Access violation (Segmentation fault) encountered\ntrying to abort cleanly..."); } phpdbg_out: #endif diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 7871b31376..56dcaaa1f7 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -225,7 +225,7 @@ frame - internal: has value "internal" when being an internal function call (one cannot inspect that frame) - being an error: (by type) - - maxnum: tried to access a frame with a number heigher than existing (or < 0) + - maxnum: tried to access a frame with a number higher than existing (or < 0) ### attributes on <arg> ### @@ -378,7 +378,7 @@ exec - command executing and compiling a given file - <exec type="unset" context="" />: indicates unsetting of the old context - <exec type="unsetops" />: indicates unsetting of the old compiled opcodes - - <exec type="unchanged" />: same execution context choosen again + - <exec type="unchanged" />: same execution context chosen again - <exec type="set" context="" />: indicates setting of the new context - errors by tag - <compile> @@ -527,7 +527,7 @@ set ### breaks ### -- generally enables / disables breakpoint functionality silently with no futher xml answer +- generally enables / disables breakpoint functionality silently with no further xml answer - if the boolean switch is omitted, it emits current state in a <setbreaks active="" /> where active is on or off ### color ### |