Include setup instructions for R instead of docker

_includes/swc/setup.html

@@ -6,9 +6,6 @@
 {% include install_instructions/shell.html %}
 {% include install_instructions/git.html %}
 {% include install_instructions/editor.html %}
-
-{% comment %} removed r / python intructions for this workshop
-
 {% if site.flavor == "r" %}
 {% include install_instructions/r.html %}
 {% elsif site.flavor == "python" %}
@@ -20,13 +17,12 @@
 {% include warning-flavor.html %}
 {% endif %}
 
-{% endcomment %}
-
 {% comment %}
 The following setup instructions are commented out because Carpentries workshops
 cover the these topics less frequently. Please uncomment the lines that
 correspond to the topics covered in your workshop.
 
 {% include install_instructions/sql.html %}
 {% include install_instructions/openrefine.html %}
+{% include install_instructions/docker.html %}
 {% endcomment %}

index.md

@@ -178,7 +178,7 @@ Modify the block below if there are any special requirements.
     参加者は、管理者権限を持つMac/Linux/Windows OSを搭載した
     コンピュータ（タブレットやChromebookなどではなく）にアクセスできる必要があります。
   {% endif %}
-  いくつかの特定のソフトウェアパッケージ（ <a href="#setup">下部の「セットアップ」以降の Bash, Git, Text Editor, Docker</a>）をインストールしてください。
+  いくつかの特定のソフトウェアパッケージ（ <a href="#setup">下部の「セットアップ」以降の Bash, Git, Text Editor, R</a>）をインストールしてください。
 </p>
 
 {% comment %}
@@ -419,7 +419,6 @@ during the workshop.
 
 {% if site.carpentry == "swc" %}
 {% include swc/setup.html %}
-{% include install_instructions/docker.html %}
 {% elsif site.carpentry == "dc" %}
 {% include dc/setup.html %}
 {% elsif site.carpentry == "lc" %}