Merge lp:~hrvojem/percona-server/doc-98-5.6 into lp:percona-server/5.6

[Hrvoje Matijakovic]

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'doc/source/release-notes/Percona-Server-5.6.17-66.0.rst'
--- doc/source/release-notes/Percona-Server-5.6.17-66.0.rst	2014-06-09 16:19:09 +0000
+++ doc/source/release-notes/Percona-Server-5.6.17-66.0.rst	2014-06-11 07:09:58 +0000
@@ -19,7 +19,7 @@
 
  TokuDB Storage engine is now available as a separate package that can be :ref:`installed <tokudb_installation>` along with the |Percona Server| 5.6.17-66.0. This feature is currently considered Release Candidate quality.
 
- |Percona Server| version 5.6 now includes :ref:`handlersocket_page` in addition to 5.5.
+ |Percona Server| version 5.6 now includes :ref:`handlersocket_page` in addition to |Percona Server| 5.5.
 
 Bugs Fixed
 ==========
 
=== modified file 'doc/source/tokudb/tokudb_installation.rst'
--- doc/source/tokudb/tokudb_installation.rst	2014-06-09 16:19:09 +0000
+++ doc/source/tokudb/tokudb_installation.rst	2014-06-11 07:09:58 +0000
@@ -33,14 +33,21 @@
 
 TokuDB won't be able to start if the transparent huge pages are enabled. `Transparent huge pages <https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Performance_Tuning_Guide/s-memory-transhuge.html>`_ is feature available in the newer kernel versions. You can check if the Transparent huge pages are enabled with: ::
   
-   $ cat /sys/kernel/mm/transparent_hugepage/enabled
+  $ cat /sys/kernel/mm/transparent_hugepage/enabled
 
    [always] madvise never
 
- You can `disable <http://www.oracle-base.com/articles/linux/configuring-huge-pages-for-oracle-on-linux-64.php#disabling-transparent-hugepages>`_ them by passing ``transparent_hugepage=never`` to the kernel in your bootloader or by running: :: 
-
-  $ echo never > /sys/kernel/mm/transparent_hugepage/enabled
-  $ echo never > /sys/kernel/mm/transparent_hugepage/defrag
+If transparent huge pages are enabled and you try to start the TokuDB engine you'll get the following message in you :file:`error.log`: ::
+
+ Transparent huge pages are enabled, according to /sys/kernel/mm/redhat_transparent_hugepage/enabled
+ Transparent huge pages are enabled, according to /sys/kernel/mm/transparent_hugepage/enabled
+
+You can `disable <http://www.oracle-base.com/articles/linux/configuring-huge-pages-for-oracle-on-linux-64.php#disabling-transparent-hugepages>`_ them by passing ``transparent_hugepage=never`` to the kernel in your bootloader or by running the following command as root: 
+  
+.. code-block:: bash
+
+  echo never > /sys/kernel/mm/transparent_hugepage/enabled
+  echo never > /sys/kernel/mm/transparent_hugepage/defrag
 
 Installation
 ============
@@ -123,8 +130,6 @@
 Version Specific Information
 ============================
 
- * :rn:`5.6.16-64.0-tokudb`
-    TokuDB Storage engine available in special |Percona Server| release.
  * :rn:`5.6.17-66.0`
     TokuDB storage engine available as a separate |Percona Server| package.