diff --git a/config/commands/connector.yaml b/config/commands/connector.yaml
index 75548bc..fe69051 100644
--- a/config/commands/connector.yaml
+++ b/config/commands/connector.yaml
@@ -1,7 +1,6 @@
 name: connector
 resource: connector
 related_commands: [listener]
-links: [skupper/service-exposure]
 description: |
   Display help for connector commands and exit.
 include_options: [global/*]
@@ -9,7 +8,6 @@ subcommands:
   - name: create
     wait: Configured
     related_commands: [listener/create]
-    links: [skupper/service-exposure]
     description: |
       Create a connector.
     examples: |
@@ -37,7 +35,6 @@ subcommands:
   - name: update
     wait: Configured
     related_commands: [listener/update]
-    links: [skupper/service-exposure]
     description: |
       Update a connector.
     examples: |
@@ -52,7 +49,6 @@ subcommands:
   - name: delete
     wait: Deletion
     related_commands: [listener/delete]
-    links: [skupper/service-exposure]
     description: |
       Delete a connector.
     examples: |
@@ -63,7 +59,6 @@ subcommands:
     include_options: [delete/*, context/*, global/*]
   - name: status
     related_commands: [listener/status]
-    links: [skupper/service-exposure]
     description: |
       Display the status of connectors in the current site.
     examples: |
@@ -86,7 +81,6 @@ subcommands:
     include_options: [status/*, context/*, global/*]
   - name: generate
     related_commands: [listener/generate]
-    links: [skupper/service-exposure]
     description: |
       Generate a Connector resource.
     examples: |
diff --git a/config/commands/link.yaml b/config/commands/link.yaml
index 4b5425d..9803742 100644
--- a/config/commands/link.yaml
+++ b/config/commands/link.yaml
@@ -1,14 +1,12 @@
 name: link
 resource: link
 related_commands: [token]
-links: [skupper/site-linking]
 description: |
   Display help for link commands and exit.
 include_options: [global/*]
 subcommands:
   - name: update
     wait: Ready
-    links: [skupper/site-linking]
     description: |
       Change link settings.
     examples: |
@@ -19,7 +17,6 @@ subcommands:
     include_options: [link/*, update/*, context/*, global/*]
   - name: delete
     wait: Deletion
-    links: [skupper/site-linking]
     description: |
       Delete a link.
     examples: |
@@ -29,7 +26,6 @@ subcommands:
       Link "west-6bfn6" is deleted.
     include_options: [delete/*, context/*, global/*]
   - name: status
-    links: [skupper/site-linking]
     description: |
       Display the status of links in the current site.
     examples: |
@@ -51,8 +47,7 @@ subcommands:
       Cost:     1
     include_options: [status/*, context/*, global/*]
   - name: generate
-    wait: Site resource Ready
-    links: [skupper/site-linking]
+    wait: Site resource ready
     description: |
       Generate a Link resource for use in a remote site.
 
diff --git a/config/commands/listener.yaml b/config/commands/listener.yaml
index 9d6bebc..c2c6cb4 100644
--- a/config/commands/listener.yaml
+++ b/config/commands/listener.yaml
@@ -1,7 +1,6 @@
 name: listener
 resource: listener
 related_commands: [connector]
-links: [skupper/service-exposure]
 description: |
   Display help for listener commands and exit.
 include_options: [global/*]
@@ -9,7 +8,6 @@ subcommands:
   - name: create
     wait: Configured
     related_commands: [connector/create]
-    links: [skupper/service-exposure]
     description: |
       Create a listener.
     examples: |
@@ -32,7 +30,6 @@ subcommands:
   - name: update
     wait: Configured
     related_commands: [connector/update]
-    links: [skupper/service-exposure]
     description: |
       Update a listener.
     examples: |
@@ -54,7 +51,6 @@ subcommands:
   - name: delete
     wait: Deletion
     related_commands: [connector/delete]
-    links: [skupper/service-exposure]
     description: |
       Delete a listener.
     examples: |
@@ -65,7 +61,6 @@ subcommands:
     include_options: [delete/*, context/*, global/*]
   - name: status
     related_commands: [connector/status]
-    links: [skupper/service-exposure]
     description: |
       Display the status of listeners in the current site.
     examples: |
@@ -87,7 +82,6 @@ subcommands:
     include_options: [status/*, context/*, global/*]
   - name: generate
     related_commands: [connector/generate]
-    links: [skupper/service-exposure]
     description: |
       Generate a Listener resource.
     examples: |
diff --git a/config/commands/site.yaml b/config/commands/site.yaml
index 753950c..b608fd9 100644
--- a/config/commands/site.yaml
+++ b/config/commands/site.yaml
@@ -28,7 +28,6 @@ subcommands:
           There is already a site resource defined for the namespace.
   - name: update
     wait: Ready
-    links: [skupper/site-configuration]
     description: |
       Change site settings.
     examples: |
diff --git a/config/commands/token.yaml b/config/commands/token.yaml
index 423dca8..400f176 100644
--- a/config/commands/token.yaml
+++ b/config/commands/token.yaml
@@ -1,7 +1,7 @@
 name: token
+resource: access-token
 related_concepts: [access-token]
 related_resources: [access-grant, access-token]
-links: [skupper/site-linking]
 description: |
   Display help for token commands and exit.
 include_options: [global/*]
@@ -11,7 +11,6 @@ subcommands:
     resource: access-grant
     platforms: [Kubernetes]
     related_commands: [token/redeem]
-    links: [skupper/site-linking]
     description: |
       Issue a token file redeemable for a link to the current site.
 
@@ -76,7 +75,6 @@ subcommands:
   - name: redeem
     resource: access-token
     related_commands: [token/issue]
-    links: [skupper/site-linking]
     description: |
       Redeem a token file in order to create a link to a remote
       site.
diff --git a/input/commands/link/generate.md b/input/commands/link/generate.md
index d851e3a..02a99b0 100644
--- a/input/commands/link/generate.md
+++ b/input/commands/link/generate.md
@@ -24,7 +24,7 @@ Generating a link requires a site with link access enabled.
 The command waits for the site to enter the ready state
 before producing the link.
 
-<table class="fields"><tr><th>Platforms</th><td>Kubernetes, Docker, Podman, Linux</td><tr><th>Waits for</th><td>Site resource Ready</td></table>
+<table class="fields"><tr><th>Platforms</th><td>Kubernetes, Docker, Podman, Linux</td><tr><th>Waits for</th><td>Site resource ready</td></table>
 
 ## Examples