Merge branch 'master' into fix-lazy-compilation

Author: alexander-akait

examples/cli/bonjour/README.md renamed to examples/bonjour/README.md

@@ -3,7 +3,18 @@
 The Bonjour capability broadcasts server information via ZeroConf when the Server
 is started.
 
-To run this example, run this command in your console or terminal:
+**webpack.config.js**
+
+```js
+module.exports = {
+  // ...
+  devServer: {
+    bonjour: true,
+  },
+};
+```
+
+Usage via CLI:
 
 ```console
 npx webpack serve --bonjour

examples/cli/bonjour/app.js renamed to examples/bonjour/app.js

@@ -2,7 +2,7 @@
 
 // our setup function adds behind-the-scenes bits to the config that all of our
 // examples need
-const { setup } = require("../../util");
+const { setup } = require("../util");
 
 module.exports = setup({
   context: __dirname,