[ci skip] Update site on 2017-02-24 09:17:40

docs/history.html

@@ -84,6 +84,10 @@ <h1>History </h1>
 <li>SFTP support by <a href="https://github.com/zfrenchee" class="user-mention">@zfrenchee</a></li>
 <li>16.10:</li>
 <li><a href="https://github.com/bgruening/docker-galaxy-stable/pull/240">HTTPS support</a> by <a href="https://github.com/zfrenchee" class="user-mention">@zfrenchee</a> and <a href="https://github.com/mvdbeek" class="user-mention">@mvdbeek</a></li>
+<li>17.01:</li>
+<li>enable Conda dependency resultion by deault</li>
+<li><a href="https://docs.galaxyproject.org/en/master/releases/17.01_announce.html">new Galaxy version</a></li>
+<li>more compose work (slurm, postgresql)</li>
 </ul>
 
 

docs/usage.html

@@ -167,7 +167,7 @@ <h2>Deactivating services <a name="user-content-Deactivating-services"> </a></h2
 <h2>Restarting Galaxy <a name="user-content-Restarting-Galaxy"> </a></h2>
 <p>If you want to restart Galaxy without restarting the entire Galaxy container you can use <code>docker exec</code> (docker &gt; 1.3).</p>
 <div class="highlight highlight-source-shell"><pre>docker <span class="pl-c1">exec</span> <span class="pl-k">&lt;</span>container name<span class="pl-k">&gt;</span> supervisorctl restart galaxy:</pre></div>
-<p>In addition you start/stop every supersisord process using a webinterface on port <code>9002</code>. Start your container with:</p>
+<p>In addition you start/stop every supervisord process using a webinterface on port <code>9002</code>. Start your container with:</p>
 <div class="highlight highlight-source-shell"><pre>docker run -p 9002:9002 bgruening/galaxy-stable</pre></div>
 <h2>Advanced Logging <a name="user-content-Advanced-Logging"> </a></h2>
 <p>You can set the environment variable $GALAXY_LOGGING to FULL to access all logs from supervisor. For example start your container with:</p>
@@ -202,7 +202,7 @@ <h2>Using an external Slurm cluster <a name="user-content-Using-an-external-Slur
 <li><code>/export</code> → <code>/data/galaxy</code></li>
 <li><code>/galaxy-central</code> → <code>/data/galaxy/galaxy-central</code></li>
 </ol>
-<p>A brief note is in order regarding the version of Slurm installed. This Docker image uses Ubuntu 14.04 as its base image. The version of Slurm in the Unbuntu 14.04 repository is 2.6.5 and that is what is installed in this image. If your cluster is using an incompatible version of Slurm then you will likely need to modify this Docker image.</p>
+<p>A brief note is in order regarding the version of Slurm installed. This Docker image uses Ubuntu 14.04 as its base image. The version of Slurm in the Ubuntu 14.04 repository is 2.6.5 and that is what is installed in this image. If your cluster is using an incompatible version of Slurm then you will likely need to modify this Docker image.</p>
 <p>The following is an example for how to specify a destination in <code>job_conf.xml</code> that uses a custom partition ("work", rather than "debug") and 4 cores rather than 1:</p>
 <pre><code>&lt;destination id="slurm4threads" runner="slurm"&gt;
  &lt;param id="embed_metadata_in_job"&gt;False&lt;/param&gt;
@@ -230,7 +230,7 @@ <h2>Tips for Running Jobs Outside the Container <a name="user-content-Tips-for-R
 <p>In its default state Galaxy assumes both the Galaxy source code and<br>
 various temporary files are available on shared file systems across the<br>
 cluster. When using Condor or SLURM (as described above) to run jobs outside<br>
-of the Docker container one can take steps to mitegate these assumptions.</p>
+of the Docker container one can take steps to mitigate these assumptions.</p>
 <p>The <code>embed_metadata_in_job</code> option on job destinations in <code>job_conf.xml</code><br>
 forces Galaxy collect metadata inside the container instead of on the<br>
 cluster:</p>
@@ -240,7 +240,7 @@ <h2>Tips for Running Jobs Outside the Container <a name="user-content-Tips-for-R
 these calculations on the remote cluster - but this should not be a problem<br>
 for most Galaxy instances.</p>
 <p>Additionally, many framework tools depend on Galaxy's Python virtual<br>
-environment being avaiable. This should be created outside of the container<br>
+environment being available. This should be created outside of the container<br>
 on a shared filesystem available to your cluster using the instructions<br>
 <a href="https://github.com/galaxyproject/galaxy/blob/dev/doc/source/admin/framework_dependencies.rst#managing-dependencies-manually">here</a>. Job destinations<br>
 can then source these virtual environments using the instructions outlined<br>