Merge branch 'master' of https://github.com/ThemeFuse/Unyson-Document…

…ation
ThemeFuse · Feb 5, 2015 · 2659300 · 2659300
2 parents 476219a + 38e18a8
commit 2659300
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 40 deletions.
diff --git a/extension/backup/index.rst b/extension/backup/index.rst
@@ -8,13 +8,7 @@ The Backup extension was designed to achieve the following tasks:
 
 2. **Restore**: Do a restore from a previously made backup.
 
-3. **Demo Install**: Make an archive of the currently selected theme with
-   all of its settings (database plus uploads directory).
-
-   Auto Install: Gives the ability to use these settings at the
-   time the theme was activated.
-
-4. **Migration**: Move a WordPress site from one place to another.
+3. **Migration**: Move a WordPress site from one place to another.
 
 .. contents::
     :local:
@@ -64,38 +58,6 @@ To create one, create a sub-extension that implements ``FW_Backup_Storage_Interf
 
 For an example of implementation take a look at the **backup-storage-local** extension.
 
-Demo Install
-------------
-
-.. raw:: html
-
-	<iframe src="https://player.vimeo.com/video/110769350?title=0&amp;byline=0&amp;portrait=0" width="100%" height="384" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
-
-	<br><br>
-
-**Demo Install** is the process of making an archive of the currently active theme, 
-packed with all of its settings (database plus uploads directory). 
-These settings are stored in the ``auto-install`` directory under the theme parent directory.
-
-.. warning::
-
-    This feature by default is turned off and is enabled only when the ``WP_DEBUG`` constant is defined and its value is true.
-
-If it’s enabled, a **Create Demo Install** button should appear on Backup page.
-
-Auto Install
-------------
-
-**Auto Install** is the reverse process of **Demo Install**.
-
-This feature is enabled only when current theme contains the ``auto-install`` directory in it.
-
-If it’s enabled, an **Auto Install** page will appear under the **Tools** menu. 
-That page displays a button **Import Demo Content** and
-by clicking on it, all tables from the database will be dropped and replaced by
-the ``auto-install/database.sql`` file. Also the ``uploads`` directory
-will be replaced with the ``auto-install/uploads`` directory.
-
 Migration
 ---------
 

diff --git a/extension/contentdemoinstall/index.rst b/extension/contentdemoinstall/index.rst
@@ -0,0 +1,46 @@
+Content Demo Install
+======
+
+The Content Demo Install is included in Backup extension:
+
+1. **Content Demo Install**: Make an archive of the currently selected theme with
+   all of its settings (database plus uploads directory).
+
+2. **Auto Install**: Gives the ability to use these settings at the
+   time the theme was activated.
+
+.. contents::
+    :local:
+    :backlinks: top
+
+Content Demo Install
+------------	
+
+.. raw:: html
+
+	<iframe src="https://player.vimeo.com/video/110769350?title=0&amp;byline=0&amp;portrait=0" width="100%" height="384" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+
+	<br><br>
+
+**Content Demo Install** is the process of making an archive of the currently active theme, 
+packed with all of its settings (database plus uploads directory). 
+These settings are stored in the ``auto-install`` directory under the theme parent directory.
+
+.. warning::
+
+    This feature by default is turned off and is enabled only when the ``WP_DEBUG`` constant is defined and its value is true.
+
+If it’s enabled, a **Create Demo Install** button should appear on Backup page.
+
+Auto Install
+------------
+
+**Auto Install** is the reverse process of **Content Demo Install**.
+
+This feature is enabled only when current theme contains the ``auto-install`` directory in it.
+
+If it’s enabled, an **Auto Install** page will appear under the **Tools** menu. 
+That page displays a button **Import Demo Content** and
+by clicking on it, all tables from the database will be dropped and replaced by
+the ``auto-install/database.sql`` file. Also the ``uploads`` directory
+will be replaced with the ``auto-install/uploads`` directory.
diff --git a/extension/index.rst b/extension/index.rst
@@ -15,6 +15,7 @@ Built-in Extensions
     seo/index
     blog/index
     backup/index
+    contentdemoinstall/index
     portfolio/index
     feedback/index
     events/index

diff --git a/helpers/php.rst b/helpers/php.rst
@@ -36,7 +36,7 @@ General PHP helpers:
 
             // <div id="foo" class="bar" ></div>
 
-.. _genera-fw-akg:
+.. _fw-akg:
 
 * ``fw_akg($keys, &$array_or_object, $default_value = null, $keys_delimiter = '/')`` - get array multikey value.
 

diff --git a/options/built-in-option-types.rst b/options/built-in-option-types.rst
@@ -157,6 +157,8 @@ A list of checkboxes.
             'choice-2' => __('Choice 2', 'fw'),
             'choice-3' => __('Choice 3', 'fw'),
         ),
+        // Display choices inline instead of list
+        'inline' => false,
     )
 
 
@@ -180,6 +182,8 @@ A list of radio buttons.
             'choice-2' => __('Choice 2', 'fw'),
             'choice-3' => __('Choice 3', 'fw'),
         ),
+        // Display choices inline instead of list
+        'inline' => false,
     )
 
 

diff --git a/options/containers.rst b/options/containers.rst
@@ -53,6 +53,8 @@ A better customized container option will look like this:
 
 This will generate a box with a title and one option in it.
 
+.. _box-parameters-in-post-options:
+
 .. important::
 
      Used in **Post Options** on the first array level, the ``box`` container accepts additional parameters: