[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Johannes Schlüter]

johannesSun Jun 21 16:44:40 2009 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  It's 2009
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.25&r2=1.26&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.25 php-src/sapi/cli/php.1.in:1.26
--- php-src/sapi/cli/php.1.in:1.25  Thu Apr  9 10:19:15 2009
+++ php-src/sapi/cli/php.1.in   Sun Jun 21 16:44:40 2009
@@ -1,4 +1,4 @@
-.TH PHP 1 "2008" "The PHP Group" "Scripting Language"
+.TH PHP 1 "2009" "The PHP Group" "Scripting Language"
 .SH NAME
 .TP 15
 php \- PHP Command Line Interface 'CLI'



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Hannes Magnusson]

On Thu, Apr 9, 2009 at 12:12, Jani Taskinen  wrote:
> Hannes Magnusson wrote:
>>
>> bjori           Thu Apr  9 10:07:24 2009 UTC
>>
>>  Modified files:                  /php-src/sapi/cli   php_cli.c php.1.in
>>  Log:
>>  Fixed bug#47427 (-s outputs, not displays)
>>
>>  http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.208&r2=1.209&diff_format=u
>> Index: php-src/sapi/cli/php_cli.c
>> diff -u php-src/sapi/cli/php_cli.c:1.208 php-src/sapi/cli/php_cli.c:1.209
>> --- php-src/sapi/cli/php_cli.c:1.208    Wed Apr  8 00:14:37 2009
>> +++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:07:24 2009
>> @@ -20,7 +20,7 @@
>>
>>  +--+
>>  */
>>  -/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */
>> +/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
>>   #include "php.h"
>>  #include "php_globals.h"
>> @@ -510,9 +510,9 @@
>>                                "  -F         Parse and execute
>>  for every input line\n"
>>                                "  -E     Run PHP 
>> after processing all input lines\n"
>>                                "  -H               Hide any passed
>> arguments from external tools.\n"
>> -                               "  -s               Display colour syntax
>> highlighted source.\n"
>> +                               "  -s               Outputs HTML syntax
>> highlighted source.\n"
>
> That should be "Output HTML..", too many s'. :)

Fixed, thanks :)

-Hannes

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Hannes Magnusson]

bjori   Thu Apr  9 10:19:15 2009 UTC

  Modified files:  
/php-src/sapi/cli   php_cli.c php.1.in 
  Log:
  Englanti kielioppi (Jani)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.209&r2=1.210&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.209 php-src/sapi/cli/php_cli.c:1.210
--- php-src/sapi/cli/php_cli.c:1.209Thu Apr  9 10:07:24 2009
+++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:19:15 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
+/* $Id: php_cli.c,v 1.210 2009/04/09 10:19:15 bjori Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -510,9 +510,9 @@
"  -F Parse and execute  
for every input line\n"
"  -E Run PHP  after 
processing all input lines\n"
"  -H   Hide any passed arguments 
from external tools.\n"
-   "  -s   Outputs HTML syntax 
highlighted source.\n"
+   "  -s   Output HTML syntax 
highlighted source.\n"
"  -v   Version number\n"
-   "  -w   Outputs source with 
stripped comments and whitespace.\n"
+   "  -w   Output source with stripped 
comments and whitespace.\n"
"  -z Load Zend extension 
.\n"
"\n"
"  args...  Arguments passed to script. 
Use -- args when first argument\n"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.24&r2=1.25&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.24 php-src/sapi/cli/php.1.in:1.25
--- php-src/sapi/cli/php.1.in:1.24  Thu Apr  9 10:07:24 2009
+++ php-src/sapi/cli/php.1.in   Thu Apr  9 10:19:15 2009
@@ -233,7 +233,7 @@
 .TP
 .PD 1
 .B \-s
-Outputs HTML syntax highlighted source
+Output HTML syntax highlighted source
 .TP
 .PD 0
 .B \-\-version
@@ -247,7 +247,7 @@
 .TP
 .PD 1
 .B \-w
-Outputs source with stripped comments and whitespace
+Output source with stripped comments and whitespace
 .TP
 .PD 0
 .B \-\-zend\-extension \fIfile\fP



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Jani Taskinen]

Hannes Magnusson wrote:

bjori   Thu Apr  9 10:07:24 2009 UTC

  Modified files:  
/php-src/sapi/cli	php_cli.c php.1.in 
  Log:

  Fixed bug#47427 (-s outputs, not displays)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.208&r2=1.209&diff_format=u

Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.208 php-src/sapi/cli/php_cli.c:1.209
--- php-src/sapi/cli/php_cli.c:1.208Wed Apr  8 00:14:37 2009
+++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:07:24 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */

