diff --git a/bestpractices.html b/bestpractices.html index 4806f6722c6..1ff891fec48 100644 --- a/bestpractices.html +++ b/bestpractices.html @@ -216,7 +216,7 @@ using the group variable system.

stop.yml

Any directories or files not needed can be omitted. Not all modules may require vars or files sections, though most -will require handlers, tasks, and templates. To review what each of these sections do, see ref:playbooks and ref:playbooks2.

+will require handlers, tasks, and templates. To review what each of these sections do, see Playbooks and Advanced Playbooks.

The acme/setup.yml playbook would be as simple as:

----
 
diff --git a/examples.html b/examples.html
index 5147ee4b427..9611f5fa921 100644
--- a/examples.html
+++ b/examples.html
@@ -283,13 +283,13 @@ ansible webservers -m file -a "dest=/srv/foo/b.txt mode=600 owner=mdehaan group=
 
ansible webservers -m yum -a "pkg=acme state=installed"

 

 
Ensure a package is installed to a specific version:

-
ansible-webservers -m yum -a "pkg=acme-1.5 state=installed"

+
ansible webservers -m yum -a "pkg=acme-1.5 state=installed"

 

 
Ensure a package is at the latest version:

 
ansible webservers -m yum -a "pkg=acme state=latest"

 

 
Ensure a package is not installed:

-
ansible-webservers -m yum -a "pkg=acme state=removed"

+
ansible webservers -m yum -a "pkg=acme state=removed"

 

 
Currently Ansible only has modules for managing packages with yum and apt.  You can install
 for other packages for now using the command module or (better!) contribute a module
diff --git a/faq.html b/faq.html
index b1c57591d74..2ac54d0f174 100644
--- a/faq.html
+++ b/faq.html
@@ -329,7 +329,7 @@ them probably isn’t appropriate, which is why ansible-pull exists.

 
This tool is designed for running out of git and cron, and can scale to any
 number of hosts.  Ansible-pull uses local connections versus SSH, but can be
 easily bootstrapped or reconfigured just using SSH.  There is more information
-available about this in the ref:playbooks2 section.  The self-bootstrapping
+available about this in the Advanced Playbooks section.  The self-bootstrapping
 and ease of use are ansible are still retained, even when switching to the pull
 model.

 
If you’d like to discuss scaling strategies further, please hop on the mailing list.

diff --git a/index.html b/index.html
index 0de9ab423e8..290f62fe9fa 100644
--- a/index.html
+++ b/index.html
@@ -220,7 +220,7 @@ of control.  Further, it was designed for deploying multi-node applications from
 

 

 
Simple & Secure By DefaultΒΆ

-
Compared with most configuration managememnt tools, Ansible is also much more secure.  While most configuration management tools use a daemon, running as root with full access to the system, with its own in-house developed PKI infrastructure, Ansible just uses SSH (and supports sudo as necessary).  There is no additional attack surface and OpenSSH is one of the most peer reviewed security components out there.
+
Compared with most configuration managememnt tools, Ansible is also much more secure.  While most configuration management tools use a daemon, running as root with full access to the system, with its own in-house developed PKI infrastructure, Ansible just uses SSH (and supports sudo as neccesssary).  There is no additional attack surface and OpenSSH is one of the most peer reviewed security components out there.
 If a central server containing your playbooks are comprimised, your nodes are not – which is NOT the case
 of these other tools, which can, more or less, turn into a botnet.  Our security approach is to avoid writing custom
 crypto code altogether, and rely on the most secure part of the Linux/Unix subsystem that your machines are already using.  There is no PKI subsystem to maintain, which can be a frequent source of problems, particularly when reinstalling or migrating
@@ -452,4 +452,4 @@ Puppet Labs, and is now with