Fix: roadmap markup for subplot, new legend

1 files changed, 174 insertions, 170 deletions

diff --git a/roadmap.mdwn b/roadmap.mdwn
index 79b126b..d3283f5 100644
--- a/roadmap.mdwn
+++ b/roadmap.mdwn
@@ -24,176 +24,180 @@ freedom.
 
 # Roadmap towards hosted ick
 
-    @startroadmap
-    hosted_demo:
-      label: |
-        Lars run a hosted
-        demo service for
-        himself and users
-      depends:
-        - user_friendly
-        - secure_from_users
-        - secure_for_users
-        - on_demand_workers
-        - trigger_service
-        - multiarch
-
-    user_friendly:
-      label: |
-        Ick is reasonably
-        user friendly to
-        techies.
-      depends:
-        - webui
-        - self_registration
-
-    multiarch:
-      label: |
-        Ick supports building
-        for multiple
-        architectures.
-      depends:
-        - worker_tags
-        - concurrency
-
-    secure_from_users:
-      label: |
-        Ick is safe and
-        secure from users
-        doing silly things.
-      depends:
-        - networkless_containers
-
-    secure_for_users:
-      label: |
-        Ick is secure for
-        users to use.
-      depends:
-        - isolation
-        - secrets
-
-    secrets:
-      label: |
-        Ick provides a way to
-        securely use secrets:
-        ssh keys, pgp keys,
-        Qvisqve access
-        tokens.
-      depends:
-        - owned_resources
-
-    networkless_containers:
-      label: |
-        Containers have, by
-        default, no network
-        access. Trusted users
-        can allow specific
-        builds to have
-        network access in
-        containers.
-      depends:
-        - owned_resources
-
-    concurrency:
-      label: |
-        Ick can execute
-        several actions in
-        the same build
-        concurrently.
-      depends:
-        - worker_tags
-
-    worker_tags:
-      label: |
-        Ick allows projects
-        and workers to have
-        tags, and can choose
-        which worker to give
-        an action to, based
-        on tags
-
-    on_demand_workers:
-      label: |
-        Ick can create
-        and destroy
-        workers on demand
-      depends:
-        - worker_tags
-
-    trigger_service:
-      label: |
-        Ick can trigger
-        multiple builds when
-        a git repo changes,
-        or when an ick build
-        finishes, or after
-        some time has passed
-
-    isolation:
-      label: |
-        Users can only see,
-        manipulate their own
-        data
-      depends:
-        - owned_resources
-
-    owned_resources:
-      label: |
-        Each resource is
-        owned by its creator
-
-    self_registration:
-      label: |
-        Users can create
-        an account by themselves
-        via a web browser
-      depends:
-        - webui
-
-    webui:
-      label: |
-        Ick has a web UI
-        that allows creation,
-        updating, triggering
-        of projects, builds,
-        viewing status, logs
-    @endroadmap
+```roadmap
+hosted_demo:
+  label: |
+    Lars run a hosted
+    demo service for
+    himself and users
+  depends:
+    - user_friendly
+    - secure_from_users
+    - secure_for_users
+    - on_demand_workers
+    - trigger_service
+    - multiarch
+
+user_friendly:
+  label: |
+    Ick is reasonably
+    user friendly to
+    techies.
+  depends:
+    - webui
+    - self_registration
+
+multiarch:
+  label: |
+    Ick supports building
+    for multiple
+    architectures.
+  depends:
+    - worker_tags
+    - concurrency
+
+secure_from_users:
+  label: |
+    Ick is safe and
+    secure from users
+    doing silly things.
+  depends:
+    - networkless_containers
+
+secure_for_users:
+  label: |
+    Ick is secure for
+    users to use.
+  depends:
+    - isolation
+    - secrets
+
+secrets:
+  label: |
+    Ick provides a way to
+    securely use secrets:
+    ssh keys, pgp keys,
+    Qvisqve access
+    tokens.
+  depends:
+    - owned_resources
+
+networkless_containers:
+  label: |
+    Containers have, by
+    default, no network
+    access. Trusted users
+    can allow specific
+    builds to have
+    network access in
+    containers.
+  depends:
+    - owned_resources
+
+concurrency:
+  label: |
+    Ick can execute
+    several actions in
+    the same build
+    concurrently.
+  depends:
+    - worker_tags
+
+worker_tags:
+  label: |
+    Ick allows projects
+    and workers to have
+    tags, and can choose
+    which worker to give
+    an action to, based
+    on tags
+
+on_demand_workers:
+  label: |
+    Ick can create
+    and destroy
+    workers on demand
+  depends:
+    - worker_tags
+
+trigger_service:
+  label: |
+    Ick can trigger
+    multiple builds when
+    a git repo changes,
+    or when an ick build
+    finishes, or after
+    some time has passed
+
+isolation:
+  label: |
+    Users can only see,
+    manipulate their own
+    data
+  depends:
+    - owned_resources
+
+owned_resources:
+  label: |
+    Each resource is
+    owned by its creator
+
+self_registration:
+  label: |
+    Users can create
+    an account by themselves
+    via a web browser
+  depends:
+    - webui
+
+webui:
+  label: |
+    Ick has a web UI
+    that allows creation,
+    updating, triggering
+    of projects, builds,
+    viewing status, logs
+```
 
 # Roadmap legend
 
-    @startroadmap
-
-    blocked:
-        label: |
-            This is blocked
-            (cannot be done
-            until something
-            else is done first)
-        status: blocked
-        depends:
-        - finished
-        - ready
-        - next
-
-    finished:
-        label: |
-            This is finished
-            (already done)
-        status: finished
-
-    ready:
-        label: |
-            This is ready
-            (can be done if
-            we choose to)
-        status: ready
-
-    next:
-        label: |
-            This is next
-            (has been chosen
-            to be done in
-            the current iteration)
-        status: next
-
-    @endroadmap
+```roadmap
+goal:
+  label: |
+    This is the end goal:
+    if we reach here, there
+    is nothing more to be
+    done in the project
+  depends:
+  - finished
+  - blocked
+
+finished:
+  status: finished
+  label: |
+    This task is finished;
+    the arrow indicates what
+    follows this task (unless
+    it's blocked)
+
+ready:
+  label: |
+    This task is ready 
+    to be done: it is not
+    blocked by anything
+
+next:
+  status: next
+  label: |
+    This task is chosen 
+    to be done next
+
+blocked:
+  label: |
+    This task is blocked
+    and can't be done until
+    something happens
+  depends:
+  - ready
+  - next
+```