Cleanup

.coveragerc

@@ -1 +1 @@
-; needs to exist otherwise `$ coveralls fails`
+; needs to exist otherwise `$ coveralls` fails

CHANGELOG.rst

@@ -19,7 +19,7 @@ This project adheres to `Semantic Versioning <http://semver.org/>`_.
 * Added ``-A`` as short name for ``--auth-type``
 * Added ``-F`` as short name for ``--follow``
 * Redirected ``stdout`` doesn't trigger an error anymore when ``--output FILE``
-  is set.
+  is set
 * Changed the default ``--style`` back to ``solarized`` for better support
   of light and dark terminals
 * Fixed ``--session`` when used with ``--download``

README.rst

@@ -738,7 +738,7 @@ Use the ``--ssl=<PROTOCOL>`` to specify the desired protocol version to use.
 This will default to SSL v2.3 which will negotiate the highest protocol that both
 the server and your installation of OpenSSL support. The available protocols
 are ``ssl2.3``, ``ssl3``, ``tls1``, ``tls1.1``, ```tls1.2``. (The actually
-available set of protocols may vary depending your on OpenSSL installation.)
+available set of protocols may vary depending on your OpenSSL installation.)
 
 .. code-block:: bash
 
@@ -1348,12 +1348,14 @@ HTTPie reaches its final version ``1.0``. All changes are recorded in the
 Support
 =======
 
-* Use `GitHub issues <https://github.com/jkbr/httpie/issues>`_
+Please use the following support channels:
+
+* `GitHub issues <https://github.com/jkbr/httpie/issues>`_
   for bug reports and feature requests.
-* Ask questions and discuss features in
-  ` our Gitter chat room <https://gitter.im/jkbrzt/httpie>`_.
-* Ask questions on `StackOverflow <https://stackoverflow.com>`_
-  (please make sure to use the
+* `Our Gitter chat room <https://gitter.im/jkbrzt/httpie>`_
+  to ask questions, discuss features, and for general discussion.
+* `StackOverflow <https://stackoverflow.com>`_
+  to ask questions (please make sure to use the
   `httpie <http://stackoverflow.com/questions/tagged/httpie>`_ tag).
 * You can also tweet directly to `@jkbrzt`_.
 

httpie/cli.py

@@ -474,17 +474,6 @@ def _split_lines(self, text, width):
     """
 )
 
-network.add_argument(
-    '--verify',
-    default='yes',
-    help="""
-    Set to "no" to skip checking the host's SSL certificate. You can also pass
-    the path to a CA_BUNDLE file for private certs. You can also set the
-    REQUESTS_CA_BUNDLE environment variable. Defaults to "yes".
-
-    """
-)
-
 network.add_argument(
     '--timeout',
     type=float,
@@ -519,6 +508,16 @@ def _split_lines(self, text, width):
 #######################################################################
 
 ssl = parser.add_argument_group(title='SSL')
+ssl.add_argument(
+    '--verify',
+    default='yes',
+    help="""
+    Set to "no" to skip checking the host's SSL certificate. You can also pass
+    the path to a CA_BUNDLE file for private certs. You can also set the
+    REQUESTS_CA_BUNDLE environment variable. Defaults to "yes".
+
+    """
+)
 ssl.add_argument(
     '--ssl',  # TODO: Maybe something more general, such as --secure-protocol?
     dest='ssl_version',
@@ -529,6 +528,7 @@ def _split_lines(self, text, width):
     the server and your installation of OpenSSL support. Available protocols
     may vary depending on OpenSSL installation (only the supported ones
     are shown here).
+
     """
 )
 ssl.add_argument(