derick Sat, 25 Jun 2011 10:16:46 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=312453
Log:
- Fixed layout. Tabs on the terminal don't align nicely in most cases.
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
U php/php-src/trunk/sapi/cli/php_cli.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 09:56:46 UTC (rev 312452)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC (rev 312453)
@@ -499,51 +499,51 @@
}
printf( "Usage: %s [options] [-f] <file> [--] [args...]\n"
- " %s [options] -r <code> [--] [args...]\n"
- " %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
- " %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
- " %s [options] -- [args...]\n"
- " %s [options] -a\n"
+ " %s [options] -r <code> [--] [args...]\n"
+ " %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
+ " %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
+ " %s [options] -- [args...]\n"
+ " %s [options] -a\n"
"\n"
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
- " -a Run as interactive shell\n"
+ " -a Run as interactive shell\n"
#else
- " -a Run interactively\n"
+ " -a Run interactively\n"
#endif
" -c <path>|<file> Look for php.ini file in this directory\n"
- " -n No php.ini file will be used\n"
- " -d foo[=bar] Define INI entry foo with value 'bar'\n"
- " -e Generate extended information for debugger/profiler\n"
- " -f <file> Parse and execute <file>.\n"
- " -h This help\n"
- " -i PHP information\n"
- " -l Syntax check only (lint)\n"
- " -m Show compiled in modules\n"
- " -r <code> Run PHP <code> without using script tags <?..?>\n"
+ " -n No php.ini file will be used\n"
+ " -d foo[=bar] Define INI entry foo with value 'bar'\n"
+ " -e Generate extended information for debugger/profiler\n"
+ " -f <file> Parse and execute <file>.\n"
+ " -h This help\n"
+ " -i PHP information\n"
+ " -l Syntax check only (lint)\n"
+ " -m Show compiled in modules\n"
+ " -r <code> Run PHP <code> without using script tags <?..?>\n"
" -B <begin_code> Run PHP <begin_code> before processing input lines\n"
- " -R <code> Run PHP <code> for every input line\n"
- " -F <file> Parse and execute <file> for every input line\n"
- " -E <end_code> Run PHP <end_code> after processing all input lines\n"
- " -H Hide any passed arguments from external tools.\n"
+ " -R <code> Run PHP <code> for every input line\n"
+ " -F <file> Parse and execute <file> for every input line\n"
+ " -E <end_code> Run PHP <end_code> after processing all input lines\n"
+ " -H Hide any passed arguments from external tools.\n"
" -S <addr>:<port> Run with built-in web server.\n"
- " -t <docroot> Specify document root <docroot> for bult-in web server.\n"
- " -s Output HTML syntax highlighted source.\n"
- " -v Version number\n"
- " -w Output source with stripped comments and whitespace.\n"
- " -z <file> Load Zend extension <file>.\n"
+ " -t <docroot> Specify document root <docroot> for bult-in web server.\n"
+ " -s Output HTML syntax highlighted source.\n"
+ " -v Version number\n"
+ " -w Output source with stripped comments and whitespace.\n"
+ " -z <file> Load Zend extension <file>.\n"
"\n"
- " args... Arguments passed to script. Use -- args when first argument\n"
- " starts with - or script is read from stdin\n"
+ " args... Arguments passed to script. Use -- args when first argument\n"
+ " starts with - or script is read from stdin\n"
"\n"
- " --ini Show configuration file names\n"
+ " --ini Show configuration file names\n"
"\n"
#if (HAVE_REFLECTION)
- " --rf <name> Show information about function <name>.\n"
- " --rc <name> Show information about class <name>.\n"
- " --re <name> Show information about extension <name>.\n"
- " --rz <name> Show information about Zend extension <name>.\n"
+ " --rf <name> Show information about function <name>.\n"
+ " --rc <name> Show information about class <name>.\n"
+ " --re <name> Show information about extension <name>.\n"
+ " --rz <name> Show information about Zend extension <name>.\n"
#endif
- " --ri <name> Show configuration for extension <name>.\n"
+ " --ri <name> Show configuration for extension <name>.\n"
"\n"
, prog, prog, prog, prog, prog, prog);
}
Modified: php/php-src/trunk/sapi/cli/php_cli.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli.c 2011-06-25 09:56:46 UTC (rev 312452)
+++ php/php-src/trunk/sapi/cli/php_cli.c 2011-06-25 10:16:46 UTC (rev 312453)
@@ -499,51 +499,51 @@
}
printf( "Usage: %s [options] [-f] <file> [--] [args...]\n"
- " %s [options] -r <code> [--] [args...]\n"
- " %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
- " %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
- " %s [options] -- [args...]\n"
- " %s [options] -a\n"
+ " %s [options] -r <code> [--] [args...]\n"
+ " %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
+ " %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
+ " %s [options] -- [args...]\n"
+ " %s [options] -a\n"
"\n"
#if (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
- " -a Run as interactive shell\n"
+ " -a Run as interactive shell\n"
#else
- " -a Run interactively\n"
+ " -a Run interactively\n"
#endif
" -c <path>|<file> Look for php.ini file in this directory\n"
- " -n No php.ini file will be used\n"
- " -d foo[=bar] Define INI entry foo with value 'bar'\n"
- " -e Generate extended information for debugger/profiler\n"
- " -f <file> Parse and execute <file>.\n"
- " -h This help\n"
- " -i PHP information\n"
- " -l Syntax check only (lint)\n"
- " -m Show compiled in modules\n"
- " -r <code> Run PHP <code> without using script tags <?..?>\n"
+ " -n No php.ini file will be used\n"
+ " -d foo[=bar] Define INI entry foo with value 'bar'\n"
+ " -e Generate extended information for debugger/profiler\n"
+ " -f <file> Parse and execute <file>.\n"
+ " -h This help\n"
+ " -i PHP information\n"
+ " -l Syntax check only (lint)\n"
+ " -m Show compiled in modules\n"
+ " -r <code> Run PHP <code> without using script tags <?..?>\n"
" -B <begin_code> Run PHP <begin_code> before processing input lines\n"
- " -R <code> Run PHP <code> for every input line\n"
- " -F <file> Parse and execute <file> for every input line\n"
- " -E <end_code> Run PHP <end_code> after processing all input lines\n"
- " -H Hide any passed arguments from external tools.\n"
+ " -R <code> Run PHP <code> for every input line\n"
+ " -F <file> Parse and execute <file> for every input line\n"
+ " -E <end_code> Run PHP <end_code> after processing all input lines\n"
+ " -H Hide any passed arguments from external tools.\n"
" -S <addr>:<port> Run with built-in web server.\n"
- " -t <docroot> Specify document root <docroot> for bult-in web server.\n"
- " -s Output HTML syntax highlighted source.\n"
- " -v Version number\n"
- " -w Output source with stripped comments and whitespace.\n"
- " -z <file> Load Zend extension <file>.\n"
+ " -t <docroot> Specify document root <docroot> for bult-in web server.\n"
+ " -s Output HTML syntax highlighted source.\n"
+ " -v Version number\n"
+ " -w Output source with stripped comments and whitespace.\n"
+ " -z <file> Load Zend extension <file>.\n"
"\n"
- " args... Arguments passed to script. Use -- args when first argument\n"
- " starts with - or script is read from stdin\n"
+ " args... Arguments passed to script. Use -- args when first argument\n"
+ " starts with - or script is read from stdin\n"
"\n"
- " --ini Show configuration file names\n"
+ " --ini Show configuration file names\n"
"\n"
#if (HAVE_REFLECTION)
- " --rf <name> Show information about function <name>.\n"
- " --rc <name> Show information about class <name>.\n"
- " --re <name> Show information about extension <name>.\n"
- " --rz <name> Show information about Zend extension <name>.\n"
+ " --rf <name> Show information about function <name>.\n"
+ " --rc <name> Show information about class <name>.\n"
+ " --re <name> Show information about extension <name>.\n"
+ " --rz <name> Show information about Zend extension <name>.\n"
#endif
- " --ri <name> Show configuration for extension <name>.\n"
+ " --ri <name> Show configuration for extension <name>.\n"
"\n"
, prog, prog, prog, prog, prog, prog);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
