From 35bc1b387a3371e46b42c16c7b5664c33474d4fd Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 9 Nov 2018 16:26:33 -0500 Subject: [PATCH] Typos in admin docs. --- doc/source/admin/framework_dependencies.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/admin/framework_dependencies.rst b/doc/source/admin/framework_dependencies.rst index e18f077a175..2eb630d0ba9 100644 --- a/doc/source/admin/framework_dependencies.rst +++ b/doc/source/admin/framework_dependencies.rst @@ -187,8 +187,8 @@ Galaxy can create a virtualenv using the adapted virtualenv package. Once a vali 3. Start galaxy using ``sh run.sh`` or execute ``sh scripts/common_startup.sh``. - A Conda environemnt named ``_galaxy_`` will be created using python 2 and the appropriate virtualenv package will be installed into this environment. - Using this environemnt a ``.venv`` is initialized. This is a one-time setup, and all other activation and dependency + A Conda environment named ``_galaxy_`` will be created using python 2 and the appropriate virtualenv package will be installed into this environment. + Using this environment a ``.venv`` is initialized. This is a one-time setup, and all other activation and dependency management happens exactly as if a system python was used for creating ``.venv``. .. _Conda: https://conda.io/ @@ -218,7 +218,7 @@ Galaxy release) or "unpinned" (the latest versions of all dependencies will be i incompatibilities with new versions). By default, the release branches of Galaxy use pinned versions for three reasons: 1. Using pinned versions insures that the prebuilt wheels on `wheels.galaxyproject.org`_ will be installed, and no - compilation will be necesseary. + compilation will be necessary. 2. Galaxy releases are tested with the pinned versions and this allows us to give as much assurance as possible that the pinned versions will work with the given Galaxy release (especially as time progresses and newer dependency versions