Document renaming the default branch (#17204)

* Revert revert commit and address merge conflicts

* Update Liquid syntax and versioning

* Mention the good stuff

* Revert findandreplaceghetti

* Adjust versioning

* Adjust versioning

* Remove period

* Revise permissions statement

* Revise description of redirection behavior

* Update screenshots

* Update permissions tables

* Document permissions for organizations

* Tighten up permissions statement

Author: mattpollard

assets/images/help/branch/branch-rename-rename.png

@@ -23,7 +23,13 @@ You can choose the default branch for a repository. The default branch is the ba
 {% endnote %}
 {% endif %}
 
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
+{% if currentVersion == "free-pro-team@latest" %}
+
+You can also rename the default branch. For more information, see "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)."
+
+{% endif %}
+
+{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" %}
 
 {% data reusables.branches.set-default-branch %}
 

assets/images/help/branch/branch-rename-type.png

@@ -33,6 +33,7 @@ versions:
     {% link_in_list /restoring-a-deleted-repository %}
 {% topic_link_in_list /managing-branches-in-your-repository %}
     {% link_in_list /viewing-branches-in-your-repository %}
+    {% link_in_list /renaming-a-branch %}
     {% link_in_list /changing-the-default-branch %}
     {% link_in_list /deleting-and-restoring-branches-in-a-pull-request %}
 {% topic_link_in_list /configuring-pull-request-merges %}

content/github/administering-a-repository/changing-the-default-branch.md

@@ -0,0 +1,24 @@
+---
+title: Renaming a branch
+intro: You can change the name of a branch in a repository.
+permissions: People with write permissions to a repository can rename a branch in the repository. People with admin permissions can rename the default branch.
+versions:
+  free-pro-team: '*'
+---
+
+### About renaming branches
+
+You can rename a branch in a repository on {% data variables.product.product_location %}. For more information about branches, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches)."
+
+If you rename a branch, {% data variables.product.prodname_dotcom %} will automatically redirect links on {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location_enterprise %}{% endif %} that contain the old branch name to the equivalent link on the renamed branch. {% data variables.product.prodname_dotcom %} will also update branch protection policies, as well as the base branch for open pull requests and draft releases.
+
+### Renaming a branch
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.navigate-to-branches %}
+1. In the list of branches, to the right of the branch you want to rename, click {% octicon "pencil" aria-label="The edit icon" %}.
+    ![Pencil icon to the right of branch you want to rename](/assets/images/help/branch/branch-rename-edit.png)
+1. Type a new name for the branch.
+    ![Text field for typing new branch name](/assets/images/help/branch/branch-rename-type.png)
+1. Review the information about local environments, then click **Rename branch**.
+    ![Local environment information and "Rename branch" button](/assets/images/help/branch/branch-rename-rename.png)

content/github/administering-a-repository/index.md

@@ -100,7 +100,9 @@ In addition to managing organization-level settings, organization owners have ad
 | Make a repository a template (see "[Creating a template repository](/articles/creating-a-template-repository)") | | | | | **X** |
 | Change a repository's settings | | | | | **X** |
 | Manage team and collaborator access to the repository | | | | | **X** |
-| Edit the repository's default branch | | | | | **X** |
+| Edit the repository's default branch | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %}
+| Rename the repository's default branch (see "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)") | | | | | **X** |
+| Rename a branch other than the repository's default branch (see "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)") | | | **X** | **X** | **X** |{% endif %}
 | Manage webhooks and deploy keys | | | | | **X** |{% if currentVersion == "free-pro-team@latest" %}
 | [Enable the dependency graph](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-and-dependents-of-a-repository) for a private repository | | | | | **X** |
 | Receive [{% data variables.product.prodname_dependabot_alerts %} for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies) in a repository | | | | | **X** |

content/github/administering-a-repository/renaming-a-branch.md

@@ -29,7 +29,8 @@ The repository owner has full control of the repository. In addition to the acti
 | :- | :- |
 | {% if currentVersion == "free-pro-team@latest" %}Invite collaborators{% else %}Add collaborators{% endif %} | "[Inviting collaborators to a personal repository](/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository)" |
 | Change the visibility of the repository | "[Setting repository visibility](/github/administering-a-repository/setting-repository-visibility)" |{% if currentVersion == "free-pro-team@latest" %}
-| Limit interactions with the repository | "[Limiting interactions in your repository](/github/building-a-strong-community/limiting-interactions-in-your-repository)" |{% endif %}
+| Limit interactions with the repository | "[Limiting interactions in your repository](/github/building-a-strong-community/limiting-interactions-in-your-repository)" |{% endif %}{% if currentVersion == "free-pro-team@latest" %}
+| Rename a branch, including the default branch | "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)" |{% endif %}
 | Merge a pull request on a protected branch, even if there are no approving reviews | "[About protected branches](/github/administering-a-repository/about-protected-branches)" |
 | Delete the repository | "[Deleting a repository](/github/administering-a-repository/deleting-a-repository)" |
 | Manage the repository's topics | "[Classifying your repository with topics](/github/administering-a-repository/classifying-your-repository-with-topics)" |{% if currentVersion == "free-pro-team@latest" %}
@@ -61,7 +62,8 @@ Collaborators can also perform the following actions.
 
 | Action | More information |
 | :- | :- |
-| Fork the repository | "[About forks](/github/collaborating-with-issues-and-pull-requests/about-forks)" |
+| Fork the repository | "[About forks](/github/collaborating-with-issues-and-pull-requests/about-forks)" |{% if currentVersion == "free-pro-team@latest" %}
+| Rename a branch other than the default branch | "[Renaming a branch](/github/administering-a-repository/renaming-a-branch)" |{% endif %}
 | Create, edit, and delete comments on commits, pull requests, and issues in the repository | <ul><li>"[About issues](/github/managing-your-work-on-github/about-issues)"</li><li>"[Commenting on a pull request](/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request)"</li><li>"[Managing disruptive comments](/github/building-a-strong-community/managing-disruptive-comments)"</li></ul> |
 | Create, assign, close, and re-open issues in the repository | "[Managing your work with issues](/github/managing-your-work-on-github/managing-your-work-with-issues)" |
 | Manage labels for issues and pull requests in the repository | "[Labeling issues and pull requests](/github/managing-your-work-on-github/labeling-issues-and-pull-requests)" |