Bootstrap 3 documentation tweaks

doc/maintaining/configuration.rst

@@ -1329,8 +1329,8 @@ Default value:  ``public``
 
 This config option is used to configure the base folder for static files used
 by CKAN core. It's used to determine which version of Bootstrap to be used.
-It accepts two values: ``public`` and ``public-bs2``. By default it's used
-Bootstrap 3. For Bootstrap 2 set it to ``public-bs2``.
+It accepts two values: ``public`` (Bootstrap 3, the default value from CKAN
+2.8 onwards) and ``public-bs2`` (Bootstrap 2, used until CKAN 2.7).
 
 It must be used in conjunction with :ref:`ckan.base_templates_folder` in order
 for it to properly function. Also, you can't use for example Bootstrap 3 for
@@ -1351,8 +1351,8 @@ Default value:  ``templates``
 
 This config option is used to configure the base folder for templates used
 by CKAN core. It's used to determine which version of Bootstrap to be used.
-It accepts two values: ``templates`` and ``templates-bs2``. By default it's
-used Bootstrap 3. For Bootstrap 2 set it to ``templates-bs2``.
+It accepts two values: ``templates`` (Bootstrap 3, the default value from CKAN
+2.8 onwards) and ``templates-bs2`` (Bootstrap 2, used until CKAN 2.7).
 
 It must be used in conjunction with :ref:`ckan.base_public_folder` in order
 for it to properly function. Also, you can't use for example Bootstrap 3 for

doc/theming/index.rst

@@ -43,14 +43,14 @@ appearance of CKAN pages by developing your own CKAN themes.
 
 .. note::
 
-   Following version 2.8 migration to Bootstrap 3 is introduced. For backward
-   compatibility, Bootstrap 2 will be preserved and templates and static
-   files will be in separate folders. Selection for which Bootstrap version
-   will be used will be set using configuration options within the production.ini
-   file
-
-   * ckan.base_templates_folder = templates
-   * ckan.base_public)folder = folder
+    Starting from CKAN version 2.8 the Bootstrap version used in the default
+    CKAN theme is Bootstrap 3. For backwards compatibility, Bootstrap 2 templates
+    will be included in CKAN core for a few versions, but they will be eventually
+    removed so you are encouraged to update your custom theme to use Bootstrap 3.
+    You can select wich set of templates to use (Bootstrap 3 or 2) by using the 
+    :ref:`ckan.base_public_folder` and :ref:`ckan.base_templates_folder`
+    configuration options.
+
 
 .. toctree::
    :maxdepth: 2