From 65e697ff671608989432a6e6bf8ae8128b2be2c7 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Mon, 10 Dec 2012 15:22:07 +0000
Subject: [PATCH] Officially deprecate ext/mysql in the manual.

Specific changes:

- Upgraded the soft deprecation sidebars to full blown warnings.
- Beefed up the wording of the soft deprecation notice boilerplate.
- Added changelog items for mysql_connect() and mysql_pconnect(), since they're
  the functions that have changed behaviour.
- Updated the MySQL changelog.
- Updated the 5.5 migration guide.


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328734 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration55.xml                        | 12 ++++++++++++
 language-snippets.ent                             |  8 ++++----
 reference/mysql/book.xml                          |  5 +++--
 reference/mysql/changelog.xml                     | 15 ++++++++++++++-
 reference/mysql/functions/mysql-affected-rows.xml |  6 +++---
 .../mysql/functions/mysql-client-encoding.xml     |  6 +++---
 reference/mysql/functions/mysql-close.xml         |  6 +++---
 reference/mysql/functions/mysql-connect.xml       | 13 ++++++++++---
 reference/mysql/functions/mysql-create-db.xml     |  6 +++---
 reference/mysql/functions/mysql-data-seek.xml     |  6 +++---
 reference/mysql/functions/mysql-db-name.xml       |  6 +++---
 reference/mysql/functions/mysql-db-query.xml      |  6 +++---
 reference/mysql/functions/mysql-drop-db.xml       |  6 +++---
 reference/mysql/functions/mysql-errno.xml         |  6 +++---
 reference/mysql/functions/mysql-error.xml         |  6 +++---
 reference/mysql/functions/mysql-escape-string.xml |  6 +++---
 reference/mysql/functions/mysql-fetch-array.xml   |  6 +++---
 reference/mysql/functions/mysql-fetch-assoc.xml   |  6 +++---
 reference/mysql/functions/mysql-fetch-field.xml   |  6 +++---
 reference/mysql/functions/mysql-fetch-lengths.xml |  6 +++---
 reference/mysql/functions/mysql-fetch-object.xml  |  6 +++---
 reference/mysql/functions/mysql-fetch-row.xml     |  6 +++---
 reference/mysql/functions/mysql-field-flags.xml   |  6 +++---
 reference/mysql/functions/mysql-field-len.xml     |  6 +++---
 reference/mysql/functions/mysql-field-name.xml    |  6 +++---
 reference/mysql/functions/mysql-field-seek.xml    |  6 +++---
 reference/mysql/functions/mysql-field-table.xml   |  6 +++---
 reference/mysql/functions/mysql-field-type.xml    |  6 +++---
 reference/mysql/functions/mysql-free-result.xml   |  6 +++---
 .../mysql/functions/mysql-get-client-info.xml     |  6 +++---
 reference/mysql/functions/mysql-get-host-info.xml |  6 +++---
 .../mysql/functions/mysql-get-proto-info.xml      |  6 +++---
 .../mysql/functions/mysql-get-server-info.xml     |  6 +++---
 reference/mysql/functions/mysql-info.xml          |  6 +++---
 reference/mysql/functions/mysql-insert-id.xml     |  6 +++---
 reference/mysql/functions/mysql-list-dbs.xml      |  6 +++---
 reference/mysql/functions/mysql-list-fields.xml   |  6 +++---
 .../mysql/functions/mysql-list-processes.xml      |  6 +++---
 reference/mysql/functions/mysql-list-tables.xml   |  6 +++---
 reference/mysql/functions/mysql-num-fields.xml    |  6 +++---
 reference/mysql/functions/mysql-num-rows.xml      |  6 +++---
 reference/mysql/functions/mysql-pconnect.xml      | 13 ++++++++++---
 reference/mysql/functions/mysql-ping.xml          |  6 +++---
 reference/mysql/functions/mysql-query.xml         |  6 +++---
 .../mysql/functions/mysql-real-escape-string.xml  |  6 +++---
 reference/mysql/functions/mysql-result.xml        | 14 ++++++++++++++
 reference/mysql/functions/mysql-select-db.xml     |  6 +++---
 reference/mysql/functions/mysql-set-charset.xml   |  6 +++---
 reference/mysql/functions/mysql-stat.xml          |  6 +++---
 reference/mysql/functions/mysql-tablename.xml     |  6 +++---
 reference/mysql/functions/mysql-thread-id.xml     |  6 +++---
 .../mysql/functions/mysql-unbuffered-query.xml    |  6 +++---
 reference/mysqlinfo/set.xml                       | 12 +++++++-----
 53 files changed, 209 insertions(+), 153 deletions(-)

diff --git a/appendices/migration55.xml b/appendices/migration55.xml
index 550a0f76bc..278deeeaef 100644
--- a/appendices/migration55.xml
+++ b/appendices/migration55.xml
@@ -331,6 +331,18 @@ String dereferencing: P
  <sect1 xml:id="migration55.deprecated">
   <title>Deprecated features in PHP 5.5.x</title>
 
+  <sect2 xml:id="migration55.deprecated.mysql">
+   <title><link linkend="book.mysql">ext/mysql</link> deprecation</title>
+
+   <para>
+    The <link linkend="book.mysql">original MySQL extension</link> is now
+    deprecated, and will generate <constant>E_DEPRECATED</constant> errors
+    when connecting to a database. Instead, use the
+    <link linkend="book.mysqli">MySQLi</link> or
+    <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
+   </para>
+  </sect2>
+
   <sect2 xml:id="migration55.deprecated.preg-replace-e">
    <title><function>preg_replace</function> <literal>/e</literal> modifier</title>
 
diff --git a/language-snippets.ent b/language-snippets.ent
index e9eb4302fe..cc883de58e 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1167,10 +1167,10 @@ field_offset</parameter></term><listitem><para>The numerical field offset. The
 <parameter>field_offset</parameter> does not exist, an error of level
 <constant>E_WARNING</constant> is also issued.</para></listitem></varlistentry>'>
 
-<!ENTITY mysql.alternative.note '<title xmlns="http://docbook.org/ns/docbook">Suggested alternatives</title>
-<para xmlns="http://docbook.org/ns/docbook">Use of this extension is discouraged. Instead, the <link linkend="book.mysqli">MySQLi</link> or 
-<link linkend="ref.pdo-mysql">PDO_MySQL</link> extension should be used. See also <link linkend="mysqlinfo.api.choosing">MySQL: 
-choosing an API</link> guide and <link linkend="faq.databases.mysql.deprecated">related FAQ</link> for more information. 
+<!ENTITY mysql.alternative.note '<para xmlns="http://docbook.org/ns/docbook">This extension is deprecated as of PHP 5.5.0, and will be removed in the future.
+Instead, the <link linkend="book.mysqli">MySQLi</link> or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extension should be used.
+See also <link linkend="mysqlinfo.api.choosing">MySQL: choosing an API</link> guide and
+<link linkend="faq.databases.mysql.deprecated">related FAQ</link> for more information. 
 Alternatives to this function include:</para>'>
 
 <!-- Sybase Notes -->
diff --git a/reference/mysql/book.xml b/reference/mysql/book.xml
index 3468d53571..cecc482f8d 100644
--- a/reference/mysql/book.xml
+++ b/reference/mysql/book.xml
@@ -11,8 +11,9 @@
  <preface xml:id="intro.mysql">
   &reftitle.intro;
   <para>
-   This extension is not recommended for writing new code. Instead,
-   either the <link linkend="book.mysqli">mysqli</link> or
+   This extension is deprecated as of PHP 5.5.0, and is not recommended for
+   writing new code as it will be removed in the future. Instead, either the
+   <link linkend="book.mysqli">mysqli</link> or
    <link linkend="ref.pdo-mysql">PDO_MySQL</link> extension should be
    used. See also the <link linkend="mysqlinfo.api.choosing">MySQL API
    Overview</link> for further help while choosing a MySQL API.