+/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
 
 #include "php.h"

 #include "php_globals.h"
@@ -510,9 +510,9 @@
"  -F Parse and execute  for 
every input line\n"
"  -E Run PHP  after 
processing all input lines\n"
"  -H   Hide any passed arguments from 
external tools.\n"
-   "  -s   Display colour syntax 
highlighted source.\n"
+   "  -s   Outputs HTML syntax highlighted 
source.\n"


That should be "Output HTML..", too many s'. :)



"  -v   Version number\n"
-   "  -w   Display source with stripped 
comments and whitespace.\n"
+   "  -w   Outputs source with stripped 
comments and whitespace.\n"


Same here..


"  -z Load Zend extension 
.\n"
"\n"
"  args...  Arguments passed to script. Use 
-- args when first argument\n"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.23&r2=1.24&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.23 php-src/sapi/cli/php.1.in:1.24
--- php-src/sapi/cli/php.1.in:1.23  Wed Dec 31 11:12:39 2008
+++ php-src/sapi/cli/php.1.in   Thu Apr  9 10:07:24 2009
@@ -233,7 +233,7 @@
 .TP
 .PD 1
 .B \-s
-Display colour syntax highlighted source
+Outputs HTML syntax highlighted source
 .TP
 .PD 0
 .B \-\-version
@@ -247,7 +247,7 @@
 .TP
 .PD 1
 .B \-w
-Display source with stripped comments and whitespace
+Outputs source with stripped comments and whitespace
 .TP
 .PD 0
 .B \-\-zend\-extension \fIfile\fP






--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Hannes Magnusson]

bjori   Thu Apr  9 10:07:24 2009 UTC

  Modified files:  
/php-src/sapi/cli   php_cli.c php.1.in 
  Log:
  Fixed bug#47427 (-s outputs, not displays)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.208&r2=1.209&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.208 php-src/sapi/cli/php_cli.c:1.209
