diff --git a/docsite/latest/rst/guide_aws.rst b/docsite/latest/rst/guide_aws.rst index 28653ab332..a6a6ff2ebe 100644 --- a/docsite/latest/rst/guide_aws.rst +++ b/docsite/latest/rst/guide_aws.rst @@ -145,14 +145,3 @@ Using Ansible's Cloud Formation Module these modules are documented on the module page, more walk throughs coming soon -.. seealso:: - - :doc:`examples` - Examples of basic commands - :doc:`playbooks` - Learning ansible's configuration management language - `Mailing List `_ - Questions? Help? Ideas? Stop by the list on Google Groups - `irc.freenode.net `_ - #ansible IRC chat channel - diff --git a/docsite/latest/rst/index.rst b/docsite/latest/rst/index.rst index 2dc56ee080..37e9076d05 100644 --- a/docsite/latest/rst/index.rst +++ b/docsite/latest/rst/index.rst @@ -61,6 +61,7 @@ ways to organize playbooks and the files they include, and we'll offer up some s playbooks playbooks_roles playbooks_variables + playbooks_conditionals playbooks_loops playbooks_best_practices Example Playbooks diff --git a/docsite/latest/rst/intro_configuration.rst b/docsite/latest/rst/intro_configuration.rst index 0d90127e61..f6e34c1b9d 100644 --- a/docsite/latest/rst/intro_configuration.rst +++ b/docsite/latest/rst/intro_configuration.rst @@ -1,6 +1,6 @@ The Ansible Configuration File -============================== +++++++++++++++++++++++++++++++ .. highlight:: bash diff --git a/docsite/latest/rst/intro_getting_started.rst b/docsite/latest/rst/intro_getting_started.rst index a78c16536f..ba45993c6c 100644 --- a/docsite/latest/rst/intro_getting_started.rst +++ b/docsite/latest/rst/intro_getting_started.rst @@ -85,7 +85,7 @@ Now run a live command on all of your nodes: $ ansible all -a "/bin/echo hello" Congratulations. You've just contacted your nodes with Ansible. It's -soon going to be time to read some of the more real-world :doc:`examples`, and explore +soon going to be time to read some of the more real-world :doc:`intro_adhoc`, and explore what you can do with different modules, as well as the Ansible :doc:`playbooks` language. Ansible is not just about running commands, it also has powerful configuration management and deployment features. There's more to diff --git a/docsite/latest/rst/intro_installation.rst b/docsite/latest/rst/intro_installation.rst index 45cb6cf134..51bd59cee2 100644 --- a/docsite/latest/rst/intro_installation.rst +++ b/docsite/latest/rst/intro_installation.rst @@ -59,7 +59,7 @@ On the managed nodes, you only need Python 2.4 or later, but if you are are runn Python 3 is a slightly different language than Python 2 and most python programs (including Ansible) are not switching over yet. However, some Linux distributions (Gentoo, Arch) may not have a Python 2.X interpreter installed by default. On those systems, you should install one, and set - the 'ansible_python_interpreter' variable in inventory (see :doc:`patterns`) to point at your 2.X python. Distributions + the 'ansible_python_interpreter' variable in inventory (see :doc:`intro_inventory`) to point at your 2.X python. Distributions like Red Hat Enterprise Linux, CentOS, Fedora, and Ubuntu all have a 2.X interpreter installed by default and this does not apply to those distributions. This is also true of nearly all Unix systems. If you need to bootstrap these remote systems by installing Python 2.X, @@ -110,7 +110,7 @@ Ansible also uses the the following Python modules that need to be installed:: $ sudo pip install paramiko PyYAML jinja2 Once running the env-setup script you'll be running from checkout and the default inventory file -will be /etc/ansible/hosts. You can optionally specify an inventory file (see :doc:`patterns`) +will be /etc/ansible/hosts. You can optionally specify an inventory file (see :doc:`intro_inventroy`) other than /etc/ansible/hosts: .. code-block:: bash diff --git a/docsite/latest/rst/intro_inventory.rst b/docsite/latest/rst/intro_inventory.rst index 7876f4bb90..b75ee384f2 100644 --- a/docsite/latest/rst/intro_inventory.rst +++ b/docsite/latest/rst/intro_inventory.rst @@ -10,7 +10,7 @@ the location /etc/ansible/hosts. Not only is this inventory configurable, but you can also use multiple inventory files at the same time (explained below) and also -pull inventory from dynamic or cloud sources, as described in `intro_inventory_dynamic`. +pull inventory from dynamic or cloud sources, as described in :doc:`intro_dynamic_inventory`. .. contents:: :depth: 2 @@ -204,7 +204,7 @@ Examples from a host file:: .. seealso:: - :doc:`intro_inventory_dynamic` + :doc:`intro_dynamic_inventory` Pulling inventory from dynamic sources, such as cloud providers :doc:`intro_examples` Examples of basic commands diff --git a/docsite/latest/rst/intro_patterns.rst b/docsite/latest/rst/intro_patterns.rst index 75f2191c4d..3a48f0bd79 100644 --- a/docsite/latest/rst/intro_patterns.rst +++ b/docsite/latest/rst/intro_patterns.rst @@ -6,7 +6,7 @@ Patterns Patterns in Ansible are how we decide which hosts to manage. This can mean what hosts to communicate with, but in terms of :doc:`playbooks` it actually means what hosts to apply a particular configuration or IT process to. -We'll go over how to use the command line in :doc:`intro_examples` section, however, basically it looks like this:: +We'll go over how to use the command line in :doc:`intro_adhoc` section, however, basically it looks like this:: ansible -m -a diff --git a/docsite/latest/rst/modules.rst b/docsite/latest/rst/modules.rst index 5a8cd388ca..8b90956197 100644 --- a/docsite/latest/rst/modules.rst +++ b/docsite/latest/rst/modules.rst @@ -59,7 +59,7 @@ Let's see what's available in the Ansible module library, out of the box: Writing your own modules ```````````````````````` -See :doc:`moduledev`. +See :doc:`developing_modules`. .. seealso:: @@ -69,7 +69,7 @@ See :doc:`moduledev`. Examples of using modules with /usr/bin/ansible-playbook :doc:`developing_modules` How to write your own modules - :doc:`api` + :doc:`developing_api` Examples of using modules with the Python API `Mailing List `_ Questions? Help? Ideas? Stop by the list on Google Groups diff --git a/docsite/latest/rst/playbooks.rst b/docsite/latest/rst/playbooks.rst index eca407c1fa..52a4c6a30e 100644 --- a/docsite/latest/rst/playbooks.rst +++ b/docsite/latest/rst/playbooks.rst @@ -325,7 +325,7 @@ can do this:: :doc:`YAMLSyntax` Learn about YAML syntax - :doc:`playbooks_bestpractices` + :doc:`playbooks_best_practices` Various tips about managing playbooks in the real world :doc:`modules` Learn about available modules diff --git a/docsite/latest/rst/playbooks_best_practices b/docsite/latest/rst/playbooks_best_practices.rst similarity index 100% rename from docsite/latest/rst/playbooks_best_practices rename to docsite/latest/rst/playbooks_best_practices.rst diff --git a/docsite/latest/rst/intro_variables.rst b/docsite/latest/rst/playbooks_variables.rst similarity index 100% rename from docsite/latest/rst/intro_variables.rst rename to docsite/latest/rst/playbooks_variables.rst