Merge branch 'master' of github.com:yandex/yandex-tank

docs/core_and_modules.rst

@@ -292,10 +292,10 @@ Advanced options
 TLS/SSL additional options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-..note::
+.. note::
   ``ssl=1`` is required
 
-:ciphers:
+:client_cipher_suites:
   Cipher list, consists of one or more cipher strings separated by colons (see man ciphers).
 
   Example: ciphers = RSA:!COMPLEMENTOFALL
@@ -903,7 +903,7 @@ Basic criteria types
 
   Example: metric_lower(127.0.0.1,Memory_free,500,10). 
 
-  Exit code - 31 and 32. 
+  Exit code - 31 and 32 
 
   **Note**: metric names (except customs) are written with underline. For hostnames masks are allowed (i.e target-\*.load.net)
 
@@ -952,21 +952,21 @@ Advanced criteria types
 
   Example: ``negative_http(2xx,10%,10s)``. 
 
-  Exit code: 28
+  Exit code - 28
 
 :negative_net: 
   Inversed ``total_net``. Stop if there are not enough responses that fit the specified mask. 
 
   Example: ``negative_net(0,10%,10s)``. 
 
-  Exit code: 29
+  Exit code - 29
 
 :http_trend: 
   Stop if trend for defined http codes is negative on defined period. Trend is a sum of an average coefficient for linear functions calculated for each pair points in last n seconds and standart deviation for it
 
   Example: http_trend(2xx,10s). 
 
-  Exit code: 30. 
+  Exit code - 30
 
 Monitoring
 ==========
@@ -1318,4 +1318,4 @@ Options
 :disable:
   Disable tips and tricks.
 
-  Default: 0 (don't).
+  Default: 0 (don't).

yandextank/api/apiworker.py

@@ -144,7 +144,7 @@ class ApiWorker:
                     ]
         except OSError:
             self.log.warn(self.baseconfigs_location +
-                          ' is not acessible to get configs list')
+                          ' is not accessible to get configs list')
 
         configs += [os.path.expanduser('~/.yandex-tank')]
         return configs

yandextank/core/consoleworker.py

@@ -161,7 +161,7 @@ class ConsoleTank:
                     ]
         except OSError:
             self.log.warn(self.baseconfigs_location +
-                          ' is not acessible to get configs list')
+                          ' is not accessible to get configs list')
 
         configs += [os.path.expanduser('~/.yandex-tank')]
         return configs