diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index 45386d72d861..c906f982b362 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -5124,7 +5124,7 @@ 'deferred' are "materialized" (or undeferred) by the workflow scheduler. This might be a lengthy process. Setting this to 'True' will place the invocation back in the queue after materialization - before scheduling the workflow so it is less likely to starve + before scheduling the workflow so it is less likely to starve other workflow scheduling. Ideally, Galaxy would allow more fine grain control of handlers but until then, this provides a way to tip the balance between "doing more work" and "being more fair". @@ -5658,6 +5658,3 @@ to the user. Currently only affects s3fs file sources. :Default: ``60`` :Type: int - - - diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample index d6718cf176e7..d2e71539c7df 100644 --- a/lib/galaxy/config/sample/galaxy.yml.sample +++ b/lib/galaxy/config/sample/galaxy.yml.sample @@ -191,7 +191,7 @@ gravity: # Routes file to monitor. # Should be set to the same path as ``interactivetools_map`` in the ``galaxy:`` section. This is ignored if - # ``interactivetools_map is set. + # ``interactivetools_map is set``. # sessions: database/interactivetools_map.sqlite # Include verbose messages in gx-it-proxy @@ -2752,7 +2752,7 @@ galaxy: # 'deferred' are "materialized" (or undeferred) by the workflow # scheduler. This might be a lengthy process. Setting this to 'True' # will place the invocation back in the queue after materialization - # before scheduling the workflow so it is less likely to starve other + # before scheduling the workflow so it is less likely to starve other # workflow scheduling. Ideally, Galaxy would allow more fine grain # control of handlers but until then, this provides a way to tip the # balance between "doing more work" and "being more fair". The default @@ -3006,4 +3006,3 @@ galaxy: # but outdated contents might be displayed to the user. Currently only # affects s3fs file sources. #file_source_listings_expiry_time: 60 - diff --git a/lib/galaxy/config/sample/tool_shed.yml.sample b/lib/galaxy/config/sample/tool_shed.yml.sample index bf16f6bfabab..bc995ed597d0 100644 --- a/lib/galaxy/config/sample/tool_shed.yml.sample +++ b/lib/galaxy/config/sample/tool_shed.yml.sample @@ -54,6 +54,9 @@ tool_shed: # options. #whoosh_index_dir: database/toolshed_whoosh_indexes + # Cache directory for Pydantic model objects. + #model_cache_dir: database/model_cache + # For searching repositories at /api/repositories: #repo_name_boost: 0.9 @@ -426,4 +429,3 @@ tool_shed: # The value of this option will be resolved with respect to # . #datatypes_config_file: datatypes_conf.xml -