Merge pull request github#16925 from github/repo-sync

repo sync

Author: Octomerger

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/about-github-education-for-educators-and-researchers.md

@@ -17,8 +17,7 @@ shortTitle: Educators & researchers
 With {% data variables.product.prodname_education %}'s tools and services for educators of all levels, you can:
   - Use [{% data variables.product.prodname_classroom %}](https://classroom.github.com) to distribute code, give students feedback, and collect assignments on {% data variables.product.prodname_dotcom %}.
   - Join our [{% data variables.product.prodname_education_community %}](https://education.github.com/forum) to discuss current trends in technology education with your peers from around the world.
-  - Access and adapt our [open source lesson plans](https://education.github.community/t/open-source-lesson-plans/1591) for teaching Git and {% data variables.product.prodname_dotcom %}.
-  - [Request a {% data variables.product.prodname_dotcom %} swag bag](https://education.github.community/t/get-a-github-swag-bag-for-your-classroom/33) with educational materials and goodies for your students.
+  - [Request a {% data variables.product.prodname_dotcom %} swag bag](https://github.com/orgs/github-community/discussions/13) with educational materials and goodies for your students.
   {% data reusables.education.apply-for-team %}
 
 ## {% data variables.product.prodname_education %} for researchers

content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/apply-for-an-educator-or-researcher-discount.md

@@ -58,4 +58,4 @@ After your request for an educator or researcher discount has been approved, you
 - "[Why wasn't my application for an educator or researcher discount approved?](/articles/why-wasn-t-my-application-for-an-educator-or-researcher-discount-approved)"
 - [{% data variables.product.prodname_education %}](https://education.github.com)
 - [{% data variables.product.prodname_classroom %} Videos](https://classroom.github.com/videos)
-- [{% data variables.product.prodname_education_community %}](https://education.github.community/)
+- [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})

content/education/guides.md

@@ -43,6 +43,6 @@ Incorporate {% data variables.product.prodname_dotcom %} into your education, an
 
 Participate in the community, get training from {% data variables.product.company_short %}, and learn or teach new skills.
 
-- [{% data variables.product.prodname_education_community %}](https://education.github.community)
+- [{% data variables.product.prodname_education_community %}]({% data variables.product.prodname_education_forum_link %})
 - [About Campus Experts](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-experts)
 - [About Campus Advisors](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors)

data/variables/product.yml

@@ -48,7 +48,8 @@ prodname_unified_search: 'unified search'
 # GitHub Education
 prodname_education: 'GitHub Education'
 prodname_education_community: 'Education Community'
-prodname_education_community_with_url: 'the [GitHub Education Community](https://education.github.community)'
+prodname_education_community_with_url: 'the [GitHub Education Community](https://github.com/orgs/github-community/discussions/categories/github-education)'
+prodname_education_forum_link: 'https://github.com/orgs/github-community/discussions/categories/github-education'
 prodname_classroom: 'GitHub Classroom'
 prodname_classroom_with_url: '[GitHub Classroom](https://classroom.github.com/login)'
 prodname_campus_program: 'GitHub Campus Program'