guides/user/Command-line-user-interface.md

@@ -86,6 +86,10 @@ in the [knowledge base](http://support.arachni-scanner.com/kb/).
         * [Example](#http-cookie-string_example)
     * [Authentication username (--http-authentication-username)](#http-authentication-username)
     * [Authentication password (--http-authentication-password)](#http-authentication-password)
+    * [Proxy (--http-proxy)](#http-proxy)
+    * [Proxy authentication (--http-proxy-authentication)](#http-proxy-authentication)
+    * [Proxy type (--http-proxy-type)](#http-proxy-type)
+* [Session](#session)
     * [Login check URL (--login-check-url)](#login-check-url)
     * [Login check pattern (--login-check-pattern)](#login-check-pattern)
 * [Profiles](#profiles)
@@ -143,10 +147,6 @@ in the [knowledge base](http://support.arachni-scanner.com/kb/).
     * [Disable fingerprinting (--no-fingerprinting)](#no-fingerprinting)
     * [Platforms (--platforms)](#platforms)
         * [Example](#platforms_example)
-* [Proxy](#proxy)
-    * [Proxy server (--proxy)](#proxy_server)
-    * [Proxy authentication (--proxy-auth)](#proxy-auth)
-    * [Proxy type (--proxy-type)](#proxy-type)
 
 <h2 id='generic'><a href='#generic'>Generic</a></h2>
 
@@ -502,6 +502,39 @@ Username to use for HTTP authentication.
 
 Password to use for HTTP authentication.
 
+<h3 id='http-proxy'><a href='#http-proxy'>Proxy (--http-proxy)</a></h3>
+
+**Expects**: `server:port`
+
+**Default**: `disabled`
+
+**Multiple invocations?**: `no`
+
+
+Sets a proxy server for the client.
+
+<h3 id='http-proxy-authentication'><a href='#http-proxy-authentication'>Proxy authentication (--http-proxy-auth)</a></h3>
+
+**Expects**: `username:password`
+
+**Default**: `disabled`
+
+**Multiple invocations?**: `no`
+
+
+Sets authentication credentials for the specified proxy server.
+
+<h3 id='http-proxy-type'><a href='#http-proxy-type'>Proxy type (--http-proxy-type)</a></h3>
+
+**Expects**: `http, http_1_0, socks4, socks5, socks4a`
+
+**Default**: `auto`
+
+**Multiple invocations?**: `no`
+
+
+Sets the protocol for the specified proxy server.
+
 <h3 id='login-check-url'><a href='#login-check-url'>Login check URL (--login-check-url)</a></h3>
 
 **Expects**: `string`
@@ -518,6 +551,8 @@ logged in to the web application.
 If HTTP response body of URL matches the [login-check-pattern](#login-check-pattern)
 this should indicate that the scanner is logged in.
 
+<h2 id='session'><a href='#session'>Session</a></h2>
+
 <h3 id='login-check-pattern'><a href='#login-check-pattern'>Login check pattern (--login-check-pattern)</a></h3>
 
 **Expects**: `string`
@@ -2411,41 +2446,6 @@ Disables platform fingerprinting and results in all audit payloads being sent to
 Explicitly sets the platforms for the remote web application. You can use this to help
 Arachni be more efficient in its audit.
 
-<h2 id='proxy'><a href='#proxy'>Proxy</a></h2>
-
-<h3 id='proxy_server'><a href='#proxy_server'>Proxy server (--proxy)</a></h3>
-
-**Expects**: `server:port`
-
-**Default**: `disabled`
-
-**Multiple invocations?**: `no`
-
-
-Tells Arachni to send all requests via a proxy server.
-
-<h3 id='proxy-auth'><a href='#proxy-auth'>Proxy authentication (--proxy-auth)</a></h3>
-
-**Expects**: `username:password`
-
-**Default**: `disabled`
-
-**Multiple invocations?**: `no`
-
-
-Tells Arachni authenticate itself with the proxy server using the supplied username and password.
-
-<h3 id='proxy-type'><a href='#proxy-type'>Proxy type (--proxy-type)</a></h3>
-
-**Expects**: `http, http_1_0, socks4, socks5, socks4a`
-
-**Default**: `disabled OR http`
-
-**Multiple invocations?**: `no`
-
-
-Tells Arachni what protocol to use to connect and comunicate with the proxy server.
-
 <h2 id='cli_help_output'><a href='#cli_help_output'>CLI Help Output</a></h2>
 
 ```