From dfd671d60e330196808d068ac682757dfecd73d9 Mon Sep 17 00:00:00 2001
From: Wes Johnson <wes@futureprefect.com>
Date: Thu, 3 May 2012 16:54:41 -0700
Subject: [PATCH 1/5] change 'name' to a better description for variable
 example.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

'make a directory' is a bad description, since the command "template …"
doesn't actually create a directory.
---
 rst/playbooks.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rst/playbooks.rst b/rst/playbooks.rst
index acc8f24c4fd..7e3abb1b80e 100644
--- a/rst/playbooks.rst
+++ b/rst/playbooks.rst
@@ -171,7 +171,7 @@ Variables can be used in action lines.   Suppose you defined
 a variable called 'vhost' in the 'vars' section, you could do this::
 
    tasks:
-     - name: make a directory
+     - name: create a virtual host file for $vhost
        action: template src=somefile.j2 dest=/etc/httpd/conf.d/$vhost
 
 Those same variables are usable in templates, which we'll get to later.

From 21550f65868bf16ed650de3247a30e4da350ccfa Mon Sep 17 00:00:00 2001
From: Wes Johnson <wes@futureprefect.com>
Date: Thu, 3 May 2012 16:55:17 -0700
Subject: [PATCH 2/5] ignore eclipse's .project file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index efa7555c55f..2b1065c32bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ ansible*.xml
 .buildinfo
 objects.inv
 .doctrees
+
+.project

From 8f165e1d3c38ba3b8a08aef84f1afb3d3dad174f Mon Sep 17 00:00:00 2001
From: Wes Johnson <wes@futureprefect.com>
Date: Thu, 3 May 2012 17:04:47 -0700
Subject: [PATCH 3/5] Revert "ignore eclipse's .project file"

This reverts commit 21550f65868bf16ed650de3247a30e4da350ccfa.
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b1065c32bf..efa7555c55f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,3 @@ ansible*.xml
 .buildinfo
 objects.inv
 .doctrees
-
-.project

From b06c4a1618a8efda82b7e63d483aa9a1e70b48e8 Mon Sep 17 00:00:00 2001
From: Wes Johnson <wes@futureprefect.com>
Date: Thu, 3 May 2012 17:47:44 -0700
Subject: [PATCH 4/5] rewrite file's 'dest' argument

Previously, there were two entries for 'dest'. I've combined them in a
way that makes sense to me.

This will be superfluous when 'path' is made. Ideally, I'd like to see
'path' have the bulk of the definition, and 'dest' to be an alias to
'path'.
---
 rst/modules.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rst/modules.rst b/rst/modules.rst
index 2c0ba42e2d2..6e7b7508d77 100644
--- a/rst/modules.rst
+++ b/rst/modules.rst
@@ -185,6 +185,7 @@ All parameters available to the file module are also available when running the
 *dest*:
 
 * absolute path to a file on the filesystem.
+* alias for 'path'. Sets an absolute path to a file on the filesystem when used with 'state=file'. When used with 'state=link', sets the destination to create a symbolic link defined by 'src' key.
 
 *state*:
 

From 77f33a70baa2ede6d7cbf6a48a750e8b7fd09ab7 Mon Sep 17 00:00:00 2001
From: Wes Johnson <wes@futureprefect.com>
Date: Thu, 3 May 2012 18:01:11 -0700
Subject: [PATCH 5/5] remove old dest entries

---
 rst/modules.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rst/modules.rst b/rst/modules.rst
index 6e7b7508d77..7856372e522 100644
--- a/rst/modules.rst
+++ b/rst/modules.rst
@@ -184,7 +184,6 @@ All parameters available to the file module are also available when running the
 
 *dest*:
 
-* absolute path to a file on the filesystem.
 * alias for 'path'. Sets an absolute path to a file on the filesystem when used with 'state=file'. When used with 'state=link', sets the destination to create a symbolic link defined by 'src' key.
 
 *state*:
@@ -207,10 +206,6 @@ All parameters available to the file module are also available when running the
 
 * path of the file to link to (applies only to 'link' state)
 
-*dest*:
-
-* location where the symlink will be created for 'link' state, also an alias for 'path'.
-
 *seuser*:
 
 * 'user' part of SELinux file context.  Will default to what is provided by system policy, if available.  Only used on systems with SELinux present.  If you specify '_default', it will use the 'user' portion of default context from the policy if available.