Merge pull request #19 from martenson/nsoranzo-patch-1-1

Small fixes to conda_faq.rst changes

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.