Merge branch 'master' into feature/1.3.0

2 files changed, 13 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52eccc47..c5e6b0c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ CHANGELOG
 =========
 
 v1.2.2 (23.09.2018)
+------
 - new project directory structure
 - introduces DefaultsConfig, allows to keep config files smaller
 - better worker pool destruction while working with long running processes
diff --git a/README.md b/README.md
index f25fc0e9..9cc36e5c 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,18 @@ while ($req = $psr7->acceptRequest()) {
 }
 ```
 
+Configuration can be located in `.rr.yaml` file:
+
+```yaml
+http:
+  address:    0.0.0.0:8080
+  maxRequest: 200
+  workers:
+    command: "php psr-worker.php"
+    pool:
+      numWorkers: 4
+```
+
 License:
 --------
 The MIT License (MIT). Please see [`LICENSE`](./LICENSE) for more information. Maintained by [SpiralScout](https://spiralscout.com).