Skip to content

Commit

Permalink
Merge pull request #248 from carpentries/policy-tandc
Browse files Browse the repository at this point in the history
Updates policies; updates landing pages for each section
  • Loading branch information
maneesha authored Nov 19, 2024
2 parents bd64c84 + c27c6aa commit 372d858
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 21 deletions.
40 changes: 24 additions & 16 deletions source/_templates/globaltoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,36 @@
</li>

<li>
<a href="/handbooks/lesson_developers.html">
Lesson Developers
<a href="/handbooks/instructors.html">
Instructors
</a>
</li>

<li>
<a href="/handbooks/maintainers.html">
Maintainers
<a href="/handbooks/instructor_trainers.html">
Instructor Trainers
</a>
</li>

<li>
<a href="/handbooks/instructor_trainers.html">
Instructor Trainers
<a href="/handbooks/lesson_developers.html">
Lesson Developers
</a>
</li>
<li>
<a href="/handbooks/lesson_program_governors.html">
Lesson Program Governors
</a>
</li>
<li>
<a href="/handbooks/maintainers.html">
Maintainers
</a>
</li>

<li>
<a href="/handbooks/instructors.html">
Instructors
</a>
</li>



<li>
<a href="/handbooks/lesson_program_governors.html">
Lesson Program Governors
</a>
</li>
</ul>

<b>Resources</b>
Expand Down Expand Up @@ -104,6 +106,12 @@
<a href="/policies/dmca-policy.html">
DMCA Policy
</a>
<li>
<a href="/policies/terms-and-conditions.html">
Term and Conditions
</a>


</li>
</ul>

Expand Down
8 changes: 7 additions & 1 deletion source/handbooks/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Carpentries Handbooks

This is the handbooks index. This page will be updated to be a listing of all current handbooks.
* {{"[Community Session Hosts]({}/handbooks/community_session_host.html)".format(handbook_url)}}
* {{"[Curriculum Advisors]({}/handbooks/curriculum_advisors.html)".format(handbook_url)}}
* {{"[Instructors]({}/handbooks/instructors.html)".format(handbook_url)}}
* {{"[Instructor Trainers]({}/handbooks/instructor_trainers.html)".format(handbook_url)}}
* {{"[Lesson Developers]({}/handbooks/lesson_developers.html)".format(handbook_url)}}
* {{"[Lesson Program Governors]({}/handbooks/lesson_program_governors.html)".format(handbook_url)}}
* {{"[Maintainers]({}/handbooks/maintainers.html)".format(handbook_url)}}
6 changes: 5 additions & 1 deletion source/policies/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Carpentries Policies

This is the policies index. This page will be updated to be a listing of all general policies (CoC policy, privacy policy, etc.)
* {{"[Code of Conduct]({}/policies/coc)".format(handbook_url)}}
* [Privacy Policy](privacy.md)
* [Cookie Policy](cookie-policy.md)
* [DMCA Policy](dmca-policy.md)
* [Terms and Conditions](terms-and-conditions.md)
8 changes: 6 additions & 2 deletions source/policies/terms-and-conditions.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ global community that includes
[Maintainers](https://carpentries.org/maintainers),
[Mentors](https://carpentries.org/mentors), community champions, [member
organisations](https://carpentries.org/members), supporters, and workshop
organisers. We ask that your participation in the Carpentries community follows our {{'[Code of Conduct]({})'.format(code_of_conduct)}}.
organisers. We ask that your participation in the Carpentries community follows
our [Code of
Conduct](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html).
Additionally, we provide you with these Terms and Conditions to advise and
inform you of the legal obligations you assume when you engage with The
Carpentries community or otherwise access our Services.
Expand Down Expand Up @@ -95,7 +97,9 @@ By using the Services, you agree that:
1. You will only use the Services for lawful purposes, and not for deceptive or
fraudulent purposes; you will not send or store any unlawful material.
2. You will not use the Services to cause nuisance, annoyance or inconvenience.
3. You will follow The Carpentries’s {{'[Code of Conduct]({})'.format(code_of_conduct)}} at all times while using the Services.
3. You will follow The Carpentries’s [Code of
Conduct](https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html)
at all times while using the Services.
4. Except where allowed by the terms of the Creative Commons Attribution
License, you will not use the Services, or any content accessible through the
Services, for any commercial purpose.
Expand Down
6 changes: 5 additions & 1 deletion source/resources/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Carpentries Resources

This is the pages index. This page will be updated to be a listing of all general resources (style guide, comms guides, etc.)
* {{"[Communications Resources]({}/resources/communications)".format(handbook_url)}}
* {{"[Curriculum Resources]({}/resources/curriculum)".format(handbook_url)}}
* {{"[General Resources]({}/resources/general)".format(handbook_url)}}
* {{"[Workshop Resources]({}/resources/workshops)".format(handbook_url)}}
* [Tip sheets](tip-sheets.md)

0 comments on commit 372d858

Please sign in to comment.