dbs Thu Aug 11 23:31:19 2005 EDT
Modified files:
/phpdoc/en/reference/pdo_dblib reference.xml
/phpdoc/en/reference/pdo_firebird reference.xml
/phpdoc/en/reference/pdo_mysql reference.xml
/phpdoc/en/reference/pdo_oci reference.xml
/phpdoc/en/reference/pdo_odbc reference.xml
/phpdoc/en/reference/pdo_pgsql reference.xml
/phpdoc/en/reference/pdo_sqlite reference.xml
Log:
Whitespace fixes. Grumble grumble.
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_dblib/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_dblib/reference.xml
diff -u phpdoc/en/reference/pdo_dblib/reference.xml:1.1
phpdoc/en/reference/pdo_dblib/reference.xml:1.2
--- phpdoc/en/reference/pdo_dblib/reference.xml:1.1 Thu Aug 11 22:03:49 2005
+++ phpdoc/en/reference/pdo_dblib/reference.xml Thu Aug 11 23:31:14 2005
@@ -35,27 +35,27 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>sybase:</userinput> if PDO_DBLIB was
- linked against the FreeTDS libraries, or <userinput>mssql:</userinput>
- if PDO_DBLIB was linked against the Microsoft SQL Server libraries.
- </para>
+ <para>
+ The DSN prefix is <userinput>sybase:</userinput> if PDO_DBLIB was
+ linked against the FreeTDS libraries, or <userinput>mssql:</userinput>
+ if PDO_DBLIB was linked against the Microsoft SQL Server libraries.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>host</constant></term>
<listitem>
- <para>
- The hostname on which the database server resides.
- </para>
+ <para>
+ The hostname on which the database server resides.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>dbname</constant></term>
<listitem>
- <para>
- The name of the database.
- </para>
+ <para>
+ The name of the database.
+ </para>
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_firebird/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_firebird/reference.xml
diff -u phpdoc/en/reference/pdo_firebird/reference.xml:1.1
phpdoc/en/reference/pdo_firebird/reference.xml:1.2
--- phpdoc/en/reference/pdo_firebird/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_firebird/reference.xml Thu Aug 11 23:31:17 2005
@@ -28,49 +28,49 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>firebird:</userinput>.
- </para>
+ <para>
+ The DSN prefix is <userinput>firebird:</userinput>.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>DataSource</constant></term>
<listitem>
- <para>
- The hostname on which the database server resides.
- </para>
+ <para>
+ The hostname on which the database server resides.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>Port</constant></term>
<listitem>
- <para>
- The port number for the server on which the database is running.
- </para>
+ <para>
+ The port number for the server on which the database is running.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>Database</constant></term>
<listitem>
- <para>
- The name of the database.
- </para>
+ <para>
+ The name of the database.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>User</constant></term>
<listitem>
- <para>
- The name of the user that will connect to the database.
- </para>
+ <para>
+ The name of the user that will connect to the database.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>Password</constant></term>
<listitem>
- <para>
- The password for the user.
- </para>
+ <para>
+ The password for the user.
+ </para>
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_mysql/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_mysql/reference.xml
diff -u phpdoc/en/reference/pdo_mysql/reference.xml:1.1
phpdoc/en/reference/pdo_mysql/reference.xml:1.2
--- phpdoc/en/reference/pdo_mysql/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_mysql/reference.xml Thu Aug 11 23:31:17 2005
@@ -28,25 +28,25 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>mysql:</userinput>.
- </para>
+ <para>
+ The DSN prefix is <userinput>mysql:</userinput>.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>host</constant></term>
<listitem>
- <para>
- The hostname on which the database server resides.
- </para>
+ <para>
+ The hostname on which the database server resides.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>dbname</constant></term>
<listitem>
- <para>
- The name of the database.
- </para>
+ <para>
+ The name of the database.
+ </para>
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_oci/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_oci/reference.xml
diff -u phpdoc/en/reference/pdo_oci/reference.xml:1.1
phpdoc/en/reference/pdo_oci/reference.xml:1.2
--- phpdoc/en/reference/pdo_oci/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_oci/reference.xml Thu Aug 11 23:31:17 2005
@@ -28,20 +28,20 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>oci:</userinput>. If you are connecting
- to a database defined in <filename>tnsnames.ora</filename>, append the
- name of the database to the DSN prefix and your DSN is complete.
- </para>
+ <para>
+ The DSN prefix is <userinput>oci:</userinput>. If you are connecting
+ to a database defined in <filename>tnsnames.ora</filename>, append the
+ name of the database to the DSN prefix and your DSN is complete.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>dbname</constant> (Oracle Instant Client)</term>
<listitem>
- <para>
- The URI for the Oracle Instant Client connection takes the form of
-
<userinput>dbname=//<varname>hostname</varname>:<varname>port-number</varname>/<varname>database</varname></userinput>.
- </para>
+ <para>
+ The URI for the Oracle Instant Client connection takes the form of
+
<userinput>dbname=//<varname>hostname</varname>:<varname>port-number</varname>/<varname>database</varname></userinput>.
+ </para>
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_odbc/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_odbc/reference.xml
diff -u phpdoc/en/reference/pdo_odbc/reference.xml:1.1
phpdoc/en/reference/pdo_odbc/reference.xml:1.2
--- phpdoc/en/reference/pdo_odbc/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_odbc/reference.xml Thu Aug 11 23:31:18 2005
@@ -35,42 +35,42 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>odbc:</userinput>. If you are connecting
- to a database cataloged in the ODBC driver manager or the DB2 catalog,
- you can append the cataloged name of the database to the DSN.
- </para>
+ <para>
+ The DSN prefix is <userinput>odbc:</userinput>. If you are connecting
+ to a database cataloged in the ODBC driver manager or the DB2 catalog,
+ you can append the cataloged name of the database to the DSN.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>DSN</constant></term>
<listitem>
- <para>
- The name of the database as cataloged in the ODBC driver manager or
- the DB2 catalog. Alternately, you can provide a complete ODBC
- connection string to connect to a database as described at
- <ulink url="http://connectionstrings.com"/>.
- </para>
+ <para>
+ The name of the database as cataloged in the ODBC driver manager or
+ the DB2 catalog. Alternately, you can provide a complete ODBC
+ connection string to connect to a database as described at
+ <ulink url="http://connectionstrings.com"/>.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>UID</constant></term>
<listitem>
- <para>
- The name of the user for the connection. If you specify the user name
- in the DSN, PDO ignores the value of the user name argument in the
- PDO constructor.
- </para>
+ <para>
+ The name of the user for the connection. If you specify the user name
+ in the DSN, PDO ignores the value of the user name argument in the
+ PDO constructor.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>PWD</constant></term>
<listitem>
- <para>
- The password of the user for the connection. If you specify the
- password in the DSN, PDO ignores the value of the password argument
- in the PDO constructor.
- </para>
+ <para>
+ The password of the user for the connection. If you specify the
+ password in the DSN, PDO ignores the value of the password argument
+ in the PDO constructor.
+ </para>
</listitem>
</varlistentry>
</variablelist>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_pgsql/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_pgsql/reference.xml
diff -u phpdoc/en/reference/pdo_pgsql/reference.xml:1.1
phpdoc/en/reference/pdo_pgsql/reference.xml:1.2
--- phpdoc/en/reference/pdo_pgsql/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_pgsql/reference.xml Thu Aug 11 23:31:18 2005
@@ -28,53 +28,53 @@
<varlistentry>
<term>DSN prefix</term>
<listitem>
- <para>
- The DSN prefix is <userinput>pgsql:</userinput>.
- </para>
+ <para>
+ The DSN prefix is <userinput>pgsql:</userinput>.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>host</constant></term>
<listitem>
- <para>
- The hostname on which the database server resides.
- </para>
+ <para>
+ The hostname on which the database server resides.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>port</constant></term>
<listitem>
- <para>
- The port on which the database server is running.
- </para>
+ <para>
+ The port on which the database server is running.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>dbname</constant></term>
<listitem>
- <para>
- The name of the database.
- </para>
+ <para>
+ The name of the database.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>user</constant></term>
<listitem>
- <para>
- The name of the user for the connection. If you specify the user name
- in the DSN, PDO ignores the value of the user name argument in the
- PDO constructor.
- </para>
+ <para>
+ The name of the user for the connection. If you specify the user name
+ in the DSN, PDO ignores the value of the user name argument in the
+ PDO constructor.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term><constant>password</constant></term>
<listitem>
- <para>
- The password of the user for the connection. If you specify the
- password in the DSN, PDO ignores the value of the password argument
- in the PDO constructor.
- </para>
+ <para>
+ The password of the user for the connection. If you specify the
+ password in the DSN, PDO ignores the value of the password argument
+ in the PDO constructor.
+ </para>
</listitem>
</varlistentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/pdo_sqlite/reference.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/pdo_sqlite/reference.xml
diff -u phpdoc/en/reference/pdo_sqlite/reference.xml:1.1
phpdoc/en/reference/pdo_sqlite/reference.xml:1.2
--- phpdoc/en/reference/pdo_sqlite/reference.xml:1.1 Thu Aug 11 22:03:50 2005
+++ phpdoc/en/reference/pdo_sqlite/reference.xml Thu Aug 11 23:31:18 2005
@@ -28,53 +28,53 @@
<varlistentry>
<term>DSN prefix (SQLite 3)</term>
<listitem>
- <para>
- The DSN prefix is <userinput>sqlite:</userinput>.
- <itemizedlist>
- <listitem>
- <para>
- To access a database on disk, append the absolute path to the
- DSN prefix.
- </para>
- </listitem>
- <listitem>
- <para>
- To create a database in memory, append <literal>memory:</literal>
- to the DSN prefix.
- </para>
- </listitem>
- </itemizedlist>
- </para>
+ <para>
+ The DSN prefix is <userinput>sqlite:</userinput>.
+ <itemizedlist>
+ <listitem>
+ <para>
+ To access a database on disk, append the absolute path to the
+ DSN prefix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ To create a database in memory, append <literal>memory:</literal>
+ to the DSN prefix.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
</listitem>
</varlistentry>
<varlistentry>
<term>DSN prefix (SQLite 2)</term>
<listitem>
- <para>
- While the default and recommended SQLite version in PDO_SQLITE is
- version 3, the driver also supports accessing and creating SQLite 2
- databases. This enables you to access databases you may have created
- with the <link linkend="ref.sqlite">SQLite</link> extension in
- previous versions of PHP.
- </para>
- <para>
- The DSN prefix for connecting to SQLite 2 databases is
- <userinput>sqlite2:</userinput>.
- <itemizedlist>
- <listitem>
- <para>
- To access a database on disk, append the absolute path to the
- DSN prefix.
- </para>
- </listitem>
- <listitem>
- <para>
- To create a database in memory, append <literal>memory:</literal>
- to the DSN prefix.
- </para>
- </listitem>
- </itemizedlist>
- </para>
+ <para>
+ While the default and recommended SQLite version in PDO_SQLITE is
+ version 3, the driver also supports accessing and creating SQLite 2
+ databases. This enables you to access databases you may have created
+ with the <link linkend="ref.sqlite">SQLite</link> extension in
+ previous versions of PHP.
+ </para>
+ <para>
+ The DSN prefix for connecting to SQLite 2 databases is
+ <userinput>sqlite2:</userinput>.
+ <itemizedlist>
+ <listitem>
+ <para>
+ To access a database on disk, append the absolute path to the
+ DSN prefix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ To create a database in memory, append <literal>memory:</literal>
+ to the DSN prefix.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
</listitem>
</varlistentry>