Merge "Fixed alignment issues in the text, corrected length."

This commit is contained in:
Jenkins 2016-02-24 17:48:57 +00:00 committed by Gerrit Code Review
commit fc7e233b69

View File

@ -8,14 +8,14 @@ FAQ
.. _faq_hardcoded_params: .. _faq_hardcoded_params:
Why nodes/transports have hardcoded keys, ips and other inputs ? Why nodes/transports have hardcoded keys, ips and other inputs ?
-------------------------------------------------------------- ----------------------------------------------------------------
This is temporary situation, we will improve it in near future. This is temporary situation, we will improve it in near future.
.. _faq_different_ssh_keys: .. _faq_different_ssh_keys:
I want to use different SSH keys I want to use different SSH keys
---------------------------- --------------------------------
Just update resource for example:: Just update resource for example::
@ -45,8 +45,8 @@ How can I configure solar ?
There are several places where we search for config values: There are several places where we search for config values:
1. `.config` file in CWD or in path from `SOLAR_CONFIG` env variable 1. `.config` file in CWD or in path from `SOLAR_CONFIG` env variable
2. if env `SOLAR_CONFIG_OVERRIDE` contains valid path then it override previous 2. if env `SOLAR_CONFIG_OVERRIDE` contains valid path then it override
values previous values
3. `.config.override` in CWD 3. `.config.override` in CWD
4. You can also set upper-cased env variable which matches one of those in 4. You can also set upper-cased env variable which matches one of those in
config config