diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-10 06:20:56 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-10 06:20:56 +0000 |
| commit | aadc84f6f749f05bc5d6cbf4f44a21734a9c6d3f (patch) | |
| tree | 09e688ebea89dbba03911cac38a459c556fc21dd | |
| parent | 005ba2001ddc0e84ae62e00aa4956899f85c50f8 (diff) | |
| parent | 125ee6a68e40d539cac5eb97def04d1586ce0e5d (diff) | |
| download | php-git-aadc84f6f749f05bc5d6cbf4f44a21734a9c6d3f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #73902 mention router support in usage output for php-cli
| -rw-r--r-- | sapi/cli/php_cli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 3046325370..7096829c63 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -511,7 +511,7 @@ static void php_cli_usage(char *argv0) " %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] -S <addr>:<port> [-t docroot]\n" + " %s [options] -S <addr>:<port> [-t docroot] [router]\n" " %s [options] -- [args...]\n" " %s [options] -a\n" "\n" |