--- php-src/sapi/cli/php_cli.c:1.208Wed Apr  8 00:14:37 2009
+++ php-src/sapi/cli/php_cli.c  Thu Apr  9 10:07:24 2009
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.208 2009/04/08 00:14:37 felipe Exp $ */
+/* $Id: php_cli.c,v 1.209 2009/04/09 10:07:24 bjori Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -510,9 +510,9 @@
"  -F Parse and execute  
for every input line\n"
"  -E Run PHP  after 
processing all input lines\n"
"  -H   Hide any passed arguments 
from external tools.\n"
-   "  -s   Display colour syntax 
highlighted source.\n"
+   "  -s   Outputs HTML syntax 
highlighted source.\n"
"  -v   Version number\n"
-   "  -w   Display source with 
stripped comments and whitespace.\n"
+   "  -w   Outputs source with 
stripped comments and whitespace.\n"
"  -z Load Zend extension 
.\n"
"\n"
"  args...  Arguments passed to script. 
Use -- args when first argument\n"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.23&r2=1.24&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.23 php-src/sapi/cli/php.1.in:1.24
--- php-src/sapi/cli/php.1.in:1.23  Wed Dec 31 11:12:39 2008
+++ php-src/sapi/cli/php.1.in   Thu Apr  9 10:07:24 2009
@@ -233,7 +233,7 @@
 .TP
 .PD 1
 .B \-s
-Display colour syntax highlighted source
+Outputs HTML syntax highlighted source
 .TP
 .PD 0
 .B \-\-version
@@ -247,7 +247,7 @@
 .TP
 .PD 1
 .B \-w
-Display source with stripped comments and whitespace
+Outputs source with stripped comments and whitespace
 .TP
 .PD 0
 .B \-\-zend\-extension \fIfile\fP



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Ilia Alshanetsky]

iliaa   Tue Jan  1 18:30:59 2008 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  
  MFB: Update copyright
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.21&r2=1.22&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.21 php-src/sapi/cli/php.1.in:1.22
--- php-src/sapi/cli/php.1.in:1.21  Tue Jan  1 06:22:15 2008
+++ php-src/sapi/cli/php.1.in   Tue Jan  1 18:30:59 2008
@@ -403,7 +403,7 @@
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @[EMAIL PROTECTED]
 .SH COPYRIGHT
-Copyright \(co 1997\-2007 The PHP Group
+Copyright \(co 1997\-2008 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Johannes Schl]

johannesMon Apr 23 20:53:55 2007 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  - Add my name (sync to CREDITS file)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.19&r2=1.20&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.19 php-src/sapi/cli/php.1.in:1.20
--- php-src/sapi/cli/php.1.in:1.19  Mon Apr 23 20:47:58 2007
+++ php-src/sapi/cli/php.1.in   Mon Apr 23 20:53:55 2007
@@ -390,7 +390,7 @@
 .SH AUTHORS
 The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, 
Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
 .P
-Additional work for the CLI sapi was done by Edin Kadribasic and Marcus 
Boerger.
+Additional work for the CLI sapi was done by Edin Kadribasic, Marcus Boerger 
and Johannes Schlueter.
 .P
 A List of active developers can be found here:
 .PD 0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Marcus Boerger]

helly   Mon Apr 23 20:47:58 2007 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in php_cli.c 
  Log:
  - Rephrase as suggested by Chris Jones
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.18&r2=1.19&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.18 php-src/sapi/cli/php.1.in:1.19
--- php-src/sapi/cli/php.1.in:1.18  Mon Apr 23 20:17:19 2007
+++ php-src/sapi/cli/php.1.in   Mon Apr 23 20:47:58 2007
@@ -306,7 +306,7 @@
 .B name
 .TP
 .B \-\-ini
-Show ini configuration files
+Show configuration file names
 .SH FILES
 .TP 15
 .B php\-cli.ini
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.172 php-src/sapi/cli/php_cli.c:1.173
--- php-src/sapi/cli/php_cli.c:1.172Mon Apr 23 20:17:19 2007
+++ php-src/sapi/cli/php_cli.c  Mon Apr 23 20:47:58 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.172 2007/04/23 20:17:19 helly Exp $ */
+/* $Id: php_cli.c,v 1.173 2007/04/23 20:47:58 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -468,7 +468,7 @@
"  args...  Arguments passed to script. 
Use -- args when first argument\n"
"   starts with - or script is 
read from stdin\n"
"\n"
-   "  --iniShow ini configuration 
files\n"
+   "  --iniShow configuration file 
names\n"
"\n"
 #if (HAVE_REFLECTION)
"  --rf   Show information about 
function .\n"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Marcus Boerger]

Hello doc,

besides adding --ini this patch alwaysmakes --ri available evenwithout
reflection.

best regards
marcus

Monday, April 23, 2007, 10:17:20 PM, you wrote:

> helly   Mon Apr 23 20:17:20 2007 UTC

>   Modified files:  
> /php-src/sapi/cli   php.1.in php_cli.c 
>   Log:
>   - Add 'php --ini' to CLI which returns the INI file/dir configuration
>   
> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.17&r2=1.18&diff_format=u
> Index: php-src/sapi/cli/php.1.in
> diff -u php-src/sapi/cli/php.1.in:1.17 php-src/sapi/cli/php.1.in:1.18
> --- php-src/sapi/cli/php.1.in:1.17  Tue Jan 23 20:02:29 2007
> +++ php-src/sapi/cli/php.1.in   Mon Apr 23 20:17:19 2007
> @@ -304,6 +304,9 @@
>  .IR name
>  Shows configuration for extension
>  .B name
> +.TP
> +.B \-\-ini
> +Show ini configuration files
>  .SH FILES
>  .TP 15
>  .B php\-cli.ini
> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.171&r2=1.172&diff_format=u
> Index: php-src/sapi/cli/php_cli.c
> diff -u php-src/sapi/cli/php_cli.c:1.171 php-src/sapi/cli/php_cli.c:1.172
> --- php-src/sapi/cli/php_cli.c:1.171Tue Apr 17 19:48:16 2007
> +++ php-src/sapi/cli/php_cli.c  Mon Apr 23 20:17:19 2007
> @@ -20,7 +20,7 @@
> +--+
>  */
>  
> -/* $Id: php_cli.c,v 1.171 2007/04/17 19:48:16 sniper Exp $ */
> +/* $Id: php_cli.c,v 1.172 2007/04/23 20:17:19 helly Exp $ */
>  
>  #include "php.h"
>  #include "php_globals.h"
> @@ -91,21 +91,29 @@
>  
>  #include "php_getopt.h"
>  
> +PHPAPI extern char *php_ini_opened_path;
> +PHPAPI extern char *php_ini_scanned_files;
> +
>  #ifndef O_BINARY
>  #define O_BINARY 0
>  #endif
>  
> -#define PHP_MODE_STANDARD  1
> -#define PHP_MODE_HIGHLIGHT 2
> -#define PHP_MODE_INDENT3
> -#define PHP_MODE_LINT  4
> -#define PHP_MODE_STRIP 5
> -#define PHP_MODE_CLI_DIRECT6
> -#define PHP_MODE_PROCESS_STDIN 7
> -#define PHP_MODE_REFLECTION_FUNCTION8
> -#define PHP_MODE_REFLECTION_CLASS   9
> -#define PHP_MODE_REFLECTION_EXTENSION   10
> -#define PHP_MODE_REFLECTION_EXT_INFO11
> +enum behavior_mode {
> +   PHP_MODE_STANDARD,
> +   PHP_MODE_HIGHLIGHT,
> +#if 0 /* not yet operational, see also below ... */
> +   PHP_MODE_INDENT,
> +#endif
> +   PHP_MODE_LINT,
> +   PHP_MODE_STRIP,
> +   PHP_MODE_CLI_DIRECT,
> +   PHP_MODE_PROCESS_STDIN,
> +   PHP_MODE_REFLECTION_FUNCTION,
> +   PHP_MODE_REFLECTION_CLASS,
> +   PHP_MODE_REFLECTION_EXTENSION,
> +   PHP_MODE_REFLECTION_EXT_INFO,
> +   PHP_MODE_SHOW_INI_CONFIG
> +};
>  
>  #define HARDCODED_INI  \
> "html_errors=0\n"   \
> @@ -153,9 +161,10 @@
> {11,  1, "rclass"},
> {12,  1, "re"},
> {12,  1, "rextension"},
> +#endif
> {13,  1, "ri"},
> {13,  1, "rextinfo"},
> -#endif
> +   {14,  0, "ini"},
> {'-', 0, NULL} /* end of args */
>  };
>  
> @@ -459,13 +468,15 @@
> "  args...  Arguments passed to
> script. Use -- args when first argument\n"
> "   starts with - or script 
> is read from stdin\n"
> "\n"
> +   "  --iniShow ini configuration 
> files\n"
> +   "\n"
>  #if (HAVE_REFLECTION)
> "  --rf   Show information about 
> function .\n"
> "  --rc   Show information about 
> class .\n"
> "  --re   Show information about 
> extension .\n"
> +#endif
> "  --ri   Show configuration for 
> extension .\n"
> "\n"
> -#endif
> , prog, prog, prog, prog, prog, prog);
>  }
>  /* }}} */
> @@ -583,7 +594,7 @@
> int c;
> zend_file_handle file_handle;
>  /* temporary locals */
> -   int behavior=PHP_MODE_STANDARD;
> +   enum behavior_mode behavior = PHP_MODE_STANDARD;
>  #ifdef HAVE_REFLECTION
> char *reflection_what = NULL;
>  #endif
> @@ -971,11 +982,14 @@
> behavior=PHP_MODE_REFLECTION_EXTENSION;
> reflection_what = php_optarg;
> break;
> +#endif
> case 13:
> behavior=PHP_MODE_REFLECTION_EXT_INFO;
> reflection_what = php_optarg;
> break;
> -#endif
> +   case 14:
> +   behavior = PHP_MODE_SHOW_INI_CONFIG;
> +   break;
> default:
> break;
> }
> @@ -1243,6 +1257,8 @@
> zend_execute_data execut

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Marcus Boerger]

