Change docu

docs/MERGE.md

@@ -44,18 +44,17 @@ Currently, here is no way to remove an attribute or a block from the configurati
   * When `spa` blocks are merged:
     * All attributes replace existing attributes with the same name, if any, otherwise
       they are added.
-    * selected by optional label, if any
     * The `cors` block replaces existing `cors` block, if any, otherwise a new `cors`
       block is added.
   * When `api` blocks are merged:
     * All attributes replace existing attributes with the same name, if any, otherwise
-	  they are added.
+      they are added.
     * The `cors` block replaces existing `cors` block, if any, otherwise a new `cors`
-	  block is added.
+      block is added.
     * All `endpoint` blocks replace existing blocks with the same label, if any,
-	  otherwise they are added.
+      otherwise they are added.
     * All `error_handler` blocks replace existing blocks with identical labels,
-	  if any, otherwise they are added.
+      if any, otherwise they are added.
 
 **Note:** An `error_handler` block cannot be replaced in or added to an `endpoint`
 block. Therefore, the `endpoint` block must be completely replaced.

public/couper.hcl

@@ -1,11 +1,12 @@
-server "couper" {
-  files {
-    document_root = env.DOC_DIR
+server {
+  spa "s1" {
+    bootstrap_file = "couper.hcl"
+    base_path = "/a"
+    paths = ["/b/c/**"]
   }
-}
-
-defaults {
-  environment_variables = {
-    DOC_DIR = "./"
+  spa "s2" {
+    bootstrap_file = "couper.hcl"
+    base_path = "/a/b"
+    paths = ["/c/**"]
   }
 }