[PHP-DOC] cvs: phpdoc /en/features commandline.xml file-upload.xml /en/reference/dbplus reference.xml /en/reference/mysql reference.xml /en/reference/mysql/functions mysql-drop-db.xml mysql-insert-id.xml mysql-list-fields.xml mysql-stat.xml mysql-thread-id.xml

[Derick Rethans]

derick          Fri Jun 21 08:51:05 2002 EDT

  Modified files:              
    /phpdoc/en/features commandline.xml file-upload.xml 
    /phpdoc/en/reference/dbplus reference.xml 
    /phpdoc/en/reference/mysql  reference.xml 
    /phpdoc/en/reference/mysql/functions        mysql-drop-db.xml 
                                                mysql-insert-id.xml 
                                                mysql-list-fields.xml 
                                                mysql-stat.xml 
                                                mysql-thread-id.xml 
  Log:
  - fix typoes (found by Paul Hudson <[EMAIL PROTECTED]>)
  
  
Index: phpdoc/en/features/commandline.xml
diff -u phpdoc/en/features/commandline.xml:1.7 phpdoc/en/features/commandline.xml:1.8
--- phpdoc/en/features/commandline.xml:1.7      Thu Jun 13 06:43:23 2002
+++ phpdoc/en/features/commandline.xml  Fri Jun 21 08:50:56 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <chapter id="features.commandline">
  <title>Using PHP from the command line</title>
  <!-- NEW DOCUMENTATION STARTS -->
@@ -101,7 +101,7 @@
     </para>
     <note>
      <para>
-      This directives cannot be initialzied with another value from the
+      These directives cannot be initialzied with another value from the
       configuration file &php.ini; or a custom one (if specified). This is a
       limitation because those default values are applied after all
       configuration files have been parsed. However, their value can be changed
@@ -112,7 +112,7 @@
    </listitem>
    <listitem>
     <para>
-     The ease the operating in the shell environment, the following constants
+     To ease working in the shell environment, the following constants
      are defined:
      <table>
       <title>CLI specific Constants</title>
@@ -165,7 +165,7 @@
      <programlisting role="php">
 php -r 'fwrite(STDERR, "stderr\n");'
      </programlisting>
-     You do not need to explicitely close these streams, this is automatically
+     You do not need to explicitly close these streams, this is automatically
      done by <literal>PHP</literal>.
     </para>
    </listitem>
@@ -226,7 +226,7 @@
  </para>
  <para>
   The list of command line options provided by the <literal>PHP</literal>
