From 2899372791fdbba4f8db7c414a5447cf049987f3 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Mon, 3 Oct 2016 19:46:27 +0100 Subject: [PATCH] Update conda_faq.rst --- doc/source/admin/conda_faq.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/source/admin/conda_faq.rst b/doc/source/admin/conda_faq.rst index db74a5260b6b..2b5fd5e13ecf 100644 --- a/doc/source/admin/conda_faq.rst +++ b/doc/source/admin/conda_faq.rst @@ -66,15 +66,15 @@ graphical user interface that allows administrators install Conda packages directly from Galaxy when tools are installed from the Tool Shed is available since the 16.07 version of Galaxy. -During the tool installation admin has control over what system will be used to -install the tool's requirements. The default settings will trigger installation -of both TS package and Conda package (if Conda is present) thus depending on the -dependency resolvers configuration with regards to what will be actually used during -the tool's runtime. See `resolver docs`_ for detailed documentation. - -We recommend to use Conda exclusively on tool per tool basis by unchecking the checkbox -for TS dependencies during the tool installation or in cases of tools where there -are no TS dependencies existing anymore. +During a tool installation, the Galaxy admin has control over which systems will be used to +install the tool requirements. The default settings will trigger installation +of both TS and Conda packages (if Conda is present), thus depending on the +dependency resolvers configuration with regards to what will actually be used during +the tool execution. See `resolver docs`_ for detailed documentation. + +We recommend to use Conda on a tool-per-tool basis, by unchecking the checkbox +for TS dependencies during the tool installation, and for tools where there +are no available TS dependencies. The most important configuration settings related to Conda are listed in Table 1.