diff --git a/reference/mysql/changelog.xml b/reference/mysql/changelog.xml
index 93c5d4047c..f7d84a2361 100644
--- a/reference/mysql/changelog.xml
+++ b/reference/mysql/changelog.xml
@@ -40,7 +40,20 @@
        <entry>5.5.0</entry>
        <entry>
         <para>
-         All of the old deprecated functions and aliases now emit E_DEPRECATED errors. These functions are:
+         This extension has been deprecated. Connecting to a MySQL database
+         via <function>mysql_connect</function>,
+         <function>mysql_pconnect</function> or an implicit connection via any
+         other <literal>mysql_*</literal> function will generate an
+         <constant>E_DEPRECATED</constant> error.
+        </para>
+       </entry>
+      </row>
+      <row>
+       <entry>5.5.0</entry>
+       <entry>
+        <para>
+         All of the old deprecated functions and aliases now emit
+         <constant>E_DEPRECATED</constant> errors. These functions are:
         </para>
         <para>
          mysql(), mysql_fieldname(), mysql_fieldtable(), mysql_fieldlen(), mysql_fieldtype(), mysql_fieldflags(), mysql_selectdb(),
diff --git a/reference/mysql/functions/mysql-affected-rows.xml b/reference/mysql/functions/mysql-affected-rows.xml
index aa1e4d6bb5..633764ad32 100644
--- a/reference/mysql/functions/mysql-affected-rows.xml
+++ b/reference/mysql/functions/mysql-affected-rows.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get number of affected rows in previous MySQL operation</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_affected_rows</function></member>
     <member><methodname>PDOStatement::rowCount</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-client-encoding.xml b/reference/mysql/functions/mysql-client-encoding.xml
index 765936e9f5..92a72c4314 100644
--- a/reference/mysql/functions/mysql-client-encoding.xml
+++ b/reference/mysql/functions/mysql-client-encoding.xml
@@ -6,13 +6,13 @@
   <refpurpose>Returns the name of the character set</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_character_set_name</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-close.xml b/reference/mysql/functions/mysql-close.xml
index 924b315321..091ada4327 100644
--- a/reference/mysql/functions/mysql-close.xml
+++ b/reference/mysql/functions/mysql-close.xml
@@ -6,14 +6,14 @@
   <refpurpose>Close MySQL connection</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_close</function></member>
     <member>PDO: Assign the value of &null; to the PDO object</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
index 02f3296a96..dd93dba533 100644
--- a/reference/mysql/functions/mysql-connect.xml
+++ b/reference/mysql/functions/mysql-connect.xml
@@ -6,14 +6,14 @@
   <refpurpose>Open a connection to a MySQL Server</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_connect</function></member>
     <member><methodname>PDO::__construct</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
@@ -126,6 +126,13 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.5.0</entry>
+       <entry>
+        This function will generate an <constant>E_DEPRECATED</constant>
+        error.
+       </entry>
+      </row>
       <row>
        <entry>4.3.0</entry>
        <entry>
diff --git a/reference/mysql/functions/mysql-create-db.xml b/reference/mysql/functions/mysql-create-db.xml
index 498b8d978b..1a199d3a5e 100644
--- a/reference/mysql/functions/mysql-create-db.xml
+++ b/reference/mysql/functions/mysql-create-db.xml
@@ -6,14 +6,14 @@
   <refpurpose>Create a MySQL database</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_query</function></member>
     <member><methodname>PDO::query</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-data-seek.xml b/reference/mysql/functions/mysql-data-seek.xml
index d6817a8094..206100e2a2 100644
--- a/reference/mysql/functions/mysql-data-seek.xml
+++ b/reference/mysql/functions/mysql-data-seek.xml
@@ -6,14 +6,14 @@
   <refpurpose>Move internal result pointer</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_data_seek</function></member>
     <member><constant>PDO::FETCH_ORI_ABS</constant></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml
index 7db8f302e5..665a4a34df 100644
--- a/reference/mysql/functions/mysql-db-name.xml
+++ b/reference/mysql/functions/mysql-db-name.xml
@@ -6,13 +6,13 @@
   <refpurpose>Retrieves database name from the call to <function>mysql_list_dbs</function></refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>Query: <literal>SELECT DATABASE()</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-db-query.xml b/reference/mysql/functions/mysql-db-query.xml
index 2ce2a1c471..69b7a67e8e 100644
--- a/reference/mysql/functions/mysql-db-query.xml
+++ b/reference/mysql/functions/mysql-db-query.xml
@@ -6,14 +6,14 @@
   <refpurpose>Selects a database and executes a query on it</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_select_db</function> then the query</member>
     <member><methodname>PDO::__construct</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-drop-db.xml b/reference/mysql/functions/mysql-drop-db.xml
index 32b3241178..ee286f2ea9 100644
--- a/reference/mysql/functions/mysql-drop-db.xml
+++ b/reference/mysql/functions/mysql-drop-db.xml
@@ -6,13 +6,13 @@
   <refpurpose>Drop (delete) a MySQL database</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>Execute a <literal>DROP DATABASE</literal> query</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-errno.xml b/reference/mysql/functions/mysql-errno.xml
index 318a4afc09..5838a6545e 100644
--- a/reference/mysql/functions/mysql-errno.xml
+++ b/reference/mysql/functions/mysql-errno.xml
@@ -6,14 +6,14 @@
   <refpurpose>Returns the numerical value of the error message from previous MySQL operation</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_errno</function></member>
     <member><methodname>PDO::errorCode</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-error.xml b/reference/mysql/functions/mysql-error.xml
index 479b7d23d5..0c5e33209b 100644
--- a/reference/mysql/functions/mysql-error.xml
+++ b/reference/mysql/functions/mysql-error.xml
@@ -6,14 +6,14 @@
   <refpurpose>Returns the text of the error message from previous MySQL operation</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_error</function></member>
     <member><methodname>PDO::errorInfo</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-escape-string.xml b/reference/mysql/functions/mysql-escape-string.xml
index 94eb7bbebe..ffc6124feb 100644
--- a/reference/mysql/functions/mysql-escape-string.xml
+++ b/reference/mysql/functions/mysql-escape-string.xml
@@ -6,14 +6,14 @@
   <refpurpose>Escapes a string for use in a mysql_query</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_escape_string</function></member>
     <member><methodname>PDO::quote</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
index 2e4671d873..5e98209df2 100644
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ b/reference/mysql/functions/mysql-fetch-array.xml
@@ -6,14 +6,14 @@
   <refpurpose>Fetch a result row as an associative array, a numeric array, or both</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_array</function></member>
     <member><methodname>PDOStatement::fetch</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
index 41851fffca..d13d8843f8 100644
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ b/reference/mysql/functions/mysql-fetch-assoc.xml
@@ -6,14 +6,14 @@
   <refpurpose>Fetch a result row as an associative array</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_assoc</function></member>
     <member><methodname phd:args="PDO::FETCH_ASSOC">PDOStatement::fetch</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-field.xml b/reference/mysql/functions/mysql-fetch-field.xml
index 643d24ce99..d5138e348f 100644
--- a/reference/mysql/functions/mysql-fetch-field.xml
+++ b/reference/mysql/functions/mysql-fetch-field.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get column information from a result and return as an object</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field</function></member>
     <member><methodname>PDOStatement::getColumnMeta</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-lengths.xml b/reference/mysql/functions/mysql-fetch-lengths.xml
index 91361de6f0..d54960ad2f 100644
--- a/reference/mysql/functions/mysql-fetch-lengths.xml
+++ b/reference/mysql/functions/mysql-fetch-lengths.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get the length of each output in a result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_lengths</function></member>
     <member><methodname>PDOStatement::getColumnMeta</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
