WIP

config/commands.yaml

@@ -120,8 +120,6 @@ groups:
             required: false
             positional: true
             description: |
-              XXX
-
               The name of the site resource.
 
               If not specified, the name is that of the site

input/commands/connector-create.md

@@ -48,7 +48,7 @@ skupper connector create backend 8080 --output yaml
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
+  The name of the connector resource.
 
   | | |
   |-|-|
@@ -113,7 +113,7 @@ skupper connector create backend 8080 --output yaml
   |-|-|
   | Platforms | Kubernetes, Docker |
 
-- <h3 id="tls-secret">tls-secret <span class="option-info">string, optional</span></h3>
+- <h3 id="tls-secret">--tls-secret <span class="option-info">string</span></h3>
 
   The name of a Kubernetes secret containing the trusted
   server certificate (typically a CA).

input/commands/connector-delete.md

@@ -31,7 +31,7 @@ Connector "<name>" is deleted.
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
+  The name of the connector resource.
 
   | | |
   |-|-|

input/commands/link-create.md

@@ -28,13 +28,13 @@ Link "<name>" is ready.
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
+  The name of the link.
 
   | | |
   |-|-|
   | Platforms | Kubernetes, Docker |
 
-- <h3 id="tls-secret">tls-secret <span class="option-info">string, optional</span></h3>
+- <h3 id="tls-secret">tls-secret <span class="option-info">string, required</span></h3>
 
   The name of a Kubernetes secret containing TLS
   credentials. The secret contains the trusted server

input/commands/link-delete.md

@@ -28,8 +28,6 @@ Link "<name>" is deleted.
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
-
   | | |
   |-|-|
   | Platforms | Kubernetes, Docker |

input/commands/link-update.md

@@ -28,13 +28,11 @@ Link "<name>" is updated.
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
-
   | | |
   |-|-|
   | Platforms | Kubernetes, Docker |
 
-- <h3 id="tls-secret">tls-secret <span class="option-info">string, optional</span></h3>
+- <h3 id="tls-secret">--tls-secret <span class="option-info">string</span></h3>
 
   The name of a Kubernetes secret containing TLS
   credentials. The secret contains the trusted server

input/commands/listener-create.md

@@ -88,7 +88,7 @@ skupper listener create backend 8080 --output yaml
   | Default | _Value of name_ |
   | Platforms | Kubernetes, Docker |
 
-- <h3 id="tls-secret">tls-secret <span class="option-info">string, optional</span></h3>
+- <h3 id="tls-secret">--tls-secret <span class="option-info">string</span></h3>
 
   The name of a Kubernetes secret containing TLS
   credentials.  The secret contains the trusted server

input/commands/site-create.md

@@ -42,7 +42,8 @@ skupper site create west --enable-link-access
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
+  A name of your choice for the Skupper site.  This name is
+  displayed in the console and CLI output.
 
   | | |
   |-|-|

input/commands/site-delete.md

@@ -28,7 +28,10 @@ Site "<name>" is deleted.
 
 - <h3 id="name">name <span class="option-info">string, required</span></h3>
 
-  The name of the listener resource.
+  The name of the site resource.
+
+  If not specified, the name is that of the site
+  associated with the current namespace.
 
   | | |
   |-|-|

input/commands/site-update.md

@@ -40,9 +40,12 @@ skupper site update --enable-link-access --service-account app1:alice
 
 ## Options
 
-- <h3 id="name">name <span class="option-info">string, required</span></h3>
+- <h3 id="name">name <span class="option-info">string, optional</span></h3>
 
-  The name of the listener resource.
+  The name of the site resource.
+
+  If not specified, the name is that of the site
+  associated with the current namespace.
 
   | | |
   |-|-|

input/commands/token-issue.md

@@ -60,7 +60,7 @@ skupper token issue ~/token.yaml --expiration-window 24h --redemptions-allowed 3
 
 - <h3 id="file">file <span class="option-info">string, required</span></h3>
 
-  The name of the token file to use.
+  The name of the token file to create.
 
   | | |
   |-|-|

python/commands.py

@@ -259,7 +259,7 @@ def merge_option_data(self):
         option_data = dict()
 
         for name in option_names:
-            option_data[name] = standard_option_data.get(name, {})
+            option_data[name] = dict(standard_option_data.get(name, {}))
             option_data[name].update(specific_option_data.get(name, {}))
 
         return option_data.values()

python/resources.py

@@ -312,7 +312,7 @@ def merge_property_data(self, section):
         prop_data = dict()
 
         for name in prop_names:
-            prop_data[name] = standard_prop_data.get(name, {})
+            prop_data[name] = dict(standard_prop_data.get(name, {}))
             prop_data[name].update(specific_prop_data.get(name, {}))
 
         return prop_data.values()