helly   Mon Apr 23 20:17:20 2007 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in php_cli.c 
  Log:
  - Add 'php --ini' to CLI which returns the INI file/dir configuration
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.17&r2=1.18&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.17 php-src/sapi/cli/php.1.in:1.18
--- php-src/sapi/cli/php.1.in:1.17  Tue Jan 23 20:02:29 2007
+++ php-src/sapi/cli/php.1.in   Mon Apr 23 20:17:19 2007
@@ -304,6 +304,9 @@
 .IR name
 Shows configuration for extension
 .B name
+.TP
+.B \-\-ini
+Show ini configuration files
 .SH FILES
 .TP 15
 .B php\-cli.ini
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.171&r2=1.172&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.171 php-src/sapi/cli/php_cli.c:1.172
--- php-src/sapi/cli/php_cli.c:1.171Tue Apr 17 19:48:16 2007
+++ php-src/sapi/cli/php_cli.c  Mon Apr 23 20:17:19 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.171 2007/04/17 19:48:16 sniper Exp $ */
+/* $Id: php_cli.c,v 1.172 2007/04/23 20:17:19 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -91,21 +91,29 @@
 
 #include "php_getopt.h"
 
+PHPAPI extern char *php_ini_opened_path;
+PHPAPI extern char *php_ini_scanned_files;
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
 
-#define PHP_MODE_STANDARD  1
-#define PHP_MODE_HIGHLIGHT 2
-#define PHP_MODE_INDENT3
-#define PHP_MODE_LINT  4
-#define PHP_MODE_STRIP 5
-#define PHP_MODE_CLI_DIRECT6
-#define PHP_MODE_PROCESS_STDIN 7
-#define PHP_MODE_REFLECTION_FUNCTION8
-#define PHP_MODE_REFLECTION_CLASS   9
-#define PHP_MODE_REFLECTION_EXTENSION   10
-#define PHP_MODE_REFLECTION_EXT_INFO11
+enum behavior_mode {
+   PHP_MODE_STANDARD,
+   PHP_MODE_HIGHLIGHT,
+#if 0 /* not yet operational, see also below ... */
+   PHP_MODE_INDENT,
+#endif
+   PHP_MODE_LINT,
+   PHP_MODE_STRIP,
+   PHP_MODE_CLI_DIRECT,
+   PHP_MODE_PROCESS_STDIN,
+   PHP_MODE_REFLECTION_FUNCTION,
+   PHP_MODE_REFLECTION_CLASS,
+   PHP_MODE_REFLECTION_EXTENSION,
+   PHP_MODE_REFLECTION_EXT_INFO,
+   PHP_MODE_SHOW_INI_CONFIG
+};
 
 #define HARDCODED_INI  \
