merge upstream changes

Author: tobyhodges

_extras/install_instructions.md

@@ -3,7 +3,6 @@ layout: page
 title: Installation Instructions
 permalink: /install_instructions/index.html
 tools:
-  - editor
   - git
   - openrefine
   - python

_includes/install_instructions/editor.html

@@ -15,7 +15,6 @@ <h4>Note for Windows Users</h4>
 </div>
 
 {% include install_instructions/git.html %}
-{% include install_instructions/editor.html %}
 
 {% if site.flavor == "r" %}
 {% include install_instructions/r.html %}

_includes/swc/setup.html

@@ -250,9 +250,9 @@ special instructions.
   We do not require participants to provide documentation of disabilities or disclose any unnecessary personal information. 
   However, we do want to help create an inclusive, accessible experience for all participants. 
   We encourage you to share any information that would be helpful to make your Carpentries experience accessible.
-  To request an accommodation for this workshop, please fill out the 
-  <a href="https://carpentries.typeform.com/to/B2OSYaD0">accommodation request form</a>.
-  If you have questions or need assistance with the accommodation form please <a href="mailto:team@carpentries.org">email us</a>.
+  To request accessibility support for this workshop, please fill out the 
+  <a href="https://carpentries.typeform.com/to/B2OSYaD0">accessibility support request form</a>.
+  If you have questions or need assistance with the accessibility support form please <a href="mailto:team@carpentries.org">email us</a>.
 </p>
 <p>
   <a href="https://glosario.carpentries.org/">Glosario</a> is a multilingual glossary