valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7126 from terminalmage/docs

Browse Source 
Two docs commits
This commit is contained in:
Joseph Hall 2013-09-09 09:38:15 -07:00
commit 2147b5524e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contents.rst
View File

@ -26,6 +26,7 @@ Full Table of Contents
topics/event/index
topics/mine/*
topics/virt/*
topics/ssh/*
topics/tests/*
topics/reactor/*
topics/conventions/*

8
doc/faq.rst
View File

@ -35,10 +35,10 @@ More details can be found in :mod:`cmd states <salt.states.cmd>`.
How does Salt determine the Minion's id?
----------------------------------------
If the minion id is not configured explicitly, salt will determine the
id based on the hostname. Exactly how this is determined varies a
little between operating systems and is described in detail :ref:`here
<minion-id-generation>`.
If the minion id is not configured explicitly (using the :conf_minion:`id`
parameter), Salt will determine the id based on the hostname. Exactly how this
is determined varies a little between operating systems and is described in
detail :ref:`here <minion-id-generation>`.
I'm using gitfs and my customg modules/states/etc are not syncing. Why?
-----------------------------------------------------------------------