Merge doc changes; small related updates.
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 44dca0d..822f2f9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -603,8 +603,8 @@
- Fixed a bug (#1936) - :doc:`Migration Library <libraries/migration>` method ``latest()`` had a typo when retrieving language values.
- Fixed a bug (#2021) - :doc:`Migration Library <libraries/migration>` configuration file was mistakenly using Windows style line feeds.
-- Fixed a bug (#1969) - :doc:`Query Builder (Active Record) <database/query_builder>` method ``set_update_batch()`` was using the incorrect variables and would cause an error.
-- Fixed a bug (#2337) - :doc:`Email Library <libraries/email>` method ``print_debugger()`` was not using ``htmlspecialchars()`` when being shown in the browser.
+- Fixed a bug (#1273) - ``E_NOTICE`` being generated by :doc:`Query Builder <database/query_builder>`'s ``set_update_batch()`` method.
+- Fixed a bug (#2337) - :doc:`Email Library <libraries/email>` method ``print_debugger()`` didn't apply ``htmlspecialchars()`` to headers.
Version 2.1.3
=============
@@ -636,6 +636,7 @@
Release Date: June 29, 2012
- General Changes
+
- Improved security in ``xss_clean()``.
Version 2.1.1
@@ -644,14 +645,17 @@
Release Date: June 12, 2012
- General Changes
+
- Fixed support for docx, xlsx files in mimes.php.
- Libraries
+
- Further improved MIME type detection in the :doc:`File Uploading Library <libraries/file_uploading>`.
- Added support for IPv6 to the :doc:`Input Library <libraries/input>`.
- Added support for the IP format parameter to the :doc:`Form Validation Library <libraries/form_validation>`.
- Helpers
+
- ``url_title()`` performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
Bug fixes for 2.1.1
@@ -707,7 +711,7 @@
- Libraries
- - Changed $this->cart->insert() in the :doc:`Cart
+ - Changed ``$this->cart->insert()`` in the :doc:`Cart
Library <libraries/cart>` to return the Row ID if a single
item was inserted successfully.
- Added support to set an optional parameter in your callback rules
@@ -717,8 +721,7 @@
incremental updates to your database schema.
- Driver children can be located in any package path.
- Added max_filename_increment config setting for Upload library.
- - Added is_unique to the :doc:`Form Validation
- library <libraries/form_validation>`.
+ - Added ``is_unique`` to the :doc:`Form Validation library <libraries/form_validation>`.
- Added $config['use_page_numbers'] to the :doc:`Pagination library <libraries/pagination>`, which enables real page numbers in the URI.
- Added TLS and SSL Encryption for SMTP.