"html_errors=0\n"   \
@@ -153,9 +161,10 @@
{11,  1, "rclass"},
{12,  1, "re"},
{12,  1, "rextension"},
+#endif
{13,  1, "ri"},
{13,  1, "rextinfo"},
-#endif
+   {14,  0, "ini"},
{'-', 0, NULL} /* end of args */
 };
 
@@ -459,13 +468,15 @@
"  args...  Arguments passed to script. 
Use -- args when first argument\n"
"   starts with - or script is 
read from stdin\n"
"\n"
+   "  --iniShow ini configuration 
files\n"
+   "\n"
 #if (HAVE_REFLECTION)
"  --rf   Show information about 
function .\n"
"  --rc   Show information about 
class .\n"
"  --re   Show information about 
extension .\n"
+#endif
"  --ri   Show configuration for 
extension .\n"
"\n"
-#endif
, prog, prog, prog, prog, prog, prog);
 }
 /* }}} */
@@ -583,7 +594,7 @@
int c;
zend_file_handle file_handle;
 /* temporary locals */
-   int behavior=PHP_MODE_STANDARD;
+   enum behavior_mode behavior = PHP_MODE_STANDARD;
 #ifdef HAVE_REFLECTION
char *reflection_what = NULL;
 #endif
@@ -971,11 +982,14 @@
behavior=PHP_MODE_REFLECTION_EXTENSION;
reflection_what = php_optarg;
break;
+#endif
case 13:
behavior=PHP_MODE_REFLECTION_EXT_INFO;
reflection_what = php_optarg;
break;
-#endif
+   case 14:
+   behavior = PHP_MODE_SHOW_INI_CONFIG;
+   break;
default:
break;
}
@@ -1243,6 +1257,8 @@
zend_execute_data execute_data;
 
switch (behavior) {
+   default:
+   break;
case 
PHP_MODE_REFLECTION_FUNCTION:
if 
(strstr(reflection_what, "::")) {
pce = 
refl

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Marcus Boerger]

helly   Tue Jan 23 20:02:29 2007 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in php_cli.c 
  Log:
  - Add --ri/--rextinfo
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.16&r2=1.17&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.16 php-src/sapi/cli/php.1.in:1.17
--- php-src/sapi/cli/php.1.in:1.16  Wed Jan 10 22:17:09 2007
+++ php-src/sapi/cli/php.1.in   Tue Jan 23 20:02:29 2007
@@ -294,6 +294,16 @@
 .IR name
 Shows information about extension
 .B name
+.TP
+.PD 0
+.B \-\-rextinfo
+.IR name
+.TP
+.PD 1
+.B \-\-ri
+.IR name
+Shows configuration for extension
+.B name
 .SH FILES
 .TP 15
 .B php\-cli.ini
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.166&r2=1.167&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.166 php-src/sapi/cli/php_cli.c:1.167
--- php-src/sapi/cli/php_cli.c:1.166Mon Jan  1 09:29:36 2007
+++ php-src/sapi/cli/php_cli.c  Tue Jan 23 20:02:29 2007
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.166 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_cli.c,v 1.167 2007/01/23 20:02:29 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -105,6 +105,7 @@
 #define PHP_MODE_REFLECTION_FUNCTION8
 #define PHP_MODE_REFLECTION_CLASS   9
 #define PHP_MODE_REFLECTION_EXTENSION   10
+#define PHP_MODE_REFLECTION_EXT_INFO11
 
 #define HARDCODED_INI  \
"html_errors=0\n"   \
@@ -152,6 +153,8 @@
{11,  1, "rclass"},
{12,  1, "re"},
{12,  1, "rextension"},
+   {13,  1, "ri"},
+   {13,  1, "rextinfo"},
 #endif
{'-', 0, NULL} /* end of args */
 };
