Unverified Commit 3ce33e56 authored by Maxim Belkin's avatar Maxim Belkin
Browse files

Merge branch gh-pages of the styles repository 

Conflicts:
	aio.md
parents 936a2048 90f06fcf

.github/ISSUE_TEMPLATE.md

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ Thanks for contributing! If this contribution is for instructor training, please 


If this issue is about a specific episode within a lesson, please provide its link or filename.



Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact Kate Hertweck (k8hertweck@gmail.com).  

Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact The Carpentries Team at team@carpentries.org.  



---

.github/PULL_REQUEST_TEMPLATE.md

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ Please delete this line and the text below before submitting your contribution. 


Thanks for contributing! If this contribution is for instructor training, please send an email to checkout@carpentries.org with a link to this contribution so we can record your progress. You’ve completed your contribution step for instructor checkout just by submitting this contribution.  



Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact Kate Hertweck (k8hertweck@gmail.com).  

Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact The Carpentries Team at team@carpentries.org.  



---

bin/boilerplate/aio.md→_includes/aio-script.md

+5 −4
Original line number Diff line number Diff line 
---

---



{% include base_path.html %}

{% comment %}

As a maintainer, you don't need to edit this file.

If you notice that something doesn't work, please 

open an issue: https://github.com/carpentries/styles/issues/new

{% endcomment %}



<script>

  window.onload = function() {

_includes/lesson_footer.html

+4 −4
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ 
    <div class="col-md-6 help-links" align="right">

	{% if page.source %}

	{% if page.source == "Rmd" %}

	<a href="{{repo_url}}/edit/{{ default_branch }}/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>

	<a href="{{repo_url}}/edit/{{ default_branch }}/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}" data-checker-ignore>Edit on GitHub</a>

	{% endif %}

	{% else %}

	<a href="{{repo_url}}/edit/{{ default_branch }}/{{page.path}}">Edit on GitHub</a>

	<a href="{{repo_url}}/edit/{{ default_branch }}/{{page.path}}" data-checker-ignore>Edit on GitHub</a>

	{% endif %}

	/

	<a href="{{ repo_url }}/blob/{{ source_branch }}/CONTRIBUTING.md">Contributing</a>

	<a href="{{ repo_url }}/blob/{{ source_branch }}/CONTRIBUTING.md" data-checker-ignore>Contributing</a>

	/

	<a href="{{ repo_url }}/">Source</a>

	/

	<a href="{{ repo_url }}/blob/{{ source_branch }}/CITATION">Cite</a>

	<a href="{{ repo_url }}/blob/{{ source_branch }}/CITATION" data-checker-ignore>Cite</a>

	/

	<a href="mailto:{{ site.email }}">Contact</a>

    </div>

_includes/links.md

+3 −2
Original line number Diff line number Diff line 
{% include base_path.html %}

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/

[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode

[ci]: http://communityin.org/

[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#incident-reporting-guidelines

[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/incident-reporting.html

[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html

[concept-maps]: https://carpentries.github.io/instructor-training/05-memory/

[contrib-covenant]: https://contributor-covenant.org/
@@ -26,7 +27,7 @@ 
[lesson-license]: {{ relative_root_path }}{% link LICENSE.md %}

[lesson-mainpage]: {{ relative_root_path }}{% link index.md %}

[lesson-reference]: {{ relative_root_path }}{% link reference.md %}

[lesson-setup]: {{ relative_page_root }}{% link setup.md %}

[lesson-setup]: {{ relative_root_path }}{% link setup.md %}

[mit-license]: https://opensource.org/licenses/mit-license.html

[morea]: https://morea-framework.github.io/

[numfocus]: https://numfocus.org/