Skip to content

Commit

Permalink
fix indentation
Browse files Browse the repository at this point in the history
and some quotes
  • Loading branch information
bernt-matthias committed Jan 12, 2023
1 parent 60974cc commit d82f922
Show file tree
Hide file tree
Showing 3 changed files with 232 additions and 232 deletions.
2 changes: 1 addition & 1 deletion docs/topics/concepts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ roles or users to specific destinations for example.
However, if the tags are mutually exclusive, then an IncompatibleTagsException is raised. For example, if a role
expresses a preference for training, but the tool rejects tag `training`, then the job can no longer be scheduled.
If the tags are compatible, then the tag with the stronger claim takes effect. For example, if a tool requires
'high-mem` and a user prefers `high-mem`, then the combined entity will require `high-mem`. An example of using
`high-mem` and a user prefers `high-mem`, then the combined entity will require `high-mem`. An example of using
this property would be to restrict the availability of dangerous tools only to trusted users.

Combining envs and params
Expand Down
16 changes: 8 additions & 8 deletions docs/topics/configure_galaxy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ TPV allows rules to be loaded from remote or local sources.
:linenos:
:emphasize-lines: 7-9,14-19
tpv_dispatcher:
runner: dynamic
type: python
function: map_tool_to_destination
rules_module: tpv.rules
tpv_config_files:
- https://usegalaxy.org/shared_rules.yml
- config/tpv_rules_australia.yml
tpv_dispatcher:
runner: dynamic
type: python
function: map_tool_to_destination
rules_module: tpv.rules
tpv_config_files:
- https://usegalaxy.org/shared_rules.yml
- config/tpv_rules_australia.yml
The config files listed first are overridden by config files listed later. The normal rules of inheritance apply.
This allows a central database of common rules to be maintained, with individual, site-specific overrides.

0 comments on commit d82f922

Please sign in to comment.