Change minion to node

Contination of #1111

I tried to keep this PR down to just a simple search-n-replace to keep
things simple.  I may have gone too far in some spots but its easy to
roll those back if needed.

I avoided renaming `contrib/mesos/pkg/minion` because there's already
a `contrib/mesos/pkg/node` dir and fixing that will require a bit of work
due to a circular import chain that pops up. So I'm saving that for a
follow-on PR.

I rolled back some of this from a previous commit because it just got
to big/messy. Will follow up with additional PRs

Signed-off-by: Doug Davis <dug@us.ibm.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/api-conventions.md b/api-conventions.md
index 7fc2bdfc..2742a9f0 100644
--- a/api-conventions.md
+++ b/api-conventions.md
@@ -1182,7 +1182,7 @@ than capitalization of the initial letter, the two should almost always match.
 No underscores nor dashes in either.
 * Field and resource names should be declarative, not imperative (DoSomething,
 SomethingDoer, DoneBy, DoneAt).
-* `Minion` has been deprecated in favor of `Node`. Use `Node` where referring to
+* Use `Node` where referring to
 the node resource in the context of the cluster. Use `Host` where referring to
 properties of the individual physical/virtual system, such as `hostname`,
 `hostPath`, `hostNetwork`, etc.
diff --git a/developer-guides/vagrant.md b/developer-guides/vagrant.md
index fe5bc6ea..53dd0681 100755
--- a/developer-guides/vagrant.md
+++ b/developer-guides/vagrant.md
@@ -371,8 +371,8 @@ provisioned.
 
 #### I have Vagrant up but the nodes won't validate!
 
-Log on to one of the nodes (`vagrant ssh node-1`) and inspect the salt minion
-log (`sudo cat /var/log/salt/minion`).
+Log on to one of the nodes (`vagrant ssh node-1`) and inspect the salt node
+log (`sudo cat /var/log/salt/node`).
 
 #### I want to change the number of nodes!