Merge branch 'Kastl_copypac_keeplink_description' of https://github.c…

…om/johanneskastl/osc

Improve the --keeplink documentation ("copypac" command).

osc/commandline.py

@@ -720,7 +720,7 @@ def do_setdevelproject(self, subcmd, opts, *args):
                         help='Create a new token')
     @cmdln.option('-d', '--delete', metavar='TOKENID',
                         help='Create a new token')
-    @cmdln.option('-t', '--trigger', metavar='TOKENID',
+    @cmdln.option('-t', '--trigger', metavar='TOKENSTRING',
                         help='Trigger the action of a token')
     def do_token(self, subcmd, opts, *args):
         """${cmd_name}: Show and manage authentication token
@@ -732,7 +732,7 @@ def do_token(self, subcmd, opts, *args):
             osc token
             osc token --create [<PROJECT> <PACKAGE>]
             osc token --delete <TOKENID>
-            osc token --trigger <TOKENID>
+            osc token --trigger <TOKENSTRING>
         ${cmd_option_list}
         """
 
@@ -2880,7 +2880,7 @@ def do_aggregatepac(self, subcmd, opts, *args):
     @cmdln.option('-k', '--keep-maintainers', action='store_true',
                         help='keep original maintainers. Default is remove all and replace with the one calling the script.')
     @cmdln.option('-K', '--keep-link', action='store_true',
-                        help='keep the source link in target, this also expands the source')
+                        help='If the target package is a link, the link is kept, but may be updated. If the source package is a link, its expanded version is considered.')
     @cmdln.option('-d', '--keep-develproject', action='store_true',
                         help='keep develproject tag in the package metadata')
     @cmdln.option('-r', '--revision', metavar='rev',