compress text/tidy up

diff --git a/phpdbg_help.c b/phpdbg_help.c
index 7bd2e95a7139cc2555c042a4d94cc727ac032a0c..75b6cb7daf1ceb23f8f50b70d3231a6414acfe27 100644 (file)
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -103,8 +103,8 @@ PHPDBG_HELP(compile) /* {{{ */
 PHPDBG_HELP(print) /* {{{ */
 {
     phpdbg_help_header();
-       phpdbg_writeln("By default, print will show information about the current execution environment");
-       phpdbg_writeln("Other printing commands give access to address, file and line information");
+       phpdbg_writeln("By default, print will show information about the current execution context");
+       phpdbg_writeln("Other printing commands give access to instruction information");
        phpdbg_writeln(EMPTY);
        phpdbg_writeln("Examples:");
        phpdbg_writeln("\t%sprint class \\my\\class", PROMPT);

diff --git a/phpdbg_help.h b/phpdbg_help.h
index a54c43a25bff05f7e11fd92e29bc95dedaaac475..400d2003cfa93fec514c5a9e64bf6332971e70b8 100644 (file)
--- a/phpdbg_help.h
+++ b/phpdbg_help.h
@@ -54,23 +54,23 @@ PHPDBG_HELP(shell);
  */
 static const phpdbg_command_t phpdbg_help_commands[] = {
        PHPDBG_COMMAND_D_EX(exec,     "the execution context should be a valid path",                                    'e', help_exec,    NULL, 0),
-       PHPDBG_COMMAND_D_EX(compile,  "pre-compilation allows inspection of code before execution",                      'c', help_compile, NULL, 0),
+       PHPDBG_COMMAND_D_EX(compile,  "allow inspection of code before execution",                                                       'c', help_compile, NULL, 0),
        PHPDBG_COMMAND_D_EX(step,     "step through execution to break at every opcode",                                                         's', help_step,    NULL, 0),
        PHPDBG_COMMAND_D_EX(next,     "continue executing while stepping or after breaking",                             'n', help_next,    NULL, 0),
        PHPDBG_COMMAND_D_EX(run,      "execute inside the phpdbg vm",                                                                                            'r', help_run,     NULL, 0),
-       PHPDBG_COMMAND_D_EX(eval,     "access to eval() allows you to affect the environment during execution",          'E', help_eval,    NULL, 0),
+       PHPDBG_COMMAND_D_EX(eval,     "access to eval() allows affecting the environment",                                               'E', help_eval,    NULL, 0),
        PHPDBG_COMMAND_D_EX(until,    "continue until the current line is executed",                                                                     'u', help_until,   NULL, 0),
        PHPDBG_COMMAND_D_EX(finish,   "continue until the current function has returned",                                'f', help_finish,  NULL, 0),
        PHPDBG_COMMAND_D_EX(leave,    "continue until the current function is returning",                                'L', help_leave,   NULL, 0),
-       PHPDBG_COMMAND_D_EX(print,    "printing allows inspection of the execution environment",                         'p', help_print,   NULL, 0),
+       PHPDBG_COMMAND_D_EX(print,    "print context information or instructions",                                                   'p', help_print,   NULL, 0),
        PHPDBG_COMMAND_D_EX(break,    "breakpoints allow execution interruption",                                        'b', help_break,   NULL, 0),
-       PHPDBG_COMMAND_D_EX(clean,    "resetting the environment is useful while debugging and recompiling",             'X', help_clean,   NULL, 0),
-       PHPDBG_COMMAND_D_EX(clear,    "clearing breakpoints allows you to run code without interruption",                'c', help_clear,   NULL, 0),
+       PHPDBG_COMMAND_D_EX(clean,    "resetting the environment is useful while debugging",                                             'X', help_clean,   NULL, 0),
+       PHPDBG_COMMAND_D_EX(clear,    "reset breakpoints to execute without interruption",                                               'c', help_clear,   NULL, 0),
        PHPDBG_COMMAND_D_EX(info,     "quick access to useful information on the console",                               'i', help_info,    NULL, 0),
        PHPDBG_COMMAND_D_EX(back,     "show debug backtrace information during execution",                               't', help_back,    NULL, 0),
     PHPDBG_COMMAND_D_EX(quiet,    "be quiet during execution",                                                       's', help_quiet,   NULL, 0),
-       PHPDBG_COMMAND_D_EX(list,     "listing code gives you quick access to code while executing",                     'l', help_list,    NULL, 0),
-       PHPDBG_COMMAND_D_EX(oplog,    "keep clutter off the screen by sending oplogs to a file",                         'O', help_oplog,   NULL, 0),
+       PHPDBG_COMMAND_D_EX(list,     "list code gives you quick access to code",                                                        'l', help_list,    NULL, 0),
+       PHPDBG_COMMAND_D_EX(oplog,    "keep clutter off the screen by logging oplines",                                          'O', help_oplog,   NULL, 0),
        PHPDBG_COMMAND_D_EX(shell,    "execute system commands with direct shell access",                                                                '-', help_shell,   NULL, 0),
        PHPDBG_END_COMMAND
 };

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 687dcb021ebf1f9928e10e2beafc872646150e39..8789bc2549cc6fe4f977d5a0c6fb1436496b5e7b 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -60,7 +60,7 @@ static PHPDBG_COMMAND(quit); /* }}} */
 /* {{{ command declarations */
 static const phpdbg_command_t phpdbg_prompt_commands[] = {
        PHPDBG_COMMAND_D(exec,    "set execution context",                    'e', NULL, 1),
-       PHPDBG_COMMAND_D(compile, "attempt to pre-compile execution context", 'c', NULL, 0),
+       PHPDBG_COMMAND_D(compile, "attempt compilation",                                          'c', NULL, 0),
        PHPDBG_COMMAND_D(step,    "step through execution",                   's', NULL, 1),
        PHPDBG_COMMAND_D(next,    "continue execution",                       'n', NULL, 0),
        PHPDBG_COMMAND_D(run,     "attempt execution",                        'r', NULL, 0),
@@ -789,11 +789,11 @@ static PHPDBG_COMMAND(help) /* {{{ */
                        phpdbg_writeln("\t-d\t-dmemory_limit=4G\tSet a php.ini directive");
                        phpdbg_writeln("\t-n\t-N/A\t\t\tDisable default php.ini");
                        phpdbg_writeln("\t-e\t-emytest.php\t\tSet execution context");
-                       phpdbg_writeln("\t-v\tN/A\t\t\tEnable opline output while executing");
+                       phpdbg_writeln("\t-v\tN/A\t\t\tEnable oplog output");
                        phpdbg_writeln("\t-s\tN/A\t\t\tEnable stepping");
-                       phpdbg_writeln("\t-b\tN/A\t\t\tDisable the use of colours");
-                       phpdbg_writeln("\t-i\t-imy.init\t\tSet the phpdbginit file");
-                       phpdbg_writeln("\t-I\tN/A\t\t\tDisable loading .phpdbginit");
+                       phpdbg_writeln("\t-b\tN/A\t\t\tDisable colour");
+                       phpdbg_writeln("\t-i\t-imy.init\t\tSet .phpdbginit file");
+                       phpdbg_writeln("\t-I\tN/A\t\t\tIgnore default .phpdbginit");
                        phpdbg_writeln("\t-O\t-Omy.oplog\t\tSets oplog output file");
                        phpdbg_help_footer();
                } break;