diff --git a/chapters/tutorial.xml b/chapters/tutorial.xml index 481b7bcd95..c60a518e80 100644 --- a/chapters/tutorial.xml +++ b/chapters/tutorial.xml @@ -1,5 +1,5 @@ - + A simple tutorial @@ -78,7 +78,7 @@ web servers configuration. Although this is outside the scope of this tutorial, see also the DocumentRoot and ServerName directives in your web servers - configuration file. (on Apache this is httpd.conf). + configuration file. (on Apache this is &httpd.conf;). If everything is setup correctly, this file will be parsed by PHP and the following output will make it to your browser: diff --git a/reference/apache/ini.xml b/reference/apache/ini.xml index 897a5d6d86..a687c1e02d 100644 --- a/reference/apache/ini.xml +++ b/reference/apache/ini.xml @@ -1,14 +1,14 @@ - +
&reftitle.runtime; The behaviour of the Apache PHP module is affected by settings in &php.ini;. Configuration settings from &php.ini; may be overridden by php_flag settings - in the server configuration file or local .htaccess files. + in the server configuration file or local &htaccess; files. - Turning off PHP parsing for a directory using <filename>.htaccess</filename> + Turning off PHP parsing for a directory using &htaccess; php_flag engine off @@ -68,10 +68,9 @@ This directive is really only useful in the Apache module version of PHP. It is used by sites that would like to turn PHP parsing on and off on a per-directory or per-virtual - server basis. By putting engine - off in the appropriate places in the - httpd.conf file, PHP can be enabled or - disabled. + server basis. By putting engine off + in the appropriate places in the &httpd.conf; file, PHP can + be enabled or disabled. diff --git a/reference/info/functions/ini-set.xml b/reference/info/functions/ini-set.xml index fb6b182756..1fbc4e6a69 100644 --- a/reference/info/functions/ini-set.xml +++ b/reference/info/functions/ini-set.xml @@ -1,5 +1,5 @@ - + @@ -1212,15 +1212,14 @@ PHP_INI_PERDIR 2 - Entry can be set in &php.ini;, .htaccess or - httpd.conf + Entry can be set in &php.ini;, &htaccess; or &httpd.conf; PHP_INI_SYSTEM 4 - Entry can be set in &php.ini; or httpd.conf + Entry can be set in &php.ini; or &httpd.conf; diff --git a/reference/var/functions/unserialize.xml b/reference/var/functions/unserialize.xml index 6b449e273e..354e887b08 100644 --- a/reference/var/functions/unserialize.xml +++ b/reference/var/functions/unserialize.xml @@ -1,5 +1,5 @@ - + @@ -29,7 +29,7 @@ It's possible to set a callback-function which will be called, if an undefined class should be instantiated during unserializing. (to prevent getting an incomplete object "__PHP_Incomplete_Class".) - Use your &php.ini;, ini_set or .htaccess + Use your &php.ini;, ini_set or &htaccess; to define 'unserialize_callback_func'. Everytime an undefined class should be instantiated, it'll be called. To disable this feature just empty this setting. Also note that the directive