dave Sat Dec 20 20:05:44 2003 EDT
Modified files:
/phpdoc/en/faq installation.xml using.xml
/phpdoc/en/reference/errorfunc ini.xml
/phpdoc/en/reference/filesystem/functions file.xml
/phpdoc/en/reference/ifx/functions ifx-htmltbl-result.xml
ifx-query.xml
/phpdoc/en/reference/ming/functions swfmovie.setbackground.xml
/phpdoc/en/reference/pcre/functions preg-replace.xml
/phpdoc/en/reference/sesam/functions sesam-query.xml
/phpdoc/en/reference/session ini.xml
/phpdoc/en/reference/strings/functions html-entity-decode.xml
/phpdoc/en/security index.xml
Log:
- html -> HTML where appropriate.
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.24 phpdoc/en/faq/installation.xml:1.25
--- phpdoc/en/faq/installation.xml:1.24 Fri Jul 18 15:16:58 2003
+++ phpdoc/en/faq/installation.xml Sat Dec 20 20:05:37 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
<chapter id="faq.installation">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -319,7 +319,7 @@
<literal>php -i</literal>. If PHP has any problems running,
then a suitable error message will be displayed which will
give you a clue as to what needs to be done next. If you
- get a screen full of html codes (the output of the
+ get a screen full of HTML codes (the output of the
<function>phpinfo</function> function) then PHP is working,
and your problem may be related to your server configuration
which you should double check.
@@ -371,7 +371,7 @@
<literal>php -i</literal>. If PHP has any problems running,
then a suitable error message will be displayed which will
give you a clue as to what needs to be done next. If you
- get a screen full of html codes (the output of the
+ get a screen full of HTML codes (the output of the
<function>phpinfo</function> function) then PHP is working.
</para>
<para>
Index: phpdoc/en/faq/using.xml
diff -u phpdoc/en/faq/using.xml:1.27 phpdoc/en/faq/using.xml:1.28
--- phpdoc/en/faq/using.xml:1.27 Fri Sep 26 12:56:58 2003
+++ phpdoc/en/faq/using.xml Sat Dec 20 20:05:37 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.27 $ -->
+<!-- $Revision: 1.28 $ -->
<chapter id="faq.using">
<title>Using PHP</title>
<titleabbrev>Using PHP</titleabbrev>
@@ -247,8 +247,8 @@
</question>
<answer>
<para>
- Netscape is more strict regarding html tags (such as tables) then
- IE. Running your html output through a html validator, such as
+ Netscape is more strict regarding HTML tags (such as tables) then
+ IE. Running your HTML output through a HTML validator, such as
<ulink url="&url.w3.validator;">validator.w3.org</ulink>, might
be helpful. For example, a missing </table> might cause this.
</para>
Index: phpdoc/en/reference/errorfunc/ini.xml
diff -u phpdoc/en/reference/errorfunc/ini.xml:1.17
phpdoc/en/reference/errorfunc/ini.xml:1.18
--- phpdoc/en/reference/errorfunc/ini.xml:1.17 Thu Dec 11 12:15:43 2003
+++ phpdoc/en/reference/errorfunc/ini.xml Sat Dec 20 20:05:37 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<section id="errorfunc.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -290,7 +290,7 @@
</term>
<listitem>
<para>
- Turn off HTML tags in error messages. The new format for html errors
+ Turn off HTML tags in error messages. The new format for HTML errors
produces clickable messages that direct the user to a page describing
the error or function in causing the error. These references are
affected by
Index: phpdoc/en/reference/filesystem/functions/file.xml
diff -u phpdoc/en/reference/filesystem/functions/file.xml:1.12
phpdoc/en/reference/filesystem/functions/file.xml:1.13
--- phpdoc/en/reference/filesystem/functions/file.xml:1.12 Mon Dec 15 11:49:45
2003
+++ phpdoc/en/reference/filesystem/functions/file.xml Sat Dec 20 20:05:38 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.file">
<refnamediv>
@@ -35,7 +35,7 @@
// the HTML source of a URL.
$lines = file('http://www.example.com/');
-// Loop through our array, show html source as html source; and line numbers too.
+// Loop through our array, show HTML source as HTML source; and line numbers too.
foreach ($lines as $line_num => $line) {
echo "Line #<b>{$line_num}</b> : " . htmlspecialchars($line) . "<br />\n";
}
Index: phpdoc/en/reference/ifx/functions/ifx-htmltbl-result.xml
diff -u phpdoc/en/reference/ifx/functions/ifx-htmltbl-result.xml:1.5
phpdoc/en/reference/ifx/functions/ifx-htmltbl-result.xml:1.6
--- phpdoc/en/reference/ifx/functions/ifx-htmltbl-result.xml:1.5 Mon Dec 15
11:50:39 2003
+++ phpdoc/en/reference/ifx/functions/ifx-htmltbl-result.xml Sat Dec 20 20:05:39
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/ifx.xml, last change in rev 1.2 -->
<refentry id="function.ifx-htmltbl-result">
<refnamediv>
@@ -20,7 +20,7 @@
</para>
<para>
Formats all rows of the <parameter>result_id</parameter> query
- into a html table. The optional second argument is a string of
+ into a HTML table. The optional second argument is a string of
<table> tag options
</para>
<para>
Index: phpdoc/en/reference/ifx/functions/ifx-query.xml
diff -u phpdoc/en/reference/ifx/functions/ifx-query.xml:1.6
phpdoc/en/reference/ifx/functions/ifx-query.xml:1.7
--- phpdoc/en/reference/ifx/functions/ifx-query.xml:1.6 Mon Dec 15 11:50:39 2003
+++ phpdoc/en/reference/ifx/functions/ifx-query.xml Sat Dec 20 20:05:39 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/ifx.xml, last change in rev 1.2 -->
<refentry id="function.ifx-query">
<refnamediv>
@@ -71,7 +71,7 @@
<para>
<example>
<title>
- Show all rows of the "orders" table as a html table
+ Show all rows of the "orders" table as a HTML table
</title>
<programlisting role="php">
<![CDATA[
Index: phpdoc/en/reference/ming/functions/swfmovie.setbackground.xml
diff -u phpdoc/en/reference/ming/functions/swfmovie.setbackground.xml:1.2
phpdoc/en/reference/ming/functions/swfmovie.setbackground.xml:1.3
--- phpdoc/en/reference/ming/functions/swfmovie.setbackground.xml:1.2 Wed Apr 17
02:40:31 2002
+++ phpdoc/en/reference/ming/functions/swfmovie.setbackground.xml Sat Dec 20
20:05:39 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/ming.xml, last change in rev 1.24 -->
<refentry id="function.swfmovie.setbackground">
<refnamediv>
@@ -18,7 +18,7 @@
<para>
<function>swfmovie->setbackground</function> sets the background color. Why is
there no rgba version? Think about it. (Actually, that's not such a dumb
- question after all- you might want to let the html background show through.
+ question after all- you might want to let the HTML background show through.
There's a way to do that, but it only works on IE4. Search the
<ulink url="&url.macromedia;">&url.macromedia;</ulink> site for
details.)
Index: phpdoc/en/reference/pcre/functions/preg-replace.xml
diff -u phpdoc/en/reference/pcre/functions/preg-replace.xml:1.11
phpdoc/en/reference/pcre/functions/preg-replace.xml:1.12
--- phpdoc/en/reference/pcre/functions/preg-replace.xml:1.11 Mon Dec 15 11:52:49
2003
+++ phpdoc/en/reference/pcre/functions/preg-replace.xml Sat Dec 20 20:05:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
<refentry id="function.preg-replace">
<refnamediv>
@@ -218,9 +218,9 @@
// common HTML entities to their text equivalent.
$search = array ("'<script[^>]*?>.*?</script>'si", // Strip out javascript
- "'<[\/\!]*?[^<>]*?>'si", // Strip out html tags
+ "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
"'([\r\n])[\s]+'", // Strip out white space
- "'&(quot|#34);'i", // Replace html entities
+ "'&(quot|#34);'i", // Replace HTML entities
"'&(amp|#38);'i",
"'&(lt|#60);'i",
"'&(gt|#62);'i",
Index: phpdoc/en/reference/sesam/functions/sesam-query.xml
diff -u phpdoc/en/reference/sesam/functions/sesam-query.xml:1.4
phpdoc/en/reference/sesam/functions/sesam-query.xml:1.5
--- phpdoc/en/reference/sesam/functions/sesam-query.xml:1.4 Mon Dec 15 11:53:39
2003
+++ phpdoc/en/reference/sesam/functions/sesam-query.xml Sat Dec 20 20:05:41 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/sesam.xml, last change in rev 1.1 -->
<refentry id="function.sesam-query">
<refnamediv>
@@ -54,7 +54,7 @@
<function>sesam_fetch_result</function>.
<example>
<title>
- Show all rows of the "phone" table as a html table
+ Show all rows of the "phone" table as a HTML table
</title>
<programlisting role="php">
<![CDATA[
Index: phpdoc/en/reference/session/ini.xml
diff -u phpdoc/en/reference/session/ini.xml:1.16
phpdoc/en/reference/session/ini.xml:1.17
--- phpdoc/en/reference/session/ini.xml:1.16 Fri Jul 18 02:27:59 2003
+++ phpdoc/en/reference/session/ini.xml Sat Dec 20 20:05:42 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<section id="session.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -542,7 +542,7 @@
</term>
<listitem>
<simpara>
- <literal>url_rewriter.tags</literal> specifies which html tags
+ <literal>url_rewriter.tags</literal> specifies which HTML tags
are rewritten to include session id if transparent sid support
is enabled. Defaults to
<literal>a=href,area=href,frame=src,input=src,form=fakeentry,fieldset=</literal>
Index: phpdoc/en/reference/strings/functions/html-entity-decode.xml
diff -u phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.5
phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.6
--- phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.5 Mon Dec 15
11:53:50 2003
+++ phpdoc/en/reference/strings/functions/html-entity-decode.xml Sat Dec 20
20:05:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
<refentry id="function.html-entity-decode">
<refnamediv>
@@ -60,7 +60,7 @@
&reference.strings.charsets;
<para>
<example>
- <title>Decoding html entities</title>
+ <title>Decoding HTML entities</title>
<programlisting role="php">
<![CDATA[
<?php
Index: phpdoc/en/security/index.xml
diff -u phpdoc/en/security/index.xml:1.63 phpdoc/en/security/index.xml:1.64
--- phpdoc/en/security/index.xml:1.63 Tue Dec 9 14:07:42 2003
+++ phpdoc/en/security/index.xml Sat Dec 20 20:05:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.63 $ -->
+<!-- $Revision: 1.64 $ -->
<chapter id="security.index">
<title>Security</title>
@@ -1034,7 +1034,7 @@
</para>
<para>
When on, register_globals will inject (poison) your scripts will all
- sorts of variables, like request variables from html forms. This
+ sorts of variables, like request variables from HTML forms. This
coupled with the fact that PHP doesn't require variable initialization
means writing insecure code is that much easier. It was a difficult
decision, but the PHP community decided to disable this directive by
@@ -1270,13 +1270,13 @@
]]>
</programlisting>
</example>
- Or hide it as html code, which has a slight performance hit because
- all html will be parsed through the PHP engine:
+ Or hide it as HTML code, which has a slight performance hit because
+ all HTML will be parsed through the PHP engine:
<example>
- <title>Using html types for PHP extensions</title>
+ <title>Using HTML types for PHP extensions</title>
<programlisting role="apache-conf">
<![CDATA[
-# Make all PHP code look like html
+# Make all PHP code look like HTML
AddType application/x-httpd-php .htm .html
]]>
</programlisting>
