diff --git a/api-conventions.md b/api-conventions.md index 7fc2bdfc1..2742a9f05 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 fe5bc6ead..53dd06816 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!