diff --git a/content/configuration/dev-server.md b/content/configuration/dev-server.md
index da9f21fdb264..a17f7f528ad6 100644
--- a/content/configuration/dev-server.md
+++ b/content/configuration/dev-server.md
@@ -74,6 +74,27 @@ allowedHosts: [
 ]
 ```
 
+To use this option with the CLI pass the `--allowed-hosts` option a comma-delimited string.
+
+```bash
+webpack-dev-server --entry /entry/file --output-path /output/path --allowed-hosts .host.com,host2.com
+```
+
+
+## `devServer.bonjour`
+
+This option broadcasts the server via ZeroConf networking on start
+
+```js
+bonjour: true
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --bonjour
+```
+
 
 ## `devServer.clientLogLevel`
 
@@ -87,11 +108,28 @@ You can prevent all these messages from showing, by using this option:
 clientLogLevel: "none"
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --client-log-level none
+```
+
 Possible values are `none`, `error`, `warning` or `info` (default).
 
 Note that the console will *always* show bundle errors and warnings. This option only effects the message before it.
 
 
+## `devServer.color` - CLI only
+
+`boolean`
+
+Enables/Disables colors on the console.
+
+```bash
+webpack-dev-server --color
+```
+
+
 ## `devServer.compress`
 
 `boolean`