-  binary can be queryied anytime by running <literal>PHP</literal> with the
+  binary can be queried anytime by running <literal>PHP</literal> with the
   <literal>-h</literal> switch:
   <screen>
 <![CDATA[
@@ -318,7 +318,7 @@
   You cannot combine any of the three ways to execute code.
  </para>
  <para>
-  Like every shell application not only the <literal>PHP</literal> binary
+  Like every shell application, the <literal>PHP</literal> binary
   accepts a number of arguments but also your <literal>PHP</literal> script
   can receive them. The number of arguments which can be passed to your script
   is not limited by <literal>PHP</literal> (the shell has a certain size limit
@@ -361,7 +361,7 @@
  </screen>
  <para>
   However, there's another way of using <literal>PHP</literal> for shell
-  scripting. You can write a script which's first line starts with
+  scripting. You can write a script where the first line starts with
   <literal>#!/usr/bin/php</literal> and then following the normal
   <literal>PHP</literal> code included within the <literal>PHP</literal>
   starting and end tags and set the execution attributes of the file
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.39 phpdoc/en/features/file-upload.xml:1.40
--- phpdoc/en/features/file-upload.xml:1.39     Sun Jun 16 03:11:00 2002
+++ phpdoc/en/features/file-upload.xml  Fri Jun 21 08:50:56 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.39 $ -->
+<!-- $Revision: 1.40 $ -->
  <chapter id="features.file-upload">
   <title>Handling file uploads</title>
 
@@ -43,7 +43,7 @@
      <para>
       The MAX_FILE_SIZE is advisory to the browser. It is easy to 
       circumvent this maximum. So don't count on it that the browser
-      obeys you wish! The PHP-settings for maximum-size, however,
+      obeys your wish! The PHP-settings for maximum-size, however,
       cannot be fooled.
      </para>
     </warning>
Index: phpdoc/en/reference/dbplus/reference.xml
diff -u phpdoc/en/reference/dbplus/reference.xml:1.3 
phpdoc/en/reference/dbplus/reference.xml:1.4
--- phpdoc/en/reference/dbplus/reference.xml:1.3        Tue Apr 23 07:04:40 2002
+++ phpdoc/en/reference/dbplus/reference.xml    Fri Jun 21 08:50:57 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
  <reference id="ref.dbplus">
   <title>DB++ Functions</title>
   <titleabbrev>DB++</titleabbrev>
@@ -10,11 +10,11 @@
    <section id="dbplus.intro">
     &reftitle.intro;
     <para>
-     db++, made by the german company <ulink
+     db++, made by the German company <ulink
      url="&url.dbplus.company;">Concept asa</ulink>, is a relational
      database system with high performance and low memory and disk
      usage in mind. While providing SQL as an additional language
-     interface it is not really a SQL database in the first place but
+     interface, it is not really a SQL database in the first place but
      provides its own AQL query language which is much more influenced
      by the relational algebra then SQL is.
     </para>
Index: phpdoc/en/reference/mysql/reference.xml
diff -u phpdoc/en/reference/mysql/reference.xml:1.6 
phpdoc/en/reference/mysql/reference.xml:1.7
--- phpdoc/en/reference/mysql/reference.xml:1.6 Sun Jun  9 18:28:04 2002
+++ phpdoc/en/reference/mysql/reference.xml     Fri Jun 21 08:50:58 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
  <reference id="ref.mysql">
   <title>MySQL Functions</title>
   <titleabbrev>MySQL</titleabbrev>
@@ -121,7 +121,7 @@
       </term>
       <listitem>
        <para>
-        Wether to allow
+        Whether to allow
         <link linkend="features.persistent-connections">persistent connections</link>
         to MySQL.
        </para>
@@ -237,7 +237,7 @@
     <para>
      There are two resource types used in the MySQL module. The first one
      is the link identifier for a database connection, the second a resource
-     which helds the result of a query.
+     which holds the result of a query.
     </para>
    </section>
 
Index: phpdoc/en/reference/mysql/functions/mysql-drop-db.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-drop-db.xml:1.4 
phpdoc/en/reference/mysql/functions/mysql-drop-db.xml:1.5
--- phpdoc/en/reference/mysql/functions/mysql-drop-db.xml:1.4   Mon Apr 29 05:35:31 
2002
+++ phpdoc/en/reference/mysql/functions/mysql-drop-db.xml       Fri Jun 21 08:50:59 
+2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-drop-db">
    <refnamediv>
@@ -30,7 +30,7 @@
     <note>
      <para>
       The function <function>mysql_drop_db</function> is deprecated. It is 
-      prefarable to use <function>mysql_query</function> to issue a SQL
+      preferable to use <function>mysql_query</function> to issue a SQL
       DROP DATABASE statement instead.
      </para>
     </note>
Index: phpdoc/en/reference/mysql/functions/mysql-insert-id.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-insert-id.xml:1.4 
phpdoc/en/reference/mysql/functions/mysql-insert-id.xml:1.5
--- phpdoc/en/reference/mysql/functions/mysql-insert-id.xml:1.4 Sat May  4 13:51:31 
2002
+++ phpdoc/en/reference/mysql/functions/mysql-insert-id.xml     Fri Jun 21 08:50:59 
+2002
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-insert-id">
    <refnamediv>
     <refname>mysql_insert_id</refname>
     <refpurpose>
-     Get the id generated from the previous INSERT operation
+     Get the ID generated from the previous INSERT operation
     </refpurpose>
    </refnamediv>
    <refsect1>
Index: phpdoc/en/reference/mysql/functions/mysql-list-fields.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-list-fields.xml:1.2 
phpdoc/en/reference/mysql/functions/mysql-list-fields.xml:1.3
--- phpdoc/en/reference/mysql/functions/mysql-list-fields.xml:1.2       Wed Apr 17 
02:41:12 2002
+++ phpdoc/en/reference/mysql/functions/mysql-list-fields.xml   Fri Jun 21 08:50:59 
+2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-list-fields">
    <refnamediv>
@@ -18,7 +18,7 @@
      </methodsynopsis>
     <para>
      <function>mysql_list_fields</function> retrieves information
-     about the given tablename. Arguments are the database name and
+     about the given table name. Arguments are the database name and
      the table name. A result pointer is returned which can be used
      with <function>mysql_field_flags</function>,
      <function>mysql_field_len</function>,
Index: phpdoc/en/reference/mysql/functions/mysql-stat.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-stat.xml:1.2 
phpdoc/en/reference/mysql/functions/mysql-stat.xml:1.3
--- phpdoc/en/reference/mysql/functions/mysql-stat.xml:1.2      Wed Apr 17 02:41:14 
2002
+++ phpdoc/en/reference/mysql/functions/mysql-stat.xml  Fri Jun 21 08:50:59 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-stat">
    <refnamediv>
@@ -20,7 +20,7 @@
      <function>mysql_stat</function> currently only returns status for uptime,
       threads, queries, open tables, flush tables and queries per second. For a
       complete list of other status variables you have to use the SHOW STATUS
-      sql command.
+      SQL command.
      </para>
     </note>
     <para>
Index: phpdoc/en/reference/mysql/functions/mysql-thread-id.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-thread-id.xml:1.4 
phpdoc/en/reference/mysql/functions/mysql-thread-id.xml:1.5
--- phpdoc/en/reference/mysql/functions/mysql-thread-id.xml:1.4 Sat May 25 18:21:45 
2002
+++ phpdoc/en/reference/mysql/functions/mysql-thread-id.xml     Fri Jun 21 08:50:59 
+2002
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.100 -->
   <refentry id="function.mysql-thread-id">
    <refnamediv>
     <refname>mysql_thread_id</refname>
-    <refpurpose>Return the current thread id</refpurpose>
+    <refpurpose>Return the current thread ID</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
@@ -13,7 +13,11 @@
      <methodparam 
choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
     </methodsynopsis>
     <para>
-     <function>mysql_thread_id</function> returns the current thread id. If the 
connection is lost and you reconnect with <function>mysql_ping</function>, the thread 
ID will change. This means you should not get the thread ID and store it for later. 
You should get it when you need it.
+     <function>mysql_thread_id</function> returns the current thread ID. If
+     the connection is lost and you reconnect with
+     <function>mysql_ping</function>, the thread ID will change. This means
+     you should not get the thread ID and store it for later. You should get
+     it when you need it.
     </para>
      <example>
       <title><function>mysql_thread_id</function> example</title>