@@ -460,6 +463,7 @@
"  --rf   Show information about 
function .\n"
"  --rc   Show information about 
class .\n"
"  --re   Show information about 
extension .\n"
+   "  --ri   Show configuration for 
extension .\n"
"\n"
 #endif
, prog, prog, prog, prog, prog, prog);
@@ -958,6 +962,10 @@
behavior=PHP_MODE_REFLECTION_EXTENSION;
reflection_what = php_optarg;
break;
+   case 13:
+   behavior=PHP_MODE_REFLECTION_EXT_INFO;
+   reflection_what = php_optarg;
+   break;
 #endif
default:
break;
@@ -1265,6 +1273,22 @@
 
break;
}
+   case PHP_MODE_REFLECTION_EXT_INFO:
+   {
+   int len = strlen(reflection_what);
+   char *lcname = 
zend_str_tolower_dup(reflection_what, len);
+   zend_module_entry *module;
+
+   if (zend_hash_find(&module_registry, 
lcname, len+1, (void**)&module) == FAILURE) {
+   zend_printf("Extension '%s' not 
present.\n", reflection_what);
+   exit_status = 1;
+   } else {
+   php_info_print_module(module 
TSRMLS_CC);
+   }
+   
+   efree(lcname);
+   break;
+   }
 #endif /* reflection */
}
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Johannes Schl]

johannesWed Jan 10 22:17:09 2007 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  - Bump year
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.15&r2=1.16&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.15 php-src/sapi/cli/php.1.in:1.16
--- php-src/sapi/cli/php.1.in:1.15  Sun Apr 23 19:57:40 2006
+++ php-src/sapi/cli/php.1.in   Wed Jan 10 22:17:09 2007
@@ -1,4 +1,4 @@
-.TH PHP 1 "2006" "The PHP Group" "Scripting Language"
+.TH PHP 1 "2007" "The PHP Group" "Scripting Language"
 .SH NAME
 .TP 15
 php \- PHP Command Line Interface 'CLI'
@@ -390,7 +390,7 @@
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @[EMAIL PROTECTED]
 .SH COPYRIGHT
-Copyright \(co 1997\-2006 The PHP Group
+Copyright \(co 1997\-2007 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Andrei Zmievski]

andrei  Sun Apr 23 19:57:40 2006 UTC

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  MFB
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php.1.in?r1=1.14&r2=1.15&diff_format=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.14 php-src/sapi/cli/php.1.in:1.15
--- php-src/sapi/cli/php.1.in:1.14  Sun Jan  1 13:09:58 2006
+++ php-src/sapi/cli/php.1.in   Sun Apr 23 19:57:40 2006
@@ -46,7 +46,7 @@
 .SH DESCRIPTION
 \fBPHP\fP is a widely\-used general\-purpose scripting language that is 
especially suited for 
 Web development and can be embedded into HTML. This is the command line 
interface
-that enables you to the following:
+that enables you to do the following:
 .P
 You can parse and execute files by using parameter \-f followed by the name of 
the 
 .IR file 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in php_cli.c

[Marcus Boerger]

helly   Sat Dec 10 21:16:27 2005 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in php_cli.c 
  Log:
  - Add docu
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.12&r2=1.13&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.12 php-src/sapi/cli/php.1.in:1.13
--- php-src/sapi/cli/php.1.in:1.12  Wed Aug  3 07:12:18 2005
+++ php-src/sapi/cli/php.1.in   Sat Dec 10 21:16:24 2005
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>
   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.12 2005/08/03 11:12:18 sniper Exp $
+./" $Id: php.1.in,v 1.13 2005/12/11 02:16:24 helly Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -283,6 +283,36 @@
 when first argument starts with 
 .B '\-'
 or script is read from stdin
+.TP
+.PD 0
+.B \-\-rfunction
+.IR name
+.TP
+.PD 1
+.B \-\-rf
+.IR name
+Shows information about function
+.B name
+.TP
+.PD 0
+.B \-\-rclass
+.IR name
+.TP
+.PD 1
+.B \-\-rc
+.IR name
+Shows information about class
+.B name
+.TP
+.PD 0
+.B \-\-rextension
+.IR name
+.TP
+.PD 1
+.B \-\-re
+.IR name
+Shows information about extension
+.B name
 .SH FILES
 .TP 15
 .B php\-cli.ini
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.140&r2=1.141&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.140 php-src/sapi/cli/php_cli.c:1.141
--- php-src/sapi/cli/php_cli.c:1.140Sat Dec 10 08:43:51 2005
+++ php-src/sapi/cli/php_cli.c  Sat Dec 10 21:16:24 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.140 2005/12/10 13:43:51 helly Exp $ */
+/* $Id: php_cli.c,v 1.141 2005/12/11 02:16:24 helly Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -139,8 +139,11 @@
{'v', 0, "version"},
{'z', 1, "zend-extension"},
 #ifdef HAVE_REFLECTION
+   {10,  1, "rf"},
{10,  1, "rfunction"},
+   {11,  1, "rc"},
{11,  1, "rclass"},
+   {12,  1, "re"},
{12,  1, "rextension"},
 #endif
{'-', 0, NULL} /* end of args */
@@ -431,6 +434,10 @@
"  args...  Arguments passed to script. 
Use -- args when first argument\n"
"   starts with - or script is 
read from stdin\n"
"\n"
+   "  --rf   Show information about 
function .\n"
+   "  --rc   Show information about 
class .\n"
+   "  --re   Show information about 
extension .\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

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Jani Taskinen]

