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

repo sync

Author: Octomerger

content/github/index.md

@@ -12,7 +12,6 @@ versions:
   ghae: '*'
 children:
   - /copilot
-  - /site-policy
   - /site-policy-deprecated
 ---
 

content/github/site-policy/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:

content/index.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.
 

content/github/site-policy/github-acceptable-use-policies.md renamed to content/site-policy/acceptable-use-policies/github-acceptable-use-policies.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.

content/github/site-policy/github-active-malware-or-exploits.md renamed to content/site-policy/acceptable-use-policies/github-active-malware-or-exploits.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:

content/github/site-policy/github-appeal-and-reinstatement.md renamed to content/site-policy/acceptable-use-policies/github-appeal-and-reinstatement.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. 

content/github/site-policy/github-bullying-and-harassment.md renamed to content/site-policy/acceptable-use-policies/github-bullying-and-harassment.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:

content/github/site-policy/github-disrupting-the-experience-of-other-users.md renamed to content/site-policy/acceptable-use-policies/github-disrupting-the-experience-of-other-users.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: