Drop some previously deprecated functionality

6 files changed, 10 insertions, 11 deletions

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2a729264e..80a5ca0e9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -39,6 +39,7 @@ Release Date: Not Released
 
    -  Removed previously deprecated *Cart Library*.
    -  Removed previously deprecated *Javascript Library* (it was always experimental in the first place).
+   -  Removed previously deprecated ``anchor_class`` option from :doc:`Pagination Library <libraries/pagination>`.
    -  Added TLS and UNIX socket connection support to :doc:`Session Library <libraries/sessions>` 'redis' driver.
    -  Updated :doc:`ZIP Library <libraries/zip>` method ``read_dir()`` to include hidden (dot-prefixed) files.
 
@@ -88,6 +89,7 @@ Release Date: Not Released
    -  :doc:`Database Forge <database/forge>`:
 
       - Added support for declaring date/time type fields default values as ``CURRENT_TIMESTAMP`` and similar.
+      - Removed previously deprecated ``$_after`` parameter for ``add_column()``.
 
    -  :doc:`Query Builder <database/query_builder>`:
 
@@ -103,6 +105,7 @@ Release Date: Not Released
    -  Removed previously deprecated :doc:`Date Helper <helpers/date_helper>` function ``standard_date()`` (use PHP's native ``date()`` instead).
    -  Removed previously deprecated :doc:`Security Helper <helpers/security_helper>` function ``do_hash()`` (use PHP's native ``hash()`` instead).
    -  Removed previously deprecated :doc:`File Helper <helpers/file_helper>` function ``read_file()`` (use PHP's native ``file_get_contents()`` instead).
+   -  Removed previously deprecated options ``'dash'`` and ``'underscore'`` from :doc:`URL Helper <helpers/url_helper>` function :php:func:`url_title()`.
    -  Added new function :php:func:`ordinal_format()` to :doc:`Inflector Helper <helpers/inflector_helper>`.
 
    -  :doc:`Download Helper <helpers/download_helper>` changes include:
@@ -115,6 +118,7 @@ Release Date: Not Released
 
       - Removed previously deprecated function ``trim_slashes()`` (use PHP's native ``trim()`` with ``'/'`` instead).
       - Removed previously deprecated function ``repeater()`` (use PHP's native ``str_repeat()`` instead).
+      - Removed previously deprecated ``'unique'`` and ``'encrypt'`` options from ``random_string()``.
 
    -  :doc:`HTML Helper <helpers/html_helper>` changes include:
 
diff --git a/user_guide_src/source/database/forge.rst b/user_guide_src/source/database/forge.rst
index c6cacb1b0..1562a1a2d 100644
--- a/user_guide_src/source/database/forge.rst
+++ b/user_guide_src/source/database/forge.rst
@@ -322,11 +322,10 @@ Class Reference
 
 .. php:class:: CI_DB_forge
 
-	.. php:method:: add_column($table[, $field = array()[, $_after = NULL]])
+	.. php:method:: add_column($table[, $field = array()])
 
 		:param	string	$table: Table name to add the column to
 		:param	array	$field: Column definition(s)
-		:param	string	$_after: Column for AFTER clause (deprecated)
 		:returns:	TRUE on success, FALSE on failure
 		:rtype:	bool
 
diff --git a/user_guide_src/source/helpers/string_helper.rst b/user_guide_src/source/helpers/string_helper.rst
index 4663bb08b..c9b5e278c 100644
--- a/user_guide_src/source/helpers/string_helper.rst
+++ b/user_guide_src/source/helpers/string_helper.rst
@@ -52,9 +52,6 @@ The following functions are available:
 
 		echo random_string('alnum', 16);
 
-	.. note:: Usage of the *unique* and *encrypt* types is DEPRECATED. They
-		are just aliases for *md5* and *sha1* respectively.
-
 .. php:function:: increment_string($str[, $separator = '_'[, $first = 1]])
 
 	:param	string	$str: Input string
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index adeab8c58..037e613ea 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -298,9 +298,6 @@ The following functions are available:
 		$url_title = url_title($title, 'underscore');
 		// Produces: Whats_wrong_with_CSS
 
-	.. note:: Old usage of 'dash' and 'underscore' as the second parameter
-		is DEPRECATED.
-
 	The third parameter determines whether or not lowercase characters are
 	forced. By default they are not. Options are boolean TRUE/FALSE.
 
diff --git a/user_guide_src/source/installation/upgrade_320.rst b/user_guide_src/source/installation/upgrade_320.rst
index 48914c414..715e8858d 100644
--- a/user_guide_src/source/installation/upgrade_320.rst
+++ b/user_guide_src/source/installation/upgrade_320.rst
@@ -231,6 +231,11 @@ CodeIgniter versions that have been removed in 3.2.0:
 
 - The entire *Smiley Helper* (an archived version is available on GitHub: `bcit-ci/ci3-smiley-helper <https://github.com/bcit-ci/ci3-smiley-helper>`_)
 
+- The ``$_after`` parameter from :doc:`Database Forge <../database/forge>` method ``add_column()``.
+- The ``anchor_class`` option from :doc:`Pagination Library <../libraries/pagination>` (use ``class`` instead).
+- The ``unique`` and ``encrypt`` options from :doc:`String Helper <../helpers/string_helper>` function ``random_string()``.
+- The ``underscore`` and ``dash`` options from :doc:`URL Helper <../helpers/url_helper>`` function :php:func:`url_title()`.
+
 Step 11: Make sure you're validating all user inputs
 ====================================================
 
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index fbc75ea56..760f50c94 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -277,9 +277,6 @@ by the pagination class, you can set them as key/value pairs in the
 	// Produces: class="myclass"
 	$config['attributes'] = array('class' => 'myclass');
 
-.. note:: Usage of the old method of setting classes via "anchor_class"
-	is deprecated.
-
 *****************************
 Disabling the "rel" attribute
 *****************************