From d738bc8bba35d95b46574ba15520176f8d004e67 Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Wed, 7 Jan 2009 17:59:12 +0000
Subject: [PATCH] Don't wrap programlistings in a <para>

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@272987 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/pdo/pdo/construct.xml  |  8 ++++----
 reference/pdo_odbc/reference.xml | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml
index 54f09b1bbf..31ae8be724 100644
--- a/reference/pdo/pdo/construct.xml
+++ b/reference/pdo/pdo/construct.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <refentry xml:id="pdo.construct" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>PDO::__construct</refname>
@@ -184,11 +184,11 @@ try {
      The following example assumes that &php.ini; contains the following
      entry to enable a connection to a MySQL database using only the
      alias <literal>mydb</literal>:
-     <programlisting role="ini">
+    </para>
+    <programlisting role="ini">
 [PDO]
 pdo.dsn.mydb="mysql:dbname=testdb;host=localhost"
-     </programlisting>
-    </para>
+    </programlisting>
     <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/pdo_odbc/reference.xml b/reference/pdo_odbc/reference.xml
index e703a1238d..a53d2c6273 100644
--- a/reference/pdo_odbc/reference.xml
+++ b/reference/pdo_odbc/reference.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <!-- Purpose: database.vendors -->
 <!-- Membership: bundled, external, pecl -->
 
@@ -123,11 +123,11 @@
       <para>
        The following example shows a PDO_ODBC DSN for connecting to
        an ODBC database cataloged as testdb in the ODBC driver manager:
-       <programlisting><![CDATA[
+      </para>
+      <programlisting><![CDATA[
 odbc:testdb
 ]]>
-       </programlisting>
-      </para>
+      </programlisting>
      </example>
      <example>
       <title>PDO_ODBC DSN example (IBM DB2 uncataloged connection)</title>
@@ -135,11 +135,11 @@ odbc:testdb
        The following example shows a PDO_ODBC DSN for connecting to
        an IBM DB2 database named <userinput>SAMPLE</userinput> using the full
        ODBC DSN syntax:
-       <programlisting><![CDATA[
+      </para>
+      <programlisting><![CDATA[
 odbc:DRIVER={IBM DB2 ODBC DRIVER};HOSTNAME=localhost;PORT=50000;DATABASE=SAMPLE;PROTOCOL=TCPIP;UID=db2inst1;PWD=ibmdb2;
 ]]>
-       </programlisting>
-      </para>
+      </programlisting>
      </example>
      <example>
       <title>PDO_ODBC DSN example (Microsoft Access uncataloged connection)</title>
@@ -147,11 +147,11 @@ odbc:DRIVER={IBM DB2 ODBC DRIVER};HOSTNAME=localhost;PORT=50000;DATABASE=SAMPLE;
        The following example shows a PDO_ODBC DSN for connecting to
        a Microsoft Access database stored at <userinput>C:\db.mdb</userinput> using the full
        ODBC DSN syntax:
-       <programlisting><![CDATA[
+      </para>
+      <programlisting><![CDATA[
 odbc:Driver={Microsoft Access Driver (*.mdb)};Dbq=C:\\db.mdb;Uid=Admin
 ]]>
-       </programlisting>
-      </para>
+      </programlisting>
      </example>
      
     </para>