saltstack/salt — pull request #16542 by rallytime (2014-10-10 15:20:50+00:00)
Title: Fix conf_minion references

When I edited this doc the other day, I accidentally switched some of the references around. This fixes them.