Merge branch 'master' into dev

hashbangcode · Jul 27, 2015 · 25843a8 · 25843a8
2 parents eeae283 + d7e7bac
commit 25843a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,6 +13,7 @@ pages:
 - ['usage/getting_started.md', 'Usage', 'Getting started']
 - ['usage/settings_file.md', 'Usage', 'Settings file']
 - ['usage/ansible.md', 'Usage', 'Ansible']
+- ['usage/custom_box.md', 'Usage', 'Custom base box']
 - ['usage/custom_playbook.md', 'Usage', 'Custom playbook']
 - ['usage/example_vlad_output.md', 'Usage', 'Example Vlad output']
 - ['usage/project_structure.md', 'Usage', 'Project structure']

diff --git a/usage/variables.md b/usage/variables.md
@@ -87,7 +87,7 @@ default value: false
 
 __vlad_custom_base_box_name__
 
-This sets the custom base box for Vlad to use when utilizing the custom base box functionality. This requires a custom base box to be setup or provided. [Please read the documentation on setting up the custom base box if you want to use this feature](usage/custom_box.md).
+This sets the custom base box for Vlad to use when utilizing the custom base box functionality. This requires a custom base box to be setup or provided. [Please read the documentation on setting up the custom base box if you want to use this feature](custom_box.md).
 
 default value: ""