Merge pull request conan-io#709 from danimtb/feature/446

Document cache_no_locks in reference

Author: lasote

reference/config_files/conan.conf.rst

@@ -18,15 +18,15 @@ The typical location of the **conan.conf** file is the directory ``~/.conan/``:
     default_profile = default
     compression_level = 9                 # environment CONAN_COMPRESSION_LEVEL
     sysrequires_sudo = True               # environment CONAN_SYSREQUIRES_SUDO
-    request_timeout = 30                  # environment CONAN_REQUEST_TIMEOUT
+    request_timeout = 60                  # environment CONAN_REQUEST_TIMEOUT (seconds)
     # sysrequires_mode = enabled            # environment CONAN_SYSREQUIRES_MODE (allowed modes enabled/verify/disabled)
     # vs_installation_preference = Enterprise, Professional, Community, BuildTools # environment CONAN_VS_INSTALLATION_PREFERENCE
     # verbose_traceback = False           # environment CONAN_VERBOSE_TRACEBACK
     # bash_path = ""                      # environment CONAN_BASH_PATH (only windows)
     # recipe_linter = False               # environment CONAN_RECIPE_LINTER
     # read_only_cache = True              # environment CONAN_READ_ONLY_CACHE
     # pylintrc = path/to/pylintrc_file    # environment CONAN_PYLINTRC
-    # cache_no_locks = True
+    # cache_no_locks = True               # Disable locking mechanism of local cache
     # user_home_short = your_path         # environment CONAN_USER_HOME_SHORT
     # skip_vs_projects_upgrade = False    # environment CONAN_SKIP_VS_PROJECTS_UPGRADE
     # non_interactive = False             # environment CONAN_NON_INTERACTIVE
@@ -47,7 +47,7 @@ The typical location of the **conan.conf** file is the directory ``~/.conan/``:
     # cpu_count = 1             # environment CONAN_CPU_COUNT
 
     # Change the default location for building test packages to a temporary folder
-    # which is deleted after the test (Defaulted to False).
+    # which is deleted after the test.
     # temp_test_folder = True             # environment CONAN_TEMP_TEST_FOLDER
 
     [storage]
@@ -63,6 +63,8 @@ The typical location of the **conan.conf** file is the directory ``~/.conan/``:
     # http = http://user:pass@10.10.1.10:3128/
     # http = http://10.10.1.10:3128
     # https = http://10.10.1.10:1080
+    # You can skip the proxy for the matching (fnmatch) urls (comma-separated)
+    # no_proxy_match = *bintray.com*, https://myserver.*
 
 
     # Default settings now declared in the default profile