sniper  Sat May  7 11:43:56 2005 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  typofix
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.10&r2=1.11&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.10 php-src/sapi/cli/php.1.in:1.11
--- php-src/sapi/cli/php.1.in:1.10  Sat May  7 09:54:02 2005
+++ php-src/sapi/cli/php.1.in   Sat May  7 11:43:55 2005
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>
   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.10 2005/05/07 13:54:02 helly Exp $
+./" $Id: php.1.in,v 1.11 2005/05/07 15:43:55 sniper Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -111,7 +111,7 @@
 .B \-a
 Run PHP interactively. This lets you enter snippets of PHP code that directly
 get executed. When readline support is enabled you can edit the lines and also
-have hitory support.
+have history support.
 .TP
 .PD 0
 .B \-\-php\-ini \fIpath\fP|\fIfile\fP

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Marcus Boerger]

helly   Sat May  7 09:54:03 2005 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  - Update
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.9&r2=1.10&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.9 php-src/sapi/cli/php.1.in:1.10
--- php-src/sapi/cli/php.1.in:1.9   Sat Apr 30 00:12:01 2005
+++ php-src/sapi/cli/php.1.in   Sat May  7 09:54:02 2005
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>
   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.9 2005/04/30 04:12:01 sniper Exp $
+./" $Id: php.1.in,v 1.10 2005/05/07 13:54:02 helly Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -24,7 +24,7 @@
 .SH SYNOPSIS
 .B php
 [options] [
-.B \-f ]
+.B \-f\fP ]
 .IR file
 [[\-\-] 
 .IR args.\|.\|. ]
@@ -60,9 +60,10 @@
 [options] \-\- [
 .IR args.\|.\|. ]
 .LP
+\fBphp \fP[options] \fB\-a\fP
+.LP
 .SH DESCRIPTION
-.B PHP
-is a widely\-used general\-purpose scripting language that is especially 
suited for 
+\fBPHP\fP is a widely\-used general\-purpose scripting language that is 
especially suited for 
 Web development and can be embedded into HTML. This is the command line 
interface
 that enables you to the following:
 .P
@@ -108,7 +109,9 @@
 .TP
 .PD 1
 .B \-a
-Run interactively
+Run PHP interactively. This lets you enter snippets of PHP code that directly
+get executed. When readline support is enabled you can edit the lines and also
+have hitory support.
 .TP
 .PD 0
 .B \-\-php\-ini \fIpath\fP|\fIfile\fP

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Derick Rethans]

On Sat, 30 Apr 2005, Jani Taskinen wrote:

> sniperSat Apr 30 00:12:02 2005 EDT
> 
>   Modified files:  
> /php-src/sapi/cli php.1.in 
>   Log:
>   Silence the warnings about weird characters in this man page

What warnings?

Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Jani Taskinen]

sniper  Sat Apr 30 00:12:02 2005 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  Silence the warnings about weird characters in this man page
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.8&r2=1.9&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.8 php-src/sapi/cli/php.1.in:1.9
--- php-src/sapi/cli/php.1.in:1.8   Tue Nov  9 10:05:20 2004
+++ php-src/sapi/cli/php.1.in   Sat Apr 30 00:12:01 2005
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>
   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.8 2004/11/09 15:05:20 fmk Exp $
+./" $Id: php.1.in,v 1.9 2005/04/30 04:12:01 sniper Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -348,7 +348,7 @@
 .B http://www.php.net/manual/
 .PD 1
 .P
-A nice introduction to PHP by Stig Sæther Bakken can be found here:
+A nice introduction to PHP by Stig Bakken can be found here:
 .PD 0
 .P
 .B http://www.zend.com/zend/art/intro.php

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Frank M. Kromann]

