From 23ff2f2992fc96f00fa5d6dc3aa369f8f9b7589b Mon Sep 17 00:00:00 2001 From: Xiao Hanyu Date: Sat, 20 Jul 2013 12:44:15 -0400 Subject: [PATCH] Merging docs --- docsite/latest/rst/amazon_web_services.rst | 2 +- docsite/latest/rst/faq.rst | 4 ++-- docsite/latest/rst/gettingstarted.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docsite/latest/rst/amazon_web_services.rst b/docsite/latest/rst/amazon_web_services.rst index e7b51c89dea..a7f5cac5842 100644 --- a/docsite/latest/rst/amazon_web_services.rst +++ b/docsite/latest/rst/amazon_web_services.rst @@ -76,7 +76,7 @@ Once your nodes are spun up, you'll probably want to talk to them again. The be Even for larger environments, you might have nodes spun up from Cloud Formations or other tooling. You don't have to use Ansible to spin up guests. Once these are created and you wish to configure them, the EC2 API can be used to return system grouping with the help of the EC2 inventory script. This script can be used to group resources by their security group or tags. Tagging is highly recommended in EC2 and can provide an easy way to sort between host groups and roles. The inventory script is documented `in the API chapter `_. -You may wish to schedule a regular refresh of the inventory cache to accomodate for frequent changes in resources: +You may wish to schedule a regular refresh of the inventory cache to accommodate for frequent changes in resources: .. code-block:: bash diff --git a/docsite/latest/rst/faq.rst b/docsite/latest/rst/faq.rst index 4efb9b9fc19..52c8e4d5bcb 100644 --- a/docsite/latest/rst/faq.rst +++ b/docsite/latest/rst/faq.rst @@ -32,7 +32,7 @@ See the rest of the documentation for more information about how to organize var How do I get ansible to reuse connections, enable Kerberized SSH, or have Ansible pay attention to my local SSH config file? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Switch your default connectiont type in the configuration file to 'ssh', or use '-c ssh' to use +Switch your default connection type in the configuration file to 'ssh', or use '-c ssh' to use Native OpenSSH for connections instead of the python paramiko library. In Ansible 1.2.1 and later, 'ssh' will be used by default if OpenSSH is new enough to support ControlPersist as an option. @@ -157,7 +157,7 @@ environment variable on management machine:: If you need to set environment variables, see the Advanced Playbooks section about environments. -Can I get training on Ansible or find commerical support? +Can I get training on Ansible or find commercial support? +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Yes! See `AnsibleWorks.com `_ or email `info@ansibleworks.com `_. diff --git a/docsite/latest/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst index e367b982ab2..a76f6ea687b 100644 --- a/docsite/latest/rst/gettingstarted.rst +++ b/docsite/latest/rst/gettingstarted.rst @@ -193,7 +193,7 @@ In Ubuntu 13.04 (raring) its part of the backports repository: $ sudo apt-get install ansible/raring-backports -In Debian testing/unstable and Ubntu 13.10+ it is available via +In Debian testing/unstable and Ubuntu 13.10+ it is available via .. code-block:: bash