WIP

config/concepts/connector.yaml

@@ -12,21 +12,25 @@ description: |
     <figcaption>The connector model</figcaption>
   </figure>
 
+  <figure>
+    <img src="images/routing-key-model.svg"/>
+    <figcaption>The routing key model</figcaption>
+  </figure>
+
   A site has zero or more connectors.  Each connector has an
   associated workload and routing key.  The workload can be specified
   as a Kubernetes pod selector or as the host and port of a local
-  network service.
+  network service.  The routing key is a string identifier that binds
+  the connector to listeners in remote sites.
 
   <figure>
-    <img src="images/routing-key-model.svg"/>
-    <figcaption>Listeners and connectors associated by routing key</figcaption>
+    <img src="images/service-1.svg"/>
+    <figcaption>Client connections forwarded to servers</figcaption>
   </figure>
 
-  The routing key is a string identifier that binds the connector to
-  listeners in remote sites.  Skupper routers forward client
-  connections across the network from listeners to connectors with
-  matching routing keys.  The connectors then forward the client
-  connections to the workload servers.
+  Skupper routers forward client connections across the network from
+  listeners to connectors with matching routing keys.  The connectors
+  then forward the client connections to the workload servers.
 
   <figure>
     <img src="images/connector-1.svg"/>

config/concepts/listener.yaml

@@ -12,26 +12,28 @@ description: |
     <figcaption>The listener model</figcaption>
   </figure>
 
+  <figure>
+    <img src="images/routing-key-model.svg"/>
+    <figcaption>The routing key model</figcaption>
+  </figure>
+
   A site has zero or more listeners.  Each listener has an associated
   connection endpoint and routing key.  The connection endpoint
   exposes a host and port for accepting connections from local
-  clients.
+  clients.  The routing key is a string identifier that binds the
+  listener to connectors in remote sites.
 
   <figure>
-    <img src="images/routing-key-model.svg"/>
-    <figcaption>Listeners and connectors associated by routing key</figcaption>
+    <img src="images/service-1.svg"/>
+    <figcaption>Client connections forwarded to servers</figcaption>
   </figure>
 
-  The routing key is a string identifier that binds the listener to
-  connectors in remote sites.  Skupper routers forward client
-  connections across the network from listeners to connectors with
-  matching routing keys.  The connectors then forward the client
-  connections to the workload servers.
+  Skupper routers forward client connections across the network from
+  listeners to connectors with matching routing keys.  The connectors
+  then forward the client connections to the workload servers.
 
   <figure>
     <img src="images/listener-1.svg"/>
     <figcaption>A listener with multiple clients connecting
     through it</figcaption>
   </figure>
-overview: |
-  - Local workloads can connect to the listener

input/concepts/connector.md

@@ -27,21 +27,25 @@ keys](routing-key.html)**.
   <figcaption>The connector model</figcaption>
 </figure>
 
+<figure>
+  <img src="images/routing-key-model.svg"/>
+  <figcaption>The routing key model</figcaption>
+</figure>
+
 A site has zero or more connectors.  Each connector has an
 associated workload and routing key.  The workload can be specified
 as a Kubernetes pod selector or as the host and port of a local
-network service.
+network service.  The routing key is a string identifier that binds
+the connector to listeners in remote sites.
 
 <figure>
-  <img src="images/routing-key-model.svg"/>
-  <figcaption>Listeners and connectors associated by routing key</figcaption>
+  <img src="images/service-1.svg"/>
+  <figcaption>Client connections forwarded to servers</figcaption>
 </figure>
 
-The routing key is a string identifier that binds the connector to
-listeners in remote sites.  Skupper routers forward client
-connections across the network from listeners to connectors with
-matching routing keys.  The connectors then forward the client
-connections to the workload servers.
+Skupper routers forward client connections across the network from
+listeners to connectors with matching routing keys.  The connectors
+then forward the client connections to the workload servers.
 
 <figure>
   <img src="images/connector-1.svg"/>

input/concepts/images/service-1.d2

@@ -1,8 +1,9 @@
 ...@common
 
-Site 1.Client -> Site 1.Listener -- Routing key -- Site 2.Connector -> Site 2.Server
+Site 1.class: neutral
+Site 1.Clients.style.fill: white
 
-Routing key.class: notion
-Site 1.Client.style.fill: white
-Site 2.Server.style.fill: white
-Site*.class: neutral
+Site 2.class: neutral
+Site 2.Servers.style.fill: white
+
+Site 1.Clients -> Site 1.Listener -- Site 2.Connector -> Site 2.Servers