index 24198e8920..4eff43cfcc 100644
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ b/reference/mysql/functions/mysql-fetch-object.xml
@@ -6,14 +6,14 @@
   <refpurpose>Fetch a result row as an object</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_object</function></member>
     <member><methodname phd:args="PDO::FETCH_OBJ">PDOStatement::fetch</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
index ce2b8e5683..5c6b9dc143 100644
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ b/reference/mysql/functions/mysql-fetch-row.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get a result row as an enumerated array</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_row</function></member>
     <member><methodname phd:args="PDO::FETCH_NUM">PDOStatement::fetch</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-flags.xml b/reference/mysql/functions/mysql-field-flags.xml
index c1b5a5a917..3e5f1885a3 100644
--- a/reference/mysql/functions/mysql-field-flags.xml
+++ b/reference/mysql/functions/mysql-field-flags.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get the flags associated with the specified field in a result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_fields</function> [flags]</member>
     <member><methodname>PDOStatement::getColumnMeta</methodname> [flags]</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-len.xml b/reference/mysql/functions/mysql-field-len.xml
index 7d8f6e02f0..ab018ebf9d 100644
--- a/reference/mysql/functions/mysql-field-len.xml
+++ b/reference/mysql/functions/mysql-field-len.xml
@@ -6,14 +6,14 @@
   <refpurpose>Returns the length of the specified field</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [length]</member>
     <member><methodname>PDOStatement::getColumnMeta</methodname> [len]</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-name.xml b/reference/mysql/functions/mysql-field-name.xml
index b0ede0fac5..5e5fe204e4 100644
--- a/reference/mysql/functions/mysql-field-name.xml
+++ b/reference/mysql/functions/mysql-field-name.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get the name of the specified field in a result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [name] or [orgname]</member>
     <member><methodname>PDOStatement::getColumnMeta</methodname> [name]</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-seek.xml b/reference/mysql/functions/mysql-field-seek.xml
index 4637745fab..a235ee83db 100644
--- a/reference/mysql/functions/mysql-field-seek.xml
+++ b/reference/mysql/functions/mysql-field-seek.xml
@@ -6,15 +6,15 @@
   <refpurpose>Set result pointer to a specified field offset</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_field_seek</function></member>
     <!-- @TODO Expand on the following -->
     <member><methodname>PDOStatement::fetch</methodname> using optional parameters</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-table.xml b/reference/mysql/functions/mysql-field-table.xml
index dc856f05b4..478220db6e 100644
--- a/reference/mysql/functions/mysql-field-table.xml
+++ b/reference/mysql/functions/mysql-field-table.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get name of the table the specified field is in</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [table] or [orgtable]</member>
     <member><methodname>PDOStatement::getColumnMeta</methodname> [table]</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-field-type.xml b/reference/mysql/functions/mysql-field-type.xml
index 8519916956..06949c5d92 100644
--- a/reference/mysql/functions/mysql-field-type.xml
+++ b/reference/mysql/functions/mysql-field-type.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get the type of the specified field in a result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_fetch_field_direct</function> [type]</member>
     <member><methodname>PDOStatement::getColumnMeta</methodname> [driver:decl_type] or [pdo_type]</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-free-result.xml b/reference/mysql/functions/mysql-free-result.xml
index 80e16508d4..df8026bf52 100644
--- a/reference/mysql/functions/mysql-free-result.xml
+++ b/reference/mysql/functions/mysql-free-result.xml
@@ -6,14 +6,14 @@
   <refpurpose>Free result memory</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_free_result</function></member>
     <member>Assign the value of &null; to the PDO object, or <methodname>PDOStatement::closeCursor</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
index d46b4cb101..c97b099995 100644
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ b/reference/mysql/functions/mysql-get-client-info.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get MySQL client info</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_get_client_info</function></member>
     <member><methodname phd:args="PDO::ATTR_CLIENT_VERSION">PDO::getAttribute</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-get-host-info.xml b/reference/mysql/functions/mysql-get-host-info.xml
index 229a07432e..9d83ca7bea 100644
--- a/reference/mysql/functions/mysql-get-host-info.xml
+++ b/reference/mysql/functions/mysql-get-host-info.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get MySQL host info</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_get_host_info</function></member>
     <member><methodname phd:args="PDO::ATTR_CONNECTION_STATUS">PDO::getAttribute</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-get-proto-info.xml b/reference/mysql/functions/mysql-get-proto-info.xml
index b609bf1ae5..9c4a88d0b6 100644
--- a/reference/mysql/functions/mysql-get-proto-info.xml
+++ b/reference/mysql/functions/mysql-get-proto-info.xml
@@ -6,13 +6,13 @@
   <refpurpose>Get MySQL protocol info</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_get_proto_info</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-get-server-info.xml b/reference/mysql/functions/mysql-get-server-info.xml
index 1f8584af4b..1c8d34224b 100644
--- a/reference/mysql/functions/mysql-get-server-info.xml
+++ b/reference/mysql/functions/mysql-get-server-info.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get MySQL server info</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_get_server_info</function></member>
     <member><methodname phd:args="PDO::ATTR_SERVER_VERSION">PDO::getAttribute</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-info.xml b/reference/mysql/functions/mysql-info.xml
index 309e56d207..cb17111888 100644
--- a/reference/mysql/functions/mysql-info.xml
+++ b/reference/mysql/functions/mysql-info.xml
@@ -6,13 +6,13 @@
   <refpurpose>Get information about the most recent query</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_info</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-insert-id.xml b/reference/mysql/functions/mysql-insert-id.xml
index 18675965ca..c11f7d597b 100644
--- a/reference/mysql/functions/mysql-insert-id.xml
+++ b/reference/mysql/functions/mysql-insert-id.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get the ID generated in the last query</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_insert_id</function></member>
     <member><methodname>PDO::lastInsertId</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-list-dbs.xml b/reference/mysql/functions/mysql-list-dbs.xml
index 99eaa05e97..c675bd784f 100644
--- a/reference/mysql/functions/mysql-list-dbs.xml
+++ b/reference/mysql/functions/mysql-list-dbs.xml
@@ -6,13 +6,13 @@
   <refpurpose>List databases available on a MySQL server</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>SQL Query: <literal>SHOW DATABASES</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-list-fields.xml b/reference/mysql/functions/mysql-list-fields.xml
index 6fd3f8a008..7753d04406 100644
--- a/reference/mysql/functions/mysql-list-fields.xml
+++ b/reference/mysql/functions/mysql-list-fields.xml
@@ -6,13 +6,13 @@
   <refpurpose>List MySQL table fields</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>SQL Query: <literal>SHOW COLUMNS FROM sometable</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-list-processes.xml b/reference/mysql/functions/mysql-list-processes.xml
index 0b59a5bad9..564ffc3854 100644
--- a/reference/mysql/functions/mysql-list-processes.xml
+++ b/reference/mysql/functions/mysql-list-processes.xml
@@ -6,13 +6,13 @@
   <refpurpose>List MySQL processes</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_thread_id</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-list-tables.xml b/reference/mysql/functions/mysql-list-tables.xml
index 0064dbf644..f2c7a04ba8 100644
--- a/reference/mysql/functions/mysql-list-tables.xml
+++ b/reference/mysql/functions/mysql-list-tables.xml
@@ -6,13 +6,13 @@
   <refpurpose>List tables in a MySQL database</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>SQL Query: <literal>SHOW TABLES FROM sometable</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-num-fields.xml b/reference/mysql/functions/mysql-num-fields.xml
index 87d9210640..44bd0ca44f 100644
--- a/reference/mysql/functions/mysql-num-fields.xml
+++ b/reference/mysql/functions/mysql-num-fields.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get number of fields in result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_field_count</function></member>
     <member><methodname>PDOStatement::columnCount</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-num-rows.xml b/reference/mysql/functions/mysql-num-rows.xml
index 4466d4997e..652b9dfb47 100644
--- a/reference/mysql/functions/mysql-num-rows.xml
+++ b/reference/mysql/functions/mysql-num-rows.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get number of rows in result</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_stmt_num_rows</function></member>
     <member><methodname>PDOStatement::rowCount</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-pconnect.xml b/reference/mysql/functions/mysql-pconnect.xml
index 7cd54187e1..5629b97082 100644
--- a/reference/mysql/functions/mysql-pconnect.xml
+++ b/reference/mysql/functions/mysql-pconnect.xml
@@ -6,14 +6,14 @@
   <refpurpose>Open a persistent connection to a MySQL server</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_connect</function> with <literal>p:</literal> host prefix</member>
     <member><methodname>PDO::__construct</methodname> with <constant>PDO::ATTR_PERSISTENT</constant> as a driver option</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
@@ -134,6 +134,13 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>5.5.0</entry>
+       <entry>
+        This function will generate an <constant>E_DEPRECATED</constant>
+        error.
+       </entry>
+      </row>
       <row>
        <entry>4.3.0</entry>
        <entry>
diff --git a/reference/mysql/functions/mysql-ping.xml b/reference/mysql/functions/mysql-ping.xml
index dadfdfad78..cb3d62a646 100644
--- a/reference/mysql/functions/mysql-ping.xml
+++ b/reference/mysql/functions/mysql-ping.xml
@@ -6,13 +6,13 @@
   <refpurpose>Ping a server connection or reconnect if there is no connection</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_ping</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-query.xml b/reference/mysql/functions/mysql-query.xml
index 63f3687a94..8203b1cf2f 100644
--- a/reference/mysql/functions/mysql-query.xml
+++ b/reference/mysql/functions/mysql-query.xml
@@ -6,14 +6,14 @@
   <refpurpose>Send a MySQL query</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_query</function></member>
     <member><methodname>PDO::query</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-real-escape-string.xml b/reference/mysql/functions/mysql-real-escape-string.xml
index 588b838429..bdc20018be 100644
--- a/reference/mysql/functions/mysql-real-escape-string.xml
+++ b/reference/mysql/functions/mysql-real-escape-string.xml
@@ -6,14 +6,14 @@
   <refpurpose>Escapes special characters in a string for use in an SQL statement</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_real_escape_string</function></member>
     <member><methodname>PDO::quote</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-result.xml b/reference/mysql/functions/mysql-result.xml
index da6839633b..a0845a0bc1 100644
--- a/reference/mysql/functions/mysql-result.xml
+++ b/reference/mysql/functions/mysql-result.xml
@@ -6,6 +6,20 @@
   <refpurpose>Get result data</refpurpose>
  </refnamediv>
 
+ <refsynopsisdiv>
+  <warning>
+   &mysql.alternative.note;
+   <simplelist role="alternatives">
+    <member>
+     <function>mysqli_data_seek</function> in conjunction with
+     <function>mysqli_field_seek</function> and
+     <function>mysqli_fetch_field</function>
+    </member>
+    <member><methodname>PDOStatement::fetchColumn</methodname></member>
+   </simplelist>
+  </warning>
+ </refsynopsisdiv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
diff --git a/reference/mysql/functions/mysql-select-db.xml b/reference/mysql/functions/mysql-select-db.xml
index bfdb218407..d4b21fd6f2 100644
--- a/reference/mysql/functions/mysql-select-db.xml
+++ b/reference/mysql/functions/mysql-select-db.xml
@@ -6,14 +6,14 @@
   <refpurpose>Select a MySQL database</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_select_db</function></member>
     <member><methodname>PDO::__construct</methodname> (part of dsn)</member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-set-charset.xml b/reference/mysql/functions/mysql-set-charset.xml
