Site policy content re-org (github#26112)

* Site policy reorg
JacobKlipper · Mar 15, 2022 · 1c203bf · 1c203bf
1 parent db62de0
commit 1c203bf
Show file tree

Hide file tree

Showing 63 changed files with 246 additions and 74 deletions.
diff --git a/content/github/index.md b/content/github/index.md
@@ -12,7 +12,6 @@ versions:
   ghae: '*'
 children:
   - /copilot
-  - /site-policy
   - /site-policy-deprecated
 ---
 
diff --git a/content/github/site-policy/index.md b/content/github/site-policy/index.md
diff --git a/content/index.md b/content/index.md
@@ -21,6 +21,7 @@ children:
   - github
   - admin
   - billing
+  - site-policy
   - organizations
   - code-security
   - pull-requests
@@ -49,6 +50,7 @@ childGroups:
       - account-and-profile
       - authentication
       - billing
+      - site-policy
   - name: Collaborative coding
     octicon: CommentDiscussionIcon
     children:

diff --git a/...-policy/github-acceptable-use-policies.md → ...olicies/github-acceptable-use-policies.md b/...-policy/github-acceptable-use-policies.md → ...olicies/github-acceptable-use-policies.md
@@ -2,6 +2,7 @@
 title: GitHub Acceptable Use Policies
 redirect_from:
   - /articles/github-acceptable-use-policies
+  - /github/site-policy/github-acceptable-use-policies
 versions:
   fpt: '*'
 topics:
@@ -68,6 +69,7 @@ We do not allow content or activity on GitHub that:
 - directly supports [unlawful active attack or malware campaigns](/github/site-policy/github-active-malware-or-exploits) that are causing technical harms — such as using our platform to deliver malicious executables or as attack infrastructure, for example by organizing denial of service attacks or managing command and control servers — with no implicit or explicit dual-use purpose prior to the abuse occurring; or
 - uses our servers to disrupt or to attempt to disrupt, or to gain or to attempt to gain unauthorized access to, any service, device, data, account or network. Please note, activities permitted under bug bounty programs, such as the [GitHub Bug Bounty program](https://bounty.github.com), are not considered “unauthorized.”
 
+
 ## 6. Services Usage Limits
 You will not reproduce, duplicate, copy, sell, resell or exploit any portion of the Service, use of the Service, or access to the Service without our express written permission.
 

diff --git a/...licy/github-active-malware-or-exploits.md → ...cies/github-active-malware-or-exploits.md b/...licy/github-active-malware-or-exploits.md → ...cies/github-active-malware-or-exploits.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Active Malware or Exploits
+shortTitle: Active Malware or Exploits
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-active-malware-or-exploits
+  - /github/site-policy/github-community-guidelines#active-malware-or-exploits
 ---
 
 Being part of a community includes not taking advantage of other members of the community. We do not allow anyone to use our platform in direct support of unlawful attacks that cause technical harms, such as using GitHub as a means to deliver malicious executables or as attack infrastructure, for example by organizing denial of service attacks or managing command and control servers. Technical harms means overconsumption of resources, physical damage, downtime, denial of service, or data loss, with no implicit or explicit dual-use purpose prior to the abuse occurring.

diff --git a/...policy/github-appeal-and-reinstatement.md → ...licies/github-appeal-and-reinstatement.md b/...policy/github-appeal-and-reinstatement.md → ...licies/github-appeal-and-reinstatement.md
diff --git a/...-policy/github-bullying-and-harassment.md → ...olicies/github-bullying-and-harassment.md b/...-policy/github-bullying-and-harassment.md → ...olicies/github-bullying-and-harassment.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Bullying and Harassment
+shortTitle: Bullying and Harassment
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-bullying-and-harassment
+  - /github/site-policy/github-community-guidelines#bullying-and-harassment
 ---
 
 We do not tolerate harassment, bullying, or abuse of any kind, whether directly or by encouraging others to take part in the prohibited conduct. This includes:

diff --git a/...srupting-the-experience-of-other-users.md → ...srupting-the-experience-of-other-users.md b/...srupting-the-experience-of-other-users.md → ...srupting-the-experience-of-other-users.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Disrupting the Experience of Other Users
+shortTitle: Disrupting the Experience of Other Users
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-disrupting-the-experience-of-other-users
+  - /github/site-policy/github-community-guidelines#disrupting-the-experience-of-other-users
 ---
 
 Being part of a community includes recognizing how your behavior affects others and engaging in meaningful and productive interactions with people and the platform they rely on. 

diff --git a/...github-doxxing-and-invasion-of-privacy.md → ...github-doxxing-and-invasion-of-privacy.md b/...github-doxxing-and-invasion-of-privacy.md → ...github-doxxing-and-invasion-of-privacy.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Doxxing and Invasion of Privacy
+shortTitle: Doxxing and Invasion of Privacy
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-doxxing-and-invasion-of-privacy
+  - /github/site-policy/github-community-guidelines#doxxing-and-invasion-of-privacy
 ---
 
 Don't post other people's personal information. This includes:

diff --git a/.../github-hate-speech-and-discrimination.md → .../github-hate-speech-and-discrimination.md b/.../github-hate-speech-and-discrimination.md → .../github-hate-speech-and-discrimination.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Hate Speech and Discrimination
+shortTitle: Hate Speech and Discrimination
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-hate-speech-and-discrimination
+  - /github/site-policy/github-community-guidelines#hate-speech-and-discrimination
 ---
 
 GitHub does not tolerate speech that attacks or promotes hate toward an individual or group of people on the basis of who they are, including age, body size, ability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, sexual identity, or sexual orientation. This includes:

diff --git a/...ithub/site-policy/github-impersonation.md → ...able-use-policies/github-impersonation.md b/...ithub/site-policy/github-impersonation.md → ...able-use-policies/github-impersonation.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Impersonation
+shortTitle: Impersonation
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-impersonation
+  - /github/site-policy/github-community-guidelines#impersonation
 ---
 
 You may not misrepresent your identity or your association with another person or organization. This includes doing any of the following in a way that misleads or deceives others:

diff --git a/...thub-misinformation-and-disinformation.md → ...thub-misinformation-and-disinformation.md b/...thub-misinformation-and-disinformation.md → ...thub-misinformation-and-disinformation.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Misinformation and Disinformation
+shortTitle: Misinformation and Disinformation
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-misinformation-and-disinformation
+  - /github/site-policy/github-community-guidelines#misinformation-and-disinformation
 ---
 
 You may not post content that presents a distorted view of reality, whether it is inaccurate or false (misinformation) or is intentionally deceptive (disinformation), where such content is likely to result in harm to the public or to interfere with fair and equal opportunities for all to take part in a free and open society. This may include: 

diff --git a/...policy/github-sexually-obscene-content.md → ...licies/github-sexually-obscene-content.md b/...policy/github-sexually-obscene-content.md → ...licies/github-sexually-obscene-content.md
@@ -1,10 +1,14 @@
 ---
 title: GitHub Sexually Obscene Content
+shortTitle: Sexually Obscene Content
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-sexually-obscene-content
+  - /github/site-policy/github-community-guidelines#sexually-obscene-content
 ---
 
 We do not tolerate content associated with sexual exploitation or abuse of another individual, including where minors are concerned. We do not allow sexually themed or suggestive content that serves little or no purpose other than to solicit an erotic or shocking response, particularly where that content is amplified by its placement in profiles or other social contexts. This includes:

diff --git a/...lence-and-gratuitously-violent-content.md → ...lence-and-gratuitously-violent-content.md b/...lence-and-gratuitously-violent-content.md → ...lence-and-gratuitously-violent-content.md
@@ -1,10 +1,15 @@
 ---
 title: GitHub Threats of Violence and Gratuitously Violent Content
+shortTitle: Threats of Violence and Gratuitously Violent Content
 versions:
   fpt: '*'
 topics:
   - Policy
   - Legal
+redirect_from:
+  - /github/site-policy/github-threats-of-violence-and-gratuitously-violent-content
+  - /github/site-policy/github-community-guidelines#threats-of-violence
+  - /github/site-policy/github-community-guidelines#gratuitously-violent-content
 ---
 
 

diff --git a/content/site-policy/acceptable-use-policies/index.md b/content/site-policy/acceptable-use-policies/index.md
@@ -0,0 +1,20 @@
+---
+title: Acceptable Use Policies
+versions:
+  fpt: '*'
+topics:
+  - Policy
+  - Legal
+children:
+  - github-sexually-obscene-content
+  - github-disrupting-the-experience-of-other-users
+  - github-doxxing-and-invasion-of-privacy
+  - github-hate-speech-and-discrimination
+  - github-acceptable-use-policies
+  - github-bullying-and-harassment
+  - github-active-malware-or-exploits
+  - github-threats-of-violence-and-gratuitously-violent-content
+  - github-impersonation
+  - github-misinformation-and-disinformation
+  - github-appeal-and-reinstatement
+---
diff --git a/...ithub/site-policy/dmca-takedown-policy.md → ...-removal-policies/dmca-takedown-policy.md b/...ithub/site-policy/dmca-takedown-policy.md → ...-removal-policies/dmca-takedown-policy.md
@@ -6,6 +6,7 @@ redirect_from:
   - /dmca-takedown-policy
   - /articles/dmca-takedown
   - /articles/dmca-takedown-policy
+  - /github/site-policy/dmca-takedown-policy
 versions:
   fpt: '*'
 topics:

diff --git a/...hub-private-information-removal-policy.md → ...hub-private-information-removal-policy.md b/...hub-private-information-removal-policy.md → ...hub-private-information-removal-policy.md
@@ -3,6 +3,7 @@ title: GitHub Private Information Removal Policy
 redirect_from:
   - /articles/github-sensitive-data-removal-policy
   - /github/site-policy/github-sensitive-data-removal-policy
+  - /github/site-policy/github-private-information-removal-policy
 versions:
   fpt: '*'
 topics:

diff --git a/...ub/site-policy/github-trademark-policy.md → ...moval-policies/github-trademark-policy.md b/...ub/site-policy/github-trademark-policy.md → ...moval-policies/github-trademark-policy.md
@@ -2,6 +2,7 @@
 title: GitHub Trademark Policy
 redirect_from:
   - /articles/github-trademark-policy
+  - /github/site-policy/github-trademark-policy
 versions:
   fpt: '*'
 topics:

diff --git a/...de-to-submitting-a-dmca-counter-notice.md → ...de-to-submitting-a-dmca-counter-notice.md b/...de-to-submitting-a-dmca-counter-notice.md → ...de-to-submitting-a-dmca-counter-notice.md
@@ -4,6 +4,7 @@ redirect_from:
   - /dmca-counter-notice-how-to
   - /articles/dmca-counter-notice-how-to
   - /articles/guide-to-submitting-a-dmca-counter-notice
+  - /github/site-policy/guide-to-submitting-a-dmca-counter-notice
 versions:
   fpt: '*'
 topics:

diff --git a/...e-to-submitting-a-dmca-takedown-notice.md → ...e-to-submitting-a-dmca-takedown-notice.md b/...e-to-submitting-a-dmca-takedown-notice.md → ...e-to-submitting-a-dmca-takedown-notice.md
@@ -4,6 +4,7 @@ redirect_from:
   - /dmca-notice-how-to
   - /articles/dmca-notice-how-to
   - /articles/guide-to-submitting-a-dmca-takedown-notice
+  - /github/site-policy/guide-to-submitting-a-dmca-takedown-notice
 versions:
   fpt: '*'
 topics:

diff --git a/content/site-policy/content-removal-policies/index.md b/content/site-policy/content-removal-policies/index.md
@@ -0,0 +1,16 @@
+---
+title: Content Removal Policies
+versions:
+  fpt: '*'
+topics:
+  - Policy
+  - Legal
+children:
+  - /submitting-content-removal-requests
+  - /github-private-information-removal-policy
+  - /github-trademark-policy
+  - /guide-to-submitting-a-dmca-counter-notice
+  - /guide-to-submitting-a-dmca-takedown-notice
+  - /dmca-takedown-policy
+---
+
diff --git a/...cy/submitting-content-removal-requests.md → ...es/submitting-content-removal-requests.md b/...cy/submitting-content-removal-requests.md → ...es/submitting-content-removal-requests.md
@@ -2,6 +2,8 @@
 title: Submitting content removal requests
 redirect_from:
   - /articles/submitting-content-removal-requests
+  - /github/site-policy/submitting-content-removal-requests
+  - /github/site-policy/github-terms-and-other-site-policies/submitting-content-removal-requests
 versions:
   fpt: '*'
 topics:

diff --git a/...e-policy/github-anti-bribery-statement.md → ...policies/github-anti-bribery-statement.md b/...e-policy/github-anti-bribery-statement.md → ...policies/github-anti-bribery-statement.md
@@ -2,6 +2,7 @@
 title: GitHub Anti-Bribery Statement
 redirect_from:
   - /articles/github-anti-bribery-statement
+  - /github/site-policy/github-anti-bribery-statement
 versions:
   fpt: '*'
 topics:

diff --git a/.../github-gifts-and-entertainment-policy.md → .../github-gifts-and-entertainment-policy.md b/.../github-gifts-and-entertainment-policy.md → .../github-gifts-and-entertainment-policy.md
@@ -2,6 +2,7 @@
 title: GitHub Gifts and Entertainment Policy
 redirect_from:
   - /articles/github-gifts-and-entertainment-policy
+  - /github/site-policy/github-gifts-and-entertainment-policy
 versions:
   fpt: '*'
 topics:

diff --git a/...licy/github-gpl-cooperation-commitment.md → ...cies/github-gpl-cooperation-commitment.md b/...licy/github-gpl-cooperation-commitment.md → ...cies/github-gpl-cooperation-commitment.md
@@ -2,6 +2,7 @@
 title: GitHub GPL Cooperation Commitment
 redirect_from:
   - /articles/github-gpl-cooperation-commitment
+  - /github/site-policy/github-gpl-cooperation-commitment
 versions:
   fpt: '*'
 topics:

diff --git a/...against-modern-slavery-and-child-labor.md → ...against-modern-slavery-and-child-labor.md b/...against-modern-slavery-and-child-labor.md → ...against-modern-slavery-and-child-labor.md
@@ -2,6 +2,7 @@
 title: GitHub Statement Against Modern Slavery and Child Labor
 redirect_from:
   - /articles/github-statement-against-modern-slavery-and-child-labor
+  - /github/site-policy/github-statement-against-modern-slavery-and-child-labor
 versions:
   fpt: '*'
 topics:

diff --git a/content/site-policy/github-company-policies/index.md b/content/site-policy/github-company-policies/index.md
@@ -0,0 +1,14 @@
+---
+title: GitHub Company Policies
+versions:
+  fpt: '*'
+topics:
+  - Policy
+  - Legal
+children:
+  - /github-statement-against-modern-slavery-and-child-labor
+  - /github-anti-bribery-statement
+  - /github-gpl-cooperation-commitment
+  - /github-gifts-and-entertainment-policy
+---
+
diff --git a/...github-community-forum-code-of-conduct.md → ...github-community-forum-code-of-conduct.md b/...github-community-forum-code-of-conduct.md → ...github-community-forum-code-of-conduct.md
@@ -2,6 +2,8 @@
 title: GitHub Community Forum Code of Conduct
 redirect_from:
   - /articles/github-community-forum-code-of-conduct
+  - /github/site-policy/github-community-forum-code-of-conduct
+  - /github/site-policy/acceptable-use-policies/github-community-forum-code-of-conduct
 versions:
   fpt: '*'
 topics:

diff --git a/...ite-policy/github-community-guidelines.md → ...thub-terms/github-community-guidelines.md b/...ite-policy/github-community-guidelines.md → ...thub-terms/github-community-guidelines.md
@@ -3,6 +3,8 @@ title: GitHub Community Guidelines
 redirect_from:
   - /community-guidelines
   - /articles/github-community-guidelines
+  - /github/site-policy/github-community-guidelines
+  - /github/site-policy/acceptable-use-policies/github-community-guidelines
 versions:
   fpt: '*'
 topics:

diff --git a/...licy/github-corporate-terms-of-service.md → ...erms/github-corporate-terms-of-service.md b/...licy/github-corporate-terms-of-service.md → ...erms/github-corporate-terms-of-service.md
@@ -2,6 +2,7 @@
 title: GitHub Corporate Terms of Service
 redirect_from:
   - /articles/github-corporate-terms-of-service
+  - /github/site-policy/github-corporate-terms-of-service
 versions:
   fpt: '*'
 topics: