Merge pull request creativecommons#644 from creativecommons/work-programs-reorg-2

TimidRobot · web-flow · commit 36867aeb8e92 · 2022-03-09T12:45:14.000-08:00
Work Programs reorganization Part 2
diff --git a/content/community/community-team/engagement-channels/contents.lr b/content/community/community-team/engagement-channels/contents.lr
@@ -67,7 +67,7 @@ hopes of finding like-minded developers. You should help them get started, clear
 simple doubts, introduce them to FOSS and make them feel welcome in our
 community. After all, the more the merrier!
 
-**Channel:** `#general`, `#cc-dev-internships`, `#cc-developers`
+**Channel:** `#general`, `#cc-dev-workprograms`, `#cc-developers`
 
 ### Community team channel
 
diff --git a/content/community/community-team/project-roles/contents.lr b/content/community/community-team/project-roles/contents.lr
@@ -15,50 +15,68 @@ have to be granted separately.
 If you'd like to apply for one of these roles, please see the main [Community
 Team][communityteam] page.
 
+
 ## Project Contributor
-### Who should apply:
+
+**Who should apply:**
+
 If you’ve contributed to a CC project, you should apply for this role.
 
-### What does this role give you?
+**What does this role give you?**
+
 - You’ll receive previews of upcoming changes to the Community Team program.
-- You’ll be listed as [a member of the Community Team on CC Open Source](/community/community-team/members/).
+- You’ll be listed as [a member of the Community Team on CC Open
+  Source](/community/community-team/members/).
+
+**How can you engage with the community?**
 