index 15e5157e3b..3c9be87e84 100644
--- a/reference/mysql/functions/mysql-set-charset.xml
+++ b/reference/mysql/functions/mysql-set-charset.xml
@@ -6,14 +6,14 @@
   <refpurpose>Sets the client character set</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_character_set_name</function></member>
     <member>PDO: Add <literal>charset</literal> to the connection string, such as <literal>charset=utf8</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-stat.xml b/reference/mysql/functions/mysql-stat.xml
index e217d383d5..038e49dcef 100644
--- a/reference/mysql/functions/mysql-stat.xml
+++ b/reference/mysql/functions/mysql-stat.xml
@@ -6,14 +6,14 @@
   <refpurpose>Get current system status</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_stat</function></member>
     <member><methodname phd:args="PDO::ATTR_SERVER_INFO">PDO::getAttribute</methodname></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-tablename.xml b/reference/mysql/functions/mysql-tablename.xml
index 9c0482e457..ac854fc173 100644
--- a/reference/mysql/functions/mysql-tablename.xml
+++ b/reference/mysql/functions/mysql-tablename.xml
@@ -6,13 +6,13 @@
   <refpurpose>Get table name of field</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>SQL Query: <literal>SHOW TABLES</literal></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-thread-id.xml b/reference/mysql/functions/mysql-thread-id.xml
index 58d8d5eb1e..c772a27864 100644
--- a/reference/mysql/functions/mysql-thread-id.xml
+++ b/reference/mysql/functions/mysql-thread-id.xml
@@ -6,13 +6,13 @@
   <refpurpose>Return the current thread ID</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member><function>mysqli_thread_id</function></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysql/functions/mysql-unbuffered-query.xml b/reference/mysql/functions/mysql-unbuffered-query.xml
index 81a02796da..ff6f251ed7 100644
--- a/reference/mysql/functions/mysql-unbuffered-query.xml
+++ b/reference/mysql/functions/mysql-unbuffered-query.xml
@@ -6,13 +6,13 @@
   <refpurpose>Send an SQL query to MySQL without fetching and buffering the result rows.</refpurpose>
  </refnamediv>
 
- <refsynopsisdiv role="soft-deprecation-notice">
-  <sidebar>
+ <refsynopsisdiv>
+  <warning>
    &mysql.alternative.note;
    <simplelist role="alternatives">
     <member>See: <link linkend="mysqlinfo.concepts.buffering">Buffered and Unbuffered queries</link></member>
    </simplelist>
-  </sidebar>
+  </warning>
  </refsynopsisdiv>
 
  <refsect1 role="description">
diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml
index ab63bc7033..1662115698 100644
--- a/reference/mysqlinfo/set.xml
+++ b/reference/mysqlinfo/set.xml
@@ -199,10 +199,12 @@ echo htmlentities($row['_message']);
     It is recommended to use either the <link linkend="book.mysqli">mysqli</link>
     or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
     It is not recommended to use the old <link linkend="ref.mysql">mysql</link>
-    extension for new development. A detailed feature comparison matrix is provided
-    below. The overall performance of all three extensions is considered to be
-    about the same. Although the performance of the extension contributes only a fraction
-    of the total run time of a PHP web request. Often, the impact is as low as 0.1%.
+    extension for new development, as it has been deprecated as of PHP 5.5.0
+    and will be removed in the future. A detailed feature comparison matrix is
+    provided below. The overall performance of all three extensions is
+    considered to be about the same. Although the performance of the extension
+    contributes only a fraction of the total run time of a PHP web request.
+    Often, the impact is as low as 0.1%.
    </para>
    <para>
     <emphasis role="bold">Feature comparison</emphasis>
@@ -240,7 +242,7 @@ echo htmlentities($row['_message']);
        <entry>Lifecycle</entry>
        <entry>Active</entry>
        <entry>Active</entry>
-       <entry>Long term deprecation announced</entry>
+       <entry>Deprecated</entry>
       </row>
       <row>
        <entry>Recommended for new projects</entry>