From b2bf9eca02daddfbd9877a5eef0d745051673b69 Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Tue, 15 Apr 2008 23:19:15 +0000 Subject: [PATCH] Miscellaneous updates. This commit spans en/language/predefined/* and includes updates for typos, grammar, markup, and new see also links. git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@257630 c90b9560-bf6c-de11-be94-00142212c4b1 --- language/predefined/exception.xml | 6 +++--- language/predefined/variables.xml | 4 ++-- language/predefined/variables/argc.xml | 8 ++++---- language/predefined/variables/argv.xml | 8 ++++---- language/predefined/variables/cookie.xml | 20 ++++++++++++++----- language/predefined/variables/env.xml | 19 +++++++++++++----- language/predefined/variables/files.xml | 20 ++++++++++++++----- language/predefined/variables/get.xml | 17 ++++++++++++---- .../variables/httpresponseheader.xml | 6 +++--- language/predefined/variables/post.xml | 17 ++++++++++++---- language/predefined/variables/request.xml | 3 ++- language/predefined/variables/server.xml | 10 +++++----- language/predefined/variables/session.xml | 6 +++--- 13 files changed, 96 insertions(+), 48 deletions(-) diff --git a/language/predefined/exception.xml b/language/predefined/exception.xml index 1d3371754a..4d791f683e 100644 --- a/language/predefined/exception.xml +++ b/language/predefined/exception.xml @@ -1,5 +1,5 @@ - + Exception @@ -38,7 +38,7 @@ message - pivate + private string string @@ -58,7 +58,7 @@ line - pivate + private array trace diff --git a/language/predefined/variables.xml b/language/predefined/variables.xml index a602961edd..a3fb123342 100644 --- a/language/predefined/variables.xml +++ b/language/predefined/variables.xml @@ -1,5 +1,5 @@ - + Predefined variables @@ -10,7 +10,7 @@ PHP provides a large number of predefined variables to any script. The variables represent everything from external variables to - built-in enviroment variables, last error messages to last retrieved + built-in environment variables, last error messages to last retrieved headers. diff --git a/language/predefined/variables/argc.xml b/language/predefined/variables/argc.xml index 12914a7bb5..7e0acab0da 100644 --- a/language/predefined/variables/argc.xml +++ b/language/predefined/variables/argc.xml @@ -1,5 +1,5 @@ - + @@ -11,16 +11,16 @@ &reftitle.description; Contains the number of arguments passed to the current script when running - from the command line. + from the command line. - The script's filename is always passed as an argument to the script + The script's filename is always passed as an argument to the script. - This variable is only available when register_argc_argv + This variable is only available when register_argc_argv is enabled in php.ini. diff --git a/language/predefined/variables/argv.xml b/language/predefined/variables/argv.xml index b4892cf316..696f4dd0e1 100644 --- a/language/predefined/variables/argv.xml +++ b/language/predefined/variables/argv.xml @@ -1,5 +1,5 @@ - + @@ -10,8 +10,8 @@ &reftitle.description; - Contains an array of all the arguments passed to the script when running - from the command line. + Contains an array of all the arguments passed to the script when running + from the command line. @@ -20,7 +20,7 @@ - This variable is only available when register_argc_argv + This variable is only available when register_argc_argv is enabled in php.ini. diff --git a/language/predefined/variables/cookie.xml b/language/predefined/variables/cookie.xml index 174d4aad8d..b7023aec13 100644 --- a/language/predefined/variables/cookie.xml +++ b/language/predefined/variables/cookie.xml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ &reftitle.description; - An associative array of variables passed to the current script + An associative array of variables passed to the current script via HTTP Cookies. @@ -52,8 +52,8 @@ 4.1.0 Introduced $_COOKIE. - In previous the $HTTP_COOKIE_VARS - contained these information. + Note that the deprecated $HTTP_COOKIE_VARS + did exist previously. @@ -91,7 +91,17 @@ Hello Hannes! &reftitle.notes; ¬e.is-superglobal; - + + + &reftitle.seealso; + + + setcookie + Handling external variables + + + + + @@ -11,7 +11,7 @@ &reftitle.description; - An associative array of variables passed to the current script + An associative array of variables passed to the current script via the environment method. @@ -67,8 +67,8 @@ 4.1.0 Introduced $_ENV. - In previous the $HTTP_ENV_VARS - contained these information. + Note that the deprecated $HTTP_ENV_VARS + did exist previously. @@ -106,7 +106,16 @@ My username is bjori! &reftitle.notes; ¬e.is-superglobal; - + + + &reftitle.seealso; + + + getenv + + + + + @@ -11,7 +11,7 @@ &reftitle.description; - An associative array of items uploaded to the current script + An associative array of items uploaded to the current script via the HTTP POST method. @@ -52,8 +52,8 @@ 4.1.0 Introduced $_FILES. - In previous the $HTTP_POST_FILES - contained these information. + Note that the deprecated $HTTP_POST_FILES + did exist previously. @@ -66,7 +66,17 @@ &reftitle.notes; ¬e.is-superglobal; - + + + &reftitle.seealso; + + + move_uploaded_file + Handling File Uploads + + + + + @@ -52,8 +52,8 @@ 4.1.0 Introduced $_GET. - In previous the $HTTP_GET_VARS - contained these information. + Note that the deprecated $HTTP_GET_VARS + did exist previously. @@ -91,7 +91,16 @@ Hello Hannes! &reftitle.notes; ¬e.is-superglobal; - + + + &reftitle.seealso; + + + Handling external variables + + + + + @@ -10,9 +10,9 @@ &reftitle.description; - The $http_response_header array is similiar to the + The $http_response_header array is similar to the get_headers function. When using the - HTTP wrapper + HTTP wrapper, $http_response_header will be populated with the HTTP response headers. diff --git a/language/predefined/variables/post.xml b/language/predefined/variables/post.xml index f3989ba955..bba5cf921f 100644 --- a/language/predefined/variables/post.xml +++ b/language/predefined/variables/post.xml @@ -1,5 +1,5 @@ - + @@ -52,8 +52,8 @@ 4.1.0 Introduced $_POST. - In previous the $HTTP_POST_VARS - contained these information. + Note that the deprecated $HTTP_POST_VARS + did exist previously. @@ -91,7 +91,16 @@ Hello Hannes! &reftitle.notes; ¬e.is-superglobal; - + + + &reftitle.seealso; + + + Handling external variables + + + + + @@ -85,6 +85,7 @@ &reftitle.seealso; import_request_variables + Handling external variables diff --git a/language/predefined/variables/server.xml b/language/predefined/variables/server.xml index eda2436ccb..2e50213546 100644 --- a/language/predefined/variables/server.xml +++ b/language/predefined/variables/server.xml @@ -1,5 +1,5 @@ - + @@ -498,8 +498,8 @@ 4.1.0 Introduced $_SERVER. - In previous versions the $HTTP_SERVER_VARS - contained these information. + Note that the deprecated $HTTP_SERVER_VARS + did exist previously. @@ -516,14 +516,14 @@ ]]> &example.outputs.similar; diff --git a/language/predefined/variables/session.xml b/language/predefined/variables/session.xml index dd764d7c45..f27e8cc27c 100644 --- a/language/predefined/variables/session.xml +++ b/language/predefined/variables/session.xml @@ -1,5 +1,5 @@ - + @@ -54,8 +54,8 @@ 4.1.0 Introduced $_SESSION. - In previous the $HTTP_SESSION_VARS - contained these information. + Note that the deprecated $HTTP_SESSION_VARS + did exist previously.