summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
authorKyle Knapp <kyleknap@amazon.com>2015-06-29 16:20:24 -0700
committerKyle Knapp <kyleknap@amazon.com>2015-06-29 16:20:24 -0700
commit286397ae3e0b3d1df0cdba67e410af0e76519e8e (patch)
treefd4f7be46ca8d123b6e7dd5972c66e8d84b3d777 /docs/source
parentf531fe5344c5e70bf296355622e91fc930d1a473 (diff)
parent96ac60ed8de0f29431ee7e500dd2ca66e598b319 (diff)
downloadboto-286397ae3e0b3d1df0cdba67e410af0e76519e8e.tar.gz
Merge pull request #3101 from dhoeric/patch-1
[Doc] Wrong order of loading config file
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/boto_config_tut.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/source/boto_config_tut.rst b/docs/source/boto_config_tut.rst
index 37c22f04..35944935 100644
--- a/docs/source/boto_config_tut.rst
+++ b/docs/source/boto_config_tut.rst
@@ -23,8 +23,11 @@ on startup, the boto library looks for configuration files in the following loca
and in the following order:
* /etc/boto.cfg - for site-wide settings that all users on this machine will use
-* ~/.boto - for user-specific settings
+* (if profile is given) ~/.aws/credentials - for credentials shared between SDKs
+* (if profile is given) ~/.boto - for user-specific settings
* ~/.aws/credentials - for credentials shared between SDKs
+* ~/.boto - for user-specific settings
+
In Windows, create a text file that has any name (e.g. boto.config). It's
recommended that you put this file in your user folder. Then set