diff --git a/language-snippets.ent b/language-snippets.ent
index f768aae12e..f906092623 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -1086,12 +1086,10 @@ field_offsetThe numerical field offset. The
field_offset does not exist, an error of level
E_WARNING is also issued.'>
-
-
Suggested alternatives
Use of this extension is discouraged. Instead, the MySQLi or
PDO_MySQL extension should be used. See also MySQL:
-choosing an API for more information.'>
+choosing an API for more information. Alternatives to this function include:'>
This function is only available when
diff --git a/reference/mysql/functions/mysql-client-encoding.xml b/reference/mysql/functions/mysql-client-encoding.xml
index 7eff603bce..765936e9f5 100644
--- a/reference/mysql/functions/mysql-client-encoding.xml
+++ b/reference/mysql/functions/mysql-client-encoding.xml
@@ -6,6 +6,15 @@
Returns the name of the character set
+
+
+ &mysql.alternative.note;
+
+ mysqli_character_set_name
+
+
+
+
&reftitle.description;
@@ -58,20 +67,6 @@ The current character set is: latin1
-
- &reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_character_set_name
- PDO::setAttribute (e.g., $db->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");)
-
-
-
-
-
&reftitle.seealso;
diff --git a/reference/mysql/functions/mysql-close.xml b/reference/mysql/functions/mysql-close.xml
index d7d4da8f62..924b315321 100644
--- a/reference/mysql/functions/mysql-close.xml
+++ b/reference/mysql/functions/mysql-close.xml
@@ -6,6 +6,16 @@
Close MySQL connection
+
+
+ &mysql.alternative.note;
+
+ mysqli_close
+ PDO: Assign the value of &null; to the PDO object
+
+
+
+
&reftitle.description;
@@ -72,16 +82,6 @@ Connected successfully
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_close
- PDO: Assign the value of &null; to the PDO object
-
-
-
mysql_close will not close persistent links
diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
index bf56f71629..02f3296a96 100644
--- a/reference/mysql/functions/mysql-connect.xml
+++ b/reference/mysql/functions/mysql-connect.xml
@@ -6,6 +6,16 @@
Open a connection to a MySQL Server
+
+
+ &mysql.alternative.note;
+
+ mysqli_connect
+ PDO::__construct
+
+
+
+
&reftitle.description;
@@ -212,16 +222,6 @@ mysql_close($link);
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_connect
- PDO::__construct
-
-
-
Whenever you specify "localhost" or
diff --git a/reference/mysql/functions/mysql-create-db.xml b/reference/mysql/functions/mysql-create-db.xml
index 77d62a4d65..498b8d978b 100644
--- a/reference/mysql/functions/mysql-create-db.xml
+++ b/reference/mysql/functions/mysql-create-db.xml
@@ -6,6 +6,16 @@
Create a MySQL database
+
+
+ &mysql.alternative.note;
+
+ mysqli_query
+ PDO::query
+
+
+
+
&reftitle.description;
@@ -83,16 +93,6 @@ Database my_db created successfully
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_query
- PDO::query
-
-
-
&info.deprecated.alias;
diff --git a/reference/mysql/functions/mysql-data-seek.xml b/reference/mysql/functions/mysql-data-seek.xml
index 505e43fd5a..d6817a8094 100644
--- a/reference/mysql/functions/mysql-data-seek.xml
+++ b/reference/mysql/functions/mysql-data-seek.xml
@@ -6,6 +6,16 @@
Move internal result pointer
+
+
+ &mysql.alternative.note;
+
+ mysqli_data_seek
+ PDO::FETCH_ORI_ABS
+
+
+
+
&reftitle.description;
@@ -99,16 +109,6 @@ mysql_free_result($result);
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_data_seek
- PDO::FETCH_ORI_ABS
-
-
-
The function mysql_data_seek can be used in
diff --git a/reference/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml
index c4a48f0108..0221642a55 100644
--- a/reference/mysql/functions/mysql-db-name.xml
+++ b/reference/mysql/functions/mysql-db-name.xml
@@ -6,6 +6,15 @@
Retrieves database name from the call to mysql_list_dbs
+
+
+ &mysql.alternative.note;
+
+ Query: SELECT DATABASE()
+
+
+
+
&reftitle.description;
@@ -89,15 +98,6 @@ while ($i < $cnt) {
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- Query: SELECT DATABASE()
-
-
-
&info.deprecated.alias;
diff --git a/reference/mysql/functions/mysql-db-query.xml b/reference/mysql/functions/mysql-db-query.xml
index a2c130a7b8..2ce2a1c471 100644
--- a/reference/mysql/functions/mysql-db-query.xml
+++ b/reference/mysql/functions/mysql-db-query.xml
@@ -6,6 +6,16 @@
Selects a database and executes a query on it
+
+
+ &mysql.alternative.note;
+
+ mysqli_select_db then the query
+ PDO::__construct
+
+
+
+
&reftitle.description;
@@ -135,16 +145,6 @@ mysql_free_result($result);
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_select_db then the query
- PDO::__construct
-
-
-
Be aware that this function does NOT
diff --git a/reference/mysql/functions/mysql-drop-db.xml b/reference/mysql/functions/mysql-drop-db.xml
index dd570f0c14..32b3241178 100644
--- a/reference/mysql/functions/mysql-drop-db.xml
+++ b/reference/mysql/functions/mysql-drop-db.xml
@@ -6,6 +6,15 @@
Drop (delete) a MySQL database
+
+
+ &mysql.alternative.note;
+
+ Execute a DROP DATABASE query
+
+
+
+
&reftitle.description;
@@ -74,15 +83,6 @@ if (mysql_query($sql, $link)) {
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- Execute a DROP DATABASE query
-
-
-
This function will not be available if the MySQL extension was built
diff --git a/reference/mysql/functions/mysql-errno.xml b/reference/mysql/functions/mysql-errno.xml
index 5551716baf..318a4afc09 100644
--- a/reference/mysql/functions/mysql-errno.xml
+++ b/reference/mysql/functions/mysql-errno.xml
@@ -6,6 +6,16 @@
Returns the numerical value of the error message from previous MySQL operation
+
+
+ &mysql.alternative.note;
+
+ mysqli_errno
+ PDO::errorCode
+
+
+
+
&reftitle.description;
@@ -76,20 +86,6 @@ if (!mysql_query("SELECT * FROM nonexistenttable", $link)) {
-
- &reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_errno
- PDO::errorCode
-
-
-
-
-
&reftitle.seealso;
diff --git a/reference/mysql/functions/mysql-error.xml b/reference/mysql/functions/mysql-error.xml
index a111940f72..479b7d23d5 100644
--- a/reference/mysql/functions/mysql-error.xml
+++ b/reference/mysql/functions/mysql-error.xml
@@ -6,6 +6,16 @@
Returns the text of the error message from previous MySQL operation
+
+
+ &mysql.alternative.note;
+
+ mysqli_error
+ PDO::errorInfo
+
+
+
+
&reftitle.description;
@@ -71,20 +81,6 @@ echo mysql_errno($link) . ": " . mysql_error($link) . "\n";
-
- &reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_error
- PDO::errorInfo
-
-
-
-
-
&reftitle.seealso;
diff --git a/reference/mysql/functions/mysql-escape-string.xml b/reference/mysql/functions/mysql-escape-string.xml
index 791b6573dd..94eb7bbebe 100644
--- a/reference/mysql/functions/mysql-escape-string.xml
+++ b/reference/mysql/functions/mysql-escape-string.xml
@@ -6,6 +6,16 @@
Escapes a string for use in a mysql_query
+
+
+ &mysql.alternative.note;
+
+ mysqli_escape_string
+ PDO::quote
+
+
+
+
&reftitle.description;
@@ -107,16 +117,6 @@ Escaped string: Zak\'s Laptop
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_escape_string
- PDO::quote
-
-
-
mysql_escape_string does not escape
diff --git a/reference/mysql/functions/mysql-set-charset.xml b/reference/mysql/functions/mysql-set-charset.xml
index dd0dc6c9cc..c2c57fa52c 100644
--- a/reference/mysql/functions/mysql-set-charset.xml
+++ b/reference/mysql/functions/mysql-set-charset.xml
@@ -6,6 +6,16 @@
Sets the client character set
+
+
+ &mysql.alternative.note;
+
+ mysqli_character_set_name
+ PDO::setAttribute (e.g., $db->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");)
+
+
+
+
&reftitle.description;
@@ -44,16 +54,6 @@
&reftitle.notes;
-
- &mysql.alternative.note;
-
- &mysql.alternative.include;
-
- mysqli_character_set_name
- PDO::setAttribute (e.g., $db->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");)
-
-
-
This function requires MySQL 5.0.7 or later.