Improve documentation on shell completions

README.md

@@ -50,26 +50,25 @@ in the wiki for more details.
 Annif supports tab-key completion in bash, zsh and fish shells for commands and options
 and project id, vocabulary id and path parameters.
 
-To enable completion support in your current terminal session use `annif completion`
+To enable the completion support in your current terminal session use `annif completion`
 command with the option according to your shell to produce the completion script and
 source it. For example, run
 
  source <(annif completion --bash)
 
-To enable completion support in all new sessions first add the completion script in your
-home directory:
+To enable the completion support in all new sessions first add the completion script in
+your home directory:
 
  annif completion --bash > ~/.annif-complete.bash
 
 Then make the script to be automatically sourced for new terminal sessions by adding the
-following to your `~/.bashrc` file (or in [alternative startup
-files](https://www.gnu.org/software/bash/manual/html_node/Bash-Startup-Files.html)):
+following to your `~/.bashrc` file (or in some [alternative startup
+file](https://www.gnu.org/software/bash/manual/html_node/Bash-Startup-Files.html)):
 
  source ~/.annif-complete.bash
 
- You can also add just the completion script in your `/etc/bash_completion.d/`
- directory.
-
+For details and usage for other shells see
+[Click documentation](https://click.palletsprojects.com/en/8.1.x/shell-completion/).
 # Docker install
 
 You can use Annif as a pre-built Docker container. Please see the

annif/cli.py

@@ -557,7 +557,10 @@ def run_hyperopt(project_id, paths, docs_limit, trials, jobs, metric, results_fi
 @click.option("--zsh", "shell", flag_value="zsh")
 @click.option("--fish", "shell", flag_value="fish")
 def completion(shell):
- """Generate autocompletion script for the given shell."""
+ """Generate the script for tab-key autocompletion for the given shell. To enable the
+ completion support in your current bash terminal session run\n
+ source <(annif completion --bash)
+ """
 
  if shell is None:
  raise click.UsageError("Shell not given, try --bash, --zsh or --fish")