-### How can you engage with the community?
 You can use the following channels to engage with the community:
 - [Read access](/community/community-team/engagement-channels/#read-access) on
   the relevant repos on GitHub
 - Invitation to our Slack channels
-  * [Newbie
+  - [Newbie
     channels](/community/community-team/engagement-channels/#newbie-channels)
-  * [UX design
+  - [UX design
     channels](/community/community-team/engagement-channels/#ux-design-channel)
-  * [Community Team
+  - [Community Team
     channel](/community/community-team/engagement-channels/#community-team-channel)
 - Invitation to our
   [meetings](/community/community-team/engagement-channels/#meetings)
 - Membership in the [Community Team mailing
   list](/community/community-team/engagement-channels/#community-team-group)
 
-### Guidelines for Project Contributors
+**Guidelines for Project Contributors**
+
 If you’ve been accepted as a Project Contributor, you are encouraged to:
 - keep contributing to the project as and when you can!
 - participate in discussions in Slack or via email.
-- contribute in other ways if you'd like, like [helping out newbie developers or voting on our tweets](/community/community-team/community-building-roles/).
+- contribute in other ways if you'd like, like [helping out newbie developers
+  or voting on our
+  tweets](/community/community-team/community-building-roles/).
+
 
 ## Project Collaborator
-### Who should apply:
-If you’ve made a few significant contributions to the project (added new features, for example) and know the project’s overall codebase pretty well, you should apply.
 
-### What does this role give you?
+**Who should apply:**
+
+If you’ve made a few significant contributions to the project (added new
+features, for example) and know the project’s overall codebase pretty well, you
+should apply.
+
+**What does this role give you?**
+
 - Everything a Project Contributor gets.
 - Creative Commons staff will write you a letter of recommendation on request.
 
-### How can you engage with the community?
-In addition to the channels afforded to a Project Contributor, you can use the following channels to engage with the community:
+**How can you engage with the community?**
+
+In addition to the channels afforded to a Project Contributor, you can use the
+following channels to engage with the community:
 - [Triage access](/community/community-team/engagement-channels/#triage-access)
   on the relevant repos on GitHub
 
-### Guidelines for Project Collaborators
+**Guidelines for Project Collaborators**
+
 If you’ve been accepted as a Project Collaborator, you are encouraged to:
 - do everything a Project Contributor does.
 - review and triage new issues.
@@ -75,54 +93,65 @@ If you’ve been accepted as a Project Collaborator, you are encouraged to:
 **Note:** The role of Project Member was deprecated in July 2020 and all
 members were redesignated as collaborators.
 
+
 ## Project Core Committer
 
-### Who should apply:
+**Who should apply:**
+
 If you’ve made many significant contributions to the project, know the codebase
 really well, and are interested in active maintenance of the project, you
 should apply.
 
-### What does this role give you?
+**What does this role give you?**
 
 - Everything a Project Collaborator gets.
-- You’ll be eligible to mentor GSoC, GSoD and Outreachy interns (and similar) for Creative Commons.
-- You'll receive CC swag.
+- You’ll be eligible to lead projects for the GSoC, GSoD, and Outreachy work
+  programs (and similar) for Creative Commons.
+
+**How can you engage with the community?**
 
-### How can you engage with the community?
 In addition to the channels afforded to a Project Collaborator, you can use the
 following channels to engage with the community:
 - [Write access](/community/community-team/engagement-channels/#write-access)
   on the relevant repos on GitHub
 
-### Guidelines for Project Core Committers
+**Guidelines for Project Core Committers**
+
 If you’ve been accepted as a Project Core Committer, you are encouraged to:
 - do everything a Project Collaborator does.
 - merge PRs that you are confident work well and fit the project guidelines.
   - If you have any doubts, please check with project maintainers first!
 - proactively ask about mentorship opportunities if that interests you.
 
+
 ## Project Maintainer
 
-### Who should apply:
+**Who should apply:**
+
 If you’re a Core Committer already and you’re interested in taking on
 maintainer responsibilities, you should apply. Please note that this role comes
 with a lot of responsibilities!
 
-### What does this role give you?
+**What does this role give you?**
+
 Everything a Project Core Committer gets.
 
-### How can you engage with the community?
+**How can you engage with the community?**
+
 In addition to the channels afforded to a Project Core Committer, you can use
 the following channels to engage with the community:
 - [Maintain
   access](/community/community-team/engagement-channels/#maintain-access) on
   the relevant repos on GitHub
 
-### Guidelines for Project Maintainers
+**Guidelines for Project Maintainers**
+
 Being a Project Maintainer comes with a larger set of responsibilities and
 guidelines, documented below:
 
+
 ### Responsibilities
+
 As a Project Maintainer, your responsibilities are as follows:
 
 - **Review pull requests (PRs):** You are expected to review incoming pull
@@ -148,7 +177,9 @@ Team directly and let them know the status of their application.
   provide them with the link to the Community Team page on the CC Open Source
   site, and encourage them to apply.
 
+
 ### Reviewing Community Team Applications
+
 Applications for Community Team roles will be sent to you individually by the
 Open Source Community Coordinator (OSCC). The OSCC has ensured that the bare
 requirements for the position are met. If bare requirements are not met, you
@@ -176,7 +207,9 @@ No matter the decision, you should do the following things:
   days or less from time of application to time of decision, but this is
   somewhat flexible.
 
+
 ### Additional Notes
+
 All Community Team work is done on a volunteer basis. Team members may pick up
 tasks and help out here and there if they would like, but they should not be
 expected to use all of their privileges all the time.
diff --git a/content/community/contents.lr b/content/community/contents.lr
@@ -47,26 +47,25 @@ The channels most relevant to CC's developer community are:
 
 | Channel | Discussion related to |
 | ------- | --------------------- |
-| `#cc-dev-browser-extension` | [ccsearch-browser-extension][ccsearch-browser-extension] project |
-| `#cc-dev-internships` | **GSoC, GSoD, Outreachy, and other internships** |
+| `#cc-dev-legal-tools` | [cc-legal-tools-app][cc-legal-tools-app] project (CC Legal Tools formatting and translation) |
 | `#cc-dev-legaldb` | [legaldb][legaldb] project |
 | `#cc-dev-license-chooser` | [cc-chooser][cc-chooser] project (new CC license chooser) |
-| `#cc-dev-licenses` | [cc-licenses][cc-licenses] project (CC Licenses formatting and translation) |
 | `#cc-dev-linkchecker` | [cc-link-checker][cc-link-checker] project |
 | `#cc-dev-platform-toolkit` | [mp][mp] project (CC Platform Toolkit) |
 | `#cc-dev-vocabulary` | [cc-vocabulary][cc-vocabulary] project |
 | `#cc-dev-wordpress` | [wp-plugin-creativecommons][wp-plugin-creativecommons] project (creativecommons WordPress plugin) |
+| `#cc-dev-workprograms` | **GSoC, GSoD, Outreachy, and other [work programs][workprograms] or internships** |
 | `#cc-developers` | **general technical issues, new tech blog posts, etc.** |
 | `#cc-usability` | general usability issues, seeking feedback on new releases of CC products from the community, etc. |
 
-[ccsearch-browser-extension]: https://github.com/creativecommons/ccsearch-browser-extension
 [legaldb]: https://github.com/creativecommons/legaldb
 [cc-chooser]: https://github.com/creativecommons/cc-chooser
-[cc-licenses]: https://github.com/creativecommons/cc-licenses
+[cc-legal-tools-app]: https://github.com/creativecommons/cc-legal-tools-app
 [cc-link-checker]: https://github.com/creativecommons/cc-link-checker
 [mp]: https://github.com/creativecommons/mp
 [cc-vocabulary]: https://github.com/creativecommons/cc-vocabulary
 [wp-plugin-creativecommons]: https://github.com/creativecommons/wp-plugin-creativecommons
+[workprograms]: /programs/
 
 
 ### Slack Tips
@@ -83,15 +82,3 @@ The channels most relevant to CC's developer community are:
   weekdays.
 
 [wiki-slack]: https://wiki.creativecommons.org/wiki/Slack
-
-
-## IRC
-
-We don't use IRC much, but if you'd like, you can join the
-`#creativecommons-dev` channel on [Freenode](https://freenode.net/). This
-channel is mirrored to the `#cc-developers` channel on Slack so that messages
-posted on Slack show up on IRC and vice-versa.
-
-If you're not familiar with IRC, [here's a good guide to getting
-started](https://www.wikihow.com/Get-Started-with-IRC-%28Internet-Relay-Chat%29).
-You can also join using the [Freenode webchat](https://webchat.freenode.net/).
diff --git a/content/gsoc-2019/application-instructions/contents.lr b/content/gsoc-2019/application-instructions/contents.lr
@@ -1,5 +1,5 @@
 _model: redirect
 ---
-target: /programs/
+target: /programs/applicant-guide/
 ---
 _discoverable: no
diff --git a/content/gsoc-2019/project-ideas/contents.lr b/content/gsoc-2019/project-ideas/contents.lr
@@ -1,5 +1,5 @@
 _model: redirect
 ---
-target: /programs/
+target: /programs/project-ideas/
 ---
 _discoverable: no
diff --git a/content/gsoc-2019/student-expectations/contents.lr b/content/gsoc-2019/student-expectations/contents.lr
@@ -1,5 +1,5 @@
 _model: redirect
 ---
-target: /programs/
+target: /programs/contrib-guide/
 ---
 _discoverable: no
diff --git a/content/programs/applicant-guide/contents.lr b/content/programs/applicant-guide/contents.lr
@@ -48,7 +48,7 @@ anything like that, please don't hesitate to ask!
 
 ### Join the Community
 
-[Join the `#cc-dev-internships` channel on the CC Slack or the CC Developers
+[Join the `#cc-dev-workprograms` channel on the CC Slack or the CC Developers
 mailing list](/community/) as early as possible to introduce yourself and get
 feedback on your ideas. All our mentors will be on Slack and respond to emails
 on the mailing list and it is better to post there rather than contacting them
@@ -155,11 +155,9 @@ you submit the final application on the program's official site.
 
 We suggest reading some articles on writing good Google Summer of Code
 proposals (even if you're applying for Outreachy). Here are some examples:
-- [How to write a kick-ass proposal for Google Summer of Code][kickass]
 - [5 Tips to get your Google Summer of Code proposal accepted][fivetips]
 - [Writing a solid Google Summer of Code Proposal][writingsolid]
 
-[kickass]: http://teom.org/blog/kde/how-to-write-a-kick-ass-proposal-for-google-summer-of-code/
 [fivetips]: https://people.csail.mit.edu/baghdadi/TXT_blog/5_advices_to_get_your_proposal_accepted.lyx.html
 [writingsolid]: https://medium.com/@evenstensberg/writing-a-solid-google-summer-of-code-proposal-a200fc6e785b
 
@@ -200,7 +198,7 @@ couple of days first.
 to be addressed by our first names or usernames.**
 
 
-## Intern Selection Criteria
+## Contributor Selection Criteria
 
 Here are a few things we consider when selecting work program contributors:
 - **Quality of the proposal**: This is the most important thing. A good
diff --git a/content/programs/contrib-guide/contents.lr b/content/programs/contrib-guide/contents.lr
@@ -8,7 +8,7 @@ description:
 CC participates in open source work programs such as GSoC and Outreachy. Both
 CC staff and community members are welcome to lead projects. Details about
 specific programs and rounds are listed in the [Overview page](/programs); this
-page serves as a general guide for accepted interns.
+page serves as a general guide for accepted contributors.
 ---
 body:
 
@@ -31,9 +31,9 @@ officially starts:
 - Introduce yourself to the members of CC's engineering team.
 
 
-## Internship Period
+## Work Program Period
 
-Once the internship starts, here's what we expect of you:
+Once the work program starts, here's what we expect of you:
 
 - For large projects: Work 30-40 hours per week (or agree on a different plan
   with your mentor ahead of time).
diff --git a/content/programs/lead-guide/contents.lr b/content/programs/lead-guide/contents.lr
@@ -52,7 +52,7 @@ _**[Project Title]**_
 - **Technical Skills**: _What technical skills will this project need?_
 - **Difficulty**: _How technically difficult is this project? Options: High,
   Medium, Low_
-- **Size**: _Large (~305 hours) or Medium (~175 hours)._
+- **Size**: _Large (~350 hours) or Medium (~175 hours)._
 
 Please note that project ideas should be related to an existing CC open source
 project or website and should be clearly scoped out. They should be doable in
diff --git a/content/programs/project-ideas-collection/add-cc-chooser-wordpress/contents.lr b/content/programs/project-ideas-collection/add-cc-chooser-wordpress/contents.lr
@@ -16,14 +16,14 @@ Revamping the admin panel of the plugin, adding the CC Chooser on it as well as
 a Gutenberg block.
 ---
 contributor_tasks:
-The intern will be expected to:
+The contributor will be expected to:
 - Research about how the new CC Chooser manage the user workflow
 - Recreate that process in the WordPress admin panel
 - Generate a new Gutenberg block
 ---
 application_tips:
-The intern should be able to plan this process and find the best way to adapt
-the workflow from the CC Chooser (JavaScript/Vue) to WordPress (PHP).
+The contributor should be able to plan this process and find the best way to
+adapt the workflow from the CC Chooser (JavaScript/Vue) to WordPress (PHP).
 ---
 resources:
 - **[Applicant Guide][appguide]**
diff --git a/content/programs/project-ideas-collection/chooser-stewardship/contents.lr b/content/programs/project-ideas-collection/chooser-stewardship/contents.lr
@@ -5,23 +5,30 @@ _hidden: yes
 title: Chooser project stewardship
 ---
 problem:
-Many online platforms use Creative Commons licenses for user-generated content. 
+Many online platforms use Creative Commons licenses for user-generated content.
 
-It is helpful to allow creators to choose their own Creative Commons license. The Creative Commons Chooser guides content creators when choosing their Creative Commons license terms.
+It is helpful to allow creators to choose their own Creative Commons license.
+The Creative Commons Chooser guides content creators when choosing their
+Creative Commons license terms.
 
-Since third-party projects use Chooser, we want to make it convenient and straightforward to integrate the component into diverse software systems. We also want to ensure a stable and consistent Chooser user experience.
+Since third-party projects use Chooser, we want to make it convenient and
+straightforward to integrate the component into diverse software systems. We
+also want to ensure a stable and consistent Chooser user experience.
 
 ---
 expected_outcome:
-Since the Chooser project is under continual development and maintenance, some ideal outcomes would be to
+Since the Chooser project is under continual development and maintenance, some
+ideal outcomes would be to:
 - simplify our codebase and development process
 - ensure Chooser aligns with web standards
 - promote project health and maintainability
 - support community development
 
 ---
 contributor_tasks:
-Maintaining a healthy open-source project involves contributions from people with many skill sets. Depending on the interests and strengths of the intern, the internship could involve
+Maintaining a healthy open-source project involves contributions from people
+with many skill sets. Depending on the interests and strengths of the
+contributor, the project could involve:
 - user experience design and testing
 - software development (using web-standard technologies)
 - project stewardship
@@ -30,11 +37,15 @@ Maintaining a healthy open-source project involves contributions from people wit
 
 ---
 application_tips:
-The applicant should describe how the Chooser project supports the Creative Commons mission to maximize digital creativity, sharing, and innovation. They should also articulate how their particular strengths and interests would further the Chooser project.
+The applicant should describe how the Chooser project supports the Creative
+Commons mission to maximize digital creativity, sharing, and innovation. They
+should also articulate how their particular strengths and interests would
+further the Chooser project.
 ---
 resources:
 - **[Applicant Guide][appguide]**
-- [creative commons/chooser][chooser]:  The new and improved CC license selection tool.
+- [creative commons/chooser][chooser]: The new and improved CC license
+  selection tool.
 
 [appguide]: /programs/applicant-guide/
 [chooser]: https://github.com/creativecommons/chooser/
diff --git a/content/programs/project-ideas-collection/legal-tools-machine-layer/contents.lr b/content/programs/project-ideas-collection/legal-tools-machine-layer/contents.lr
diff --git a/themes/vocabulary_theme/templates/project-ideas.html b/themes/vocabulary_theme/templates/project-ideas.html
