Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add missing newlines to phpdbg's help for the run command.
This commit is contained in:
Adam Harvey 2016-05-25 12:40:23 -05:00
commit ac29f9de86

View file

@ -810,8 +810,10 @@ phpdbg_help_text_t phpdbg_help_text[] = {
{"run",
"Enter the vm, startinging execution. Execution will then continue until the next breakpoint "
"or completion of the script. Add parameters you want to use as $argv"
"or completion of the script. Add parameters you want to use as $argv" CR CR
"**Examples**" CR CR
" $P run" CR
" $P r" CR
" Will cause execution of the context, if it is set" CR CR