@@ -102,6 +140,12 @@ Enable [gzip compression](https://betterexplained.com/articles/how-to-optimize-y
 compress: true
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --compress
+```
+
 
 ## `devServer.contentBase`
 
@@ -129,6 +173,29 @@ To disable `contentBase`:
 contentBase: false
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --content-base /path/to/content/dir
+```
+
+
+## `devServer.disableHostCheck`
+
+`boolean`
+
+When set to true this option bypasses host checking. THIS IS NOT RECOMMENDED as apps that do not check the host are vulnerable to DNS rebinding attacks.
+
+```js
+disableHostCheck: true
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --disable-host-check
+```
+
 
 ## `devServer.filename` 🔑
 
@@ -192,10 +259,16 @@ historyApiFallback: {
 }
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --history-api-fallback
+```
+
 For more options and information, see the [connect-history-api-fallback](https://github.com/bripkens/connect-history-api-fallback) documentation.
 
 
-## `devServer.host` - CLI only
+## `devServer.host`
 
 `string`
 
@@ -205,6 +278,12 @@ Specify a host to use. By default this is `localhost`. If you want your server t
 host: "0.0.0.0"
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --host 0.0.0.0
+```
+
 
 ## `devServer.hot`
 
@@ -219,7 +298,7 @@ hot: true
 T> Note that you must also include a `new webpack.HotModuleReplacementPlugin()` to fully enable HMR. See the [HMR concepts page](/concepts/hot-module-replacement) for more information.
 
 
-## `devServer.hotOnly` - CLI only
+## `devServer.hotOnly`
 
 `boolean`
 
@@ -229,6 +308,12 @@ Enables Hot Module Replacement (see [`devServer.hot`](#devserver-hot)) without p
 hotOnly: true
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --hot-only
+```
+
 
 ## `devServer.https`
 
@@ -252,8 +337,31 @@ https: {
 
 This object is passed straight to Node.js HTTPS module, so see the [HTTPS documentation](https://nodejs.org/api/https.html) for more information.
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --https
+```
+
+To pass your own certificate via the CLI use the following options
+
+```bash
+webpack-dev-server --https --key /path/to/server.key --cert /path/to/server.crt --cacert /path/to/ca.pem
+```
+
+
+## `devServer.info` - CLI only
+
+`boolean`
+
+Output cli information. It is enabled by default.
+
+```bash
+webpack-dev-server --info=false
+```
+
 
-## `devServer.inline` - CLI only
+## `devServer.inline`
 
 `boolean`
 
@@ -265,6 +373,12 @@ It is also possible to use **iframe mode**, which uses an `<iframe>` under a not
 inline: false
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --inline=false
+```
+
 T> Inline mode is recommended when using Hot Module Replacement.
 
 
@@ -278,6 +392,12 @@ When `lazy` is enabled, the dev-server will only compile the bundle when it gets
 lazy: true
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --lazy
+```
+
 T> `watchOptions` will have no effect when used with **lazy mode**.
 
 T> If you use the CLI, make sure **inline mode** is disabled.
@@ -293,6 +413,41 @@ With `noInfo` enabled, messages like the webpack bundle information that is show
 noInfo: true
 ```
 
+
+## `devServer.open`
+
+`boolean`
+
+When `open` is enabled, the dev server will open the browser.
+
+```js
+open: true
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --open
+```
+
+
+## `devServer.openPage`
+
+`string`
+
+Specify a page to navigate to when opening the browser.
+
+```js
+openPage: '/different/page'
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --open-page "/different/page"
+```
+
+
 ## `devServer.overlay`
 
 `boolean` `object`
@@ -312,7 +467,42 @@ overlay: {
 }
 ```
 
-## `devServer.port` - CLI only
+
+## `devServer.pfx`
+
+`string`
+
+Path to a SSL pfx file.
+
+```js
+pfx: '/path/to/file.pfx'
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --pfx /path/to/file.pfx
+```
+
+
+## `devServer.pfxPassphrase`
+
+`string`
+
+The passphrase to a SSL PFX file.
+
+```js
+pfxPassphrase: 'passphrase'
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --pfx-passphrase passphrase
+```
+
+
+## `devServer.port`
 
 `number`
 
@@ -322,6 +512,12 @@ Specify a port number to listen for requests on:
 port: 8080
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --port 8080
+```
+
 
 ## `devServer.proxy`
 
@@ -390,8 +586,12 @@ proxy: {
 
 Output running progress to console.
 
+```bash
+webpack-dev-server --progress
+```
+
 
-## `devServer.public` - CLI only
+## `devServer.public`
 
 `string`
 
@@ -403,6 +603,12 @@ For example, the dev-server is proxied by nginx, and available on `myapp.test`:
 public: "myapp.test:80"
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --public myapp.test:80
+```
+
 
 ## `devServer.publicPath` 🔑
 
@@ -443,6 +649,13 @@ With `quiet` enabled, nothing except the initial startup information will be wri
 quiet: true
 ```
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --quiet
+```
+
+
 ## `devServer.setup`
 
 `function`
@@ -459,6 +672,23 @@ setup(app){
 ```
 
 
+## `devServer.socket`
+
+`string`
+
+The Unix socket to listen to (instead of a host).
+
+```js
+socket: 'socket'
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --socket socket
+```
+
+
 ## `devServer.staticOptions`
 
 It is possible to configure advanced options for serving static files from `contentBase`. See the [Express documentation](http://expressjs.com/en/4x/api.html#express.static) for the possible options. An example:
@@ -489,6 +719,34 @@ For more information, see the [**stats documentation**](/configuration/stats).
 T> This option has no effect when used with `quiet` or `noInfo`.
 
 
+## `devServer.stdin` - CLI only
+
+`boolean`
+
+This option closes the server when stdin ends.
+
+```bash
+webpack-dev-server --stdin
+```
+
+
+## `devServer.useLocalIp`
+
+`boolean`
+
+This option lets the browser open with your local IP.
+
+```js
+useLocalIp: true
+```
+
+Usage via the CLI
+
+```bash
+webpack-dev-server --useLocalIp
+```
+
+
 ## `devServer.watchContentBase`
 
 `boolean`
@@ -501,6 +759,12 @@ watchContentBase: true
 
 It is disabled by default.
 
+Usage via the CLI
+
+```bash
+webpack-dev-server --watch-content-base
+```
+
 
 ## `devServer.watchOptions` 🔑