From 54bdcd734eabf97b124af9f4d252501a171a4c13 Mon Sep 17 00:00:00 2001 From: scottb Date: Sun, 28 May 2017 01:42:50 -0700 Subject: [PATCH] Some cleanup of the intro and getting started sections. (#25083) --- docs/docsite/rst/intro.rst | 2 +- docs/docsite/rst/intro_getting_started.rst | 7 +++---- docs/docsite/rst/intro_installation.rst | 22 +++++++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docs/docsite/rst/intro.rst b/docs/docsite/rst/intro.rst index 5270500bee0..f58ea6c67bb 100644 --- a/docs/docsite/rst/intro.rst +++ b/docs/docsite/rst/intro.rst @@ -1,7 +1,7 @@ Introduction ============ -Before we dive into the really fun parts -- playbooks, configuration management, deployment, and orchestration -- we'll learn how to get Ansible installed and cover some basic concepts. We'll also go over how to execute ad-hoc commands in parallel across your nodes using /usr/bin/ansible, and see what sort of modules are available in Ansible's core (you can also write your own, which is covered later). +Before we start exploring the main components of Ansible -- playbooks, configuration management, deployment, and orchestration -- we'll learn how to get Ansible installed and cover some basic concepts. We'll also go over how to execute ad-hoc commands in parallel across your nodes using /usr/bin/ansible, and see what modules are available in Ansible's core (you can also write your own, which is covered later). .. toctree:: :maxdepth: 1 diff --git a/docs/docsite/rst/intro_getting_started.rst b/docs/docsite/rst/intro_getting_started.rst index 1cb6af2e28d..606bdc1fb16 100644 --- a/docs/docsite/rst/intro_getting_started.rst +++ b/docs/docsite/rst/intro_getting_started.rst @@ -8,14 +8,13 @@ Getting Started Foreword ```````` -Now that you've read :doc:`intro_installation` and installed Ansible, it's time to dig in and get -started with some commands. +Now that you've read :doc:`intro_installation` and installed Ansible, it's time to get +started with some ad-hoc commands. What we are showing first are not the powerful configuration/deployment/orchestration features of Ansible. These features are handled by playbooks which are covered in a separate section. -This section is about how to initially get going. Once you have these concepts down, read :doc:`intro_adhoc` for some more -detail, and then you'll be ready to dive into playbooks and explore the most interesting parts! +This section is about how to initially get Ansible running. Once you understand these concepts, read :doc:`intro_adhoc` for some more detail, and then you'll be ready to begin learning about playbooks and explore the most interesting parts! .. _remote_connection_information: diff --git a/docs/docsite/rst/intro_installation.rst b/docs/docsite/rst/intro_installation.rst index e91772432c4..f1907e9652b 100644 --- a/docs/docsite/rst/intro_installation.rst +++ b/docs/docsite/rst/intro_installation.rst @@ -3,14 +3,6 @@ Installation .. contents:: Topics -.. _getting_ansible: - -Getting Ansible -``````````````` - -You may also wish to follow the `GitHub project `_ if -you have a GitHub account. This is also where we keep the issue tracker for sharing -bugs and feature ideas. .. _what_will_be_installed: @@ -304,13 +296,15 @@ open source projects. If you are intending to use Tower as the Control Machine, do not use a source install. Please use OS package manager (like ``apt/yum``) or ``pip`` to install a stable version. -To install from source. +To install from source, clone the Ansible git repository: .. code-block:: bash $ git clone git://github.com/ansible/ansible.git --recursive $ cd ./ansible +Once git has cloned the Ansible repository, setup the Ansible environment: + Using Bash: .. code-block:: bash @@ -373,6 +367,16 @@ Now let's test things with a ping command: You can also use "sudo make install". +.. _getting_ansible: + +Ansible on GitHub +````````````````` + +You may also wish to follow the `GitHub project `_ if +you have a GitHub account. This is also where we keep the issue tracker for sharing +bugs and feature ideas. + + .. seealso:: :doc:`intro_adhoc`