fmk Tue Nov  9 10:05:21 2004 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  Fix typo in man page. Bug #30727. Patch by Jakub Vrana
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.7&r2=1.8&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.7 php-src/sapi/cli/php.1.in:1.8
--- php-src/sapi/cli/php.1.in:1.7   Sun May  2 05:14:02 2004
+++ php-src/sapi/cli/php.1.in   Tue Nov  9 10:05:20 2004
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>
   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.7 2004/05/02 09:14:02 helly Exp $
+./" $Id: php.1.in,v 1.8 2004/11/09 15:05:20 fmk Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -380,7 +380,7 @@
 .LP
 This source file is subject to version 3.0 of the PHP license,
 that is bundled with this package in the file LICENSE, and is
-available at through the world-wide-web at
+available through the world-wide-web at
 .PD 0
 .P
 .B http://www.php.net/license/3_0.txt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Marcus Boerger]

helly   Sun May  2 05:14:02 2004 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  Add a notice on STDIN
  
  
http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.6&r2=1.7&ty=u
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.6 php-src/sapi/cli/php.1.in:1.7
--- php-src/sapi/cli/php.1.in:1.6   Thu Jan  8 12:33:23 2004
+++ php-src/sapi/cli/php.1.in   Sun May  2 05:14:02 2004
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.6 2004/01/08 17:33:23 sniper Exp $
+./" $Id: php.1.in,v 1.7 2004/05/02 09:14:02 helly Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -90,7 +90,12 @@
 the paramters \-B and \-E can be used to execute 
 .IR code
 (see \-r) before and
-after all input lines have been processed respectively.
+after all input lines have been processed respectively. Notice that the
+input is read from
+.B STDIN
+and therefore reading from 
+.B STDIN 
+explicitly changes the next input line or skips input lines.
 .LP
 If none of \-r \-f \-B \-R \-F or \-E is present but a single parameter is given 
 then this parameter is taken as the filename to parse and execute (same as 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /sapi/cli php.1.in

[Andi Gutmans]

andiTue Dec 23 06:06:50 2003 EDT

  Modified files:  
/php-src/sapi/cli   php.1.in 
  Log:
  - Commit fixes to PHP man page
  
  
Index: php-src/sapi/cli/php.1.in
diff -u php-src/sapi/cli/php.1.in:1.4 php-src/sapi/cli/php.1.in:1.5
--- php-src/sapi/cli/php.1.in:1.4   Tue Jun 10 16:03:45 2003
+++ php-src/sapi/cli/php.1.in   Tue Dec 23 06:06:50 2003
@@ -14,7 +14,7 @@
 ./"| Author: Marcus Boerger <[EMAIL PROTECTED]>   |
 ./"+--+
 ./" 
-./" $Id: php.1.in,v 1.4 2003/06/10 20:03:45 imajes Exp $
+./" $Id: php.1.in,v 1.5 2003/12/23 11:06:50 andi Exp $
 ./" 
 .TH PHP 1 "Feb 2003" "The PHP Group" "Scripting Language"
 .SH NAME
@@ -283,15 +283,15 @@
 .B php.ini
 The standard configuration file will only be used when 
 .B php\-cli.ini
-cannot not be found.
+cannot be found.
 .SH EXAMPLES
 .TP 5
 \fIphp -r 'echo "Hello World\\n";'\fP
-This command simply writes the text "Hello World" to stabdard out.
+This command simply writes the text "Hello World" to standard out.
 .TP
 \fIphp \-r 'print_r(gd_info());'\fP
 This shows the configuration of your gd extension. You can use this
-to easily check which imag formats you can use. If you have any
+to easily check which image formats you can use. If you have any
 dynamic modules you may want to use the same ini file that php uses
 when executed from your webserver. There are more extensions which
 have such a function. For dba use:
@@ -299,12 +299,12 @@
 \fIphp \-r 'print_r(dba_handlers(1));'\fP
 .RE
 .TP
-\fIphp \-R'echo strip_tags($argn)."\\n";\fP
+\fIphp \-R 'echo strip_tags($argn)."\\n";'\fP
 This PHP command strips off the HTML tags line by line and outputs the 
-result. To see how it works you can first look at the following PHP command '
-\fIphp \-d html_errors=1 \-i\fP' which uses PHP to output HTML formatted
+result. To see how it works you can first look at the following PHP command
+\'\fIphp \-d html_errors=1 \-i\fP\' which uses PHP to output HTML formatted
 configuration information. If you then combine those two 
-\'\fIphp \.\.\.|php \.\.\.\fP\' you\'ll see what happens.
+\'\fIphp \.\.\.|php \.\.\.\fP\' you'll see what happens.
 .TP
 \fIphp \-E 'echo "Lines: $argi\\n";'\fP
 Using this PHP command you can count the lines being input.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php