repo sync

Author: Octomerger

content/admin/configuration/command-line-utilities.md

@@ -74,8 +74,8 @@ $ ghe-config -l
 ```
 Allows you to find the uuid of your node in `cluster.conf`.
 
-``` shell
-  $ ghe-config _hostname_.uuid
+```shell
+  $ ghe-config <em>HOSTNAME</em>.uuid
 ```
 
 {% if currentVersion ver_gt "enterprise-server@2.21" %}
@@ -543,8 +543,8 @@ ghe-dpages status
 ```
 
 To evacuate a {% data variables.product.prodname_pages %} storage service before evacuating a cluster node:
-``` shell
-ghe-dpages evacuate pages-server-<uuid>
+```shell
+ghe-dpages evacuate pages-server-<em>UUID</em>
 ```
 
 #### ghe-spokes
@@ -569,16 +569,16 @@ ghe-spokes route
 
 To evacuate storage services on a cluster node:
 
-``` shell
-ghe-spokes server evacuate git-server-<uuid>
+```shell
+ghe-spokes server evacuate git-server-<em>UUID</em>
 ```
 
 #### ghe-storage
 
 This utility allows you to evacuate all storage services before evacuating a cluster node.
 
-``` shell
-ghe-storage evacuate storage-server-<uuid>
+```shell
+ghe-storage evacuate storage-server-<em>UUID</em>
 ```
 
 ### Git

content/admin/enterprise-management/configuring-high-availability-replication-for-a-cluster.md

@@ -10,7 +10,7 @@ versions:
 
 ### About high availability replication for clusters
 
-You can configure a cluster deployment of {% data variables.product.prodname_ghe_server %} for high availability, where an identical set of passive nodes sync with the nodes in your active cluster. If hardware or software failures affect the datacenter with your active cluster, you can manually fail over to the replica nodes and continue processing user requests without data loss.
+You can configure a cluster deployment of {% data variables.product.prodname_ghe_server %} for high availability, where an identical set of passive nodes sync with the nodes in your active cluster. If hardware or software failures affect the datacenter with your active cluster, you can manually fail over to the replica nodes and continue processing user requests, minimizing the impact of the outage.
 
 In high availability mode, each active node syncs regularly with a corresponding passive node. The passive node runs in standby and does not serve applications or process user requests.
 

content/admin/overview/managing-your-github-enterprise-license.md

@@ -24,7 +24,7 @@ You can allocate the user licenses included in your {% data variables.product.pr
 
 If your {% data variables.product.prodname_ghe_server %} license expires, you won't be able to access {% data variables.product.product_location_enterprise %} via a web browser or Git. If needed, you will be able to use command-line utilities to back up all your data. For more information, see "[Configuring backups on your appliance](/enterprise/admin/guides/installation/configuring-backups-on-your-appliance)." If you have any questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.
 
-### Uploading a new license to {% data variables.product.prodname_ghe_server %}  
+### Uploading a new license to {% data variables.product.prodname_ghe_server %}
 
 After you purchase a new license or upgrade an existing license from {% data variables.contact.contact_enterprise_sales %}, you must download your new license file, then upload the file to {% data variables.product.prodname_ghe_server %} to unlock your new user licenses.
 
@@ -45,7 +45,9 @@ If you'd like to renew or add user licenses to {% data variables.product.prodnam
 13. To select your license, click **License file**, or drag your license file onto **License file**.
   ![Upload license file](/assets/images/enterprise/management-console/upload-license.png)
 14. Click **Upload**.
-  ![Begin upgrade](/assets/images/enterprise/management-console/begin-upload.png)
+  ![Begin upload](/assets/images/enterprise/management-console/begin-upload.png)
+
+{% if enterpriseVersion ver_lt "enterprise-server@3.0" %}If the web UI for {% data variables.product.prodname_ghe_server %} doesn't reflect your updated license immediately, see "[Troubleshooting](#troubleshooting)."{% endif %}
 
 ### Viewing license usage
 
@@ -77,3 +79,23 @@ You can download a JSON file from {% data variables.product.prodname_ghe_server
   ![Upload GitHub Enterprise Servers usage link](/assets/images/help/business-accounts/upload-ghe-server-usage-link.png)
 11. Upload the JSON file you downloaded from {% data variables.product.prodname_ghe_server %}.
   ![Drag and drop or select a file to upload](/assets/images/help/business-accounts/upload-ghe-server-usage-file.png)
+
+{% if currentVersion ver_lt "enterprise-server@3.0" %}
+
+### Troubleshooting
+
+In some scenarios, the web UI for {% data variables.product.prodname_ghe_server %} may not immediately reflect your new license. You can force the system to detect the license by restarting two system services.
+
+{% data reusables.enterprise_installation.ssh-into-instance %}
+1. Restart the services for Git authentication and the HTTP server.
+
+    {% warning %}
+
+    **Warning**: Running the following command will result in a few minutes of user-facing downtime for {% data variables.product.prodname_ghe_server %}. Run the command with care.
+
+    {% endwarning %}
+
+        sudo systemctl restart github-gitauth github-unicorn
+1. After {% data variables.product.prodname_ghe_server %} returns you to a prompt, try accessing {% data variables.product.prodname_ghe_server %} via the command line or web UI again.
+
+{% endif %}

content/admin/user-management/viewing-push-logs.md

@@ -22,17 +22,19 @@ Push log entries show:
 
 ### Viewing a repository's push logs
 
+1. Sign into {% data variables.product.prodname_ghe_server %} as a site administrator.
 1. Navigate to a repository.
-{% data reusables.enterprise_site_admin_settings.access-settings %}
+1. In the upper-right corner of the repository's page, click {% octicon "rocket" aria-label="The rocket ship" %}.
+    ![Rocketship icon for accessing site admin settings](/assets/images/enterprise/site-admin-settings/access-new-settings.png)
 {% data reusables.enterprise_site_admin_settings.security-tab %}
 4. In the left sidebar, click **Push Log**.
 ![Push log tab](/assets/images/enterprise/site-admin-settings/push-log-tab.png)
 
 {% if enterpriseServerVersions contains currentVersion %}
 ### Viewing a repository's push logs on the command-line
 
-1. SSH into your appliance. For more information, see "[Accessing the administrative shell (SSH)](/enterprise/{{ currentVersion }}/admin/guides/installation/accessing-the-administrative-shell-ssh/)."
-2. In the appropriate Git repository, open the audit log file:
+{% data reusables.enterprise_installation.ssh-into-instance %}
+1. In the appropriate Git repository, open the audit log file:
   ```shell
   ghe-repo <em>owner</em>/<em>repository</em> -c "less audit_log"
   ```

…ithub-education/about-campus-advisors.md …ithub-education/about-campus-advisors.mdcontent/education/teach-and-learn-with-github-education/about-campus-advisors.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors.md content/education/teach-and-learn-with-github-education/about-campus-advisors.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-advisors.md

@@ -2,6 +2,7 @@
 title: About Campus Advisors
 intro: 'As an instructor or mentor, learn to use {% data variables.product.prodname_dotcom %} at your school with Campus Advisors training and support.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/about-campus-advisors
   - /github/teaching-and-learning-with-github-education/about-campus-advisors
   - /articles/about-campus-advisors
 versions:

…github-education/about-campus-experts.md …github-education/about-campus-experts.mdcontent/education/teach-and-learn-with-github-education/about-campus-experts.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-experts.md content/education/teach-and-learn-with-github-education/about-campus-experts.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-campus-experts.md

@@ -2,6 +2,7 @@
 title: About Campus Experts
 intro: 'As a student, learn the skills you need to build your school''s technology community and a real-world portfolio, with {% data variables.product.prodname_dotcom %} Campus Experts training.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/about-campus-experts
   - /github/teaching-and-learning-with-github-education/about-campus-experts
   - /articles/about-campus-experts
 versions:

…ucation-for-educators-and-researchers.md …ucation-for-educators-and-researchers.mdcontent/education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers.md content/education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers.md

@@ -2,6 +2,7 @@
 title: About GitHub Education for educators and researchers
 intro: '{% data variables.product.prodname_education %} offers a variety of tools to help educators and researchers work more effectively inside and outside of the classroom.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/about-github-education-for-educators-and-researchers
   - /github/teaching-and-learning-with-github-education/about-github-education-for-educators-and-researchers
   - /articles/about-github-education-for-educators-and-researchers
 versions:

…n/about-github-education-for-students.md …n/about-github-education-for-students.mdcontent/education/teach-and-learn-with-github-education/about-github-education-for-students.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students.md content/education/teach-and-learn-with-github-education/about-github-education-for-students.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education-for-students.md

@@ -2,6 +2,7 @@
 title: About GitHub Education for students
 intro: '{% data variables.product.prodname_education %} offers students real-world experience with free access to various developer tools from {% data variables.product.prodname_dotcom %}''s partners.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/about-github-education-for-students
   - /github/teaching-and-learning-with-github-education/about-github-education-for-students
   - /articles/about-github-education-for-students
 versions:
@@ -12,9 +13,9 @@ Using {% data variables.product.prodname_dotcom %} for your school projects is a
 
 {% data reusables.education.about-github-education-link %}
 
-Everyone with a {% data variables.product.prodname_dotcom %} account can collaborate in unlimited public and private repositories with {% data variables.product.prodname_free_user %}. As a student, you can also apply for the {% data variables.product.prodname_student_pack %}, which offers free access to tools and services used by professional developers. For more information, see "[Apply for a student developer pack](/education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack)" and [{% data variables.product.prodname_education %}](https://education.github.com/pack).
+Everyone with a {% data variables.product.prodname_dotcom %} account can collaborate in unlimited public and private repositories with {% data variables.product.prodname_free_user %}. As a student, you can also apply for the {% data variables.product.prodname_student_pack %}, which offers free access to tools and services used by professional developers. For more information, see "[Apply for a student developer pack](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack)" and [{% data variables.product.prodname_education %}](https://education.github.com/pack).
 
-If you're a member of a FIRST robotics club, your mentor can apply for an educator discount so your team can collaborate using {% data variables.product.prodname_team %}, which allows unlimited users and private repositories, for free. For more information, see "[Apply for an educator or researcher discount](/education/teach-and-learn-with-github-education/apply-for-an-educator-or-researcher-discount)."
+If you're a member of a FIRST robotics club, your mentor can apply for an educator discount so your team can collaborate using {% data variables.product.prodname_team %}, which allows unlimited users and private repositories, for free. For more information, see "[Apply for an educator or researcher discount](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-an-educator-or-researcher-discount)."
 
 ### Further reading
 

…thub-education/about-github-education.md …thub-education/about-github-education.mdcontent/education/teach-and-learn-with-github-education/about-github-education.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education.md content/education/teach-and-learn-with-github-education/about-github-education.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/about-github-education.md

@@ -2,6 +2,7 @@
 title: About GitHub Education
 intro: '{% data variables.product.prodname_education %} offers a special free product for schools that want to make the most of {% data variables.product.prodname_dotcom %} for their community and agree to specific program requirements.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/about-github-education
   - /github/teaching-and-learning-with-github-education/about-github-education
   - /articles/about-github-education
 versions:
@@ -20,4 +21,4 @@ Teachers can manage a course on software development with {% data variables.prod
 
 To learn more about training programs for student leaders and teachers, see "[{% data variables.product.prodname_dotcom %} Campus Experts](https://education.github.com/students/experts)" and "[Campus Advisors](https://education.github.com/teachers/advisors)."
 
-If you're a student or academic faculty and your school isn't partnered with {% data variables.product.prodname_dotcom %} as a {% data variables.product.prodname_education %} school, then you can still individually apply for discounts to use {% data variables.product.prodname_dotcom %}. For more information, see "[Use {% data variables.product.prodname_dotcom %} for your schoolwork](/education/teach-and-learn-with-github-education/use-github-for-your-schoolwork)" or "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/teach-and-learn-with-github-education/use-github-in-your-classroom-and-research/)."
+If you're a student or academic faculty and your school isn't partnered with {% data variables.product.prodname_dotcom %} as a {% data variables.product.prodname_education %} school, then you can still individually apply for discounts to use {% data variables.product.prodname_dotcom %}. For more information, see "[Use {% data variables.product.prodname_dotcom %} for your schoolwork](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-for-your-schoolwork)" or "[Use {% data variables.product.prodname_dotcom %} in your classroom and research](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/use-github-in-your-classroom-and-research/)."

…on/apply-for-a-student-developer-pack.md …on/apply-for-a-student-developer-pack.mdcontent/education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack.md content/education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack.md renamed to content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack.md

@@ -2,6 +2,7 @@
 title: Apply for a student developer pack
 intro: 'As a student, you can apply for the {% data variables.product.prodname_student_pack %}, which includes offers and benefits from {% data variables.product.prodname_dotcom %} partners.'
 redirect_from:
+  - /education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack
   - /github/teaching-and-learning-with-github-education/applying-for-a-student-developer-pack
   - /articles/applying-for-a-student-developer-pack
 versions:
@@ -28,7 +29,7 @@ During your tenure as a student, you may be prompted to periodically re-verify y
 
 {% endnote %}
 
-For information about renewing your {% data variables.product.prodname_student_pack %}, see "[Expiration and renewals](/education/teach-and-learn-with-github-education/apply-for-a-student-developer-pack/#expiration-and-renewals)."
+For information about renewing your {% data variables.product.prodname_student_pack %}, see "[Expiration and renewals](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/apply-for-a-student-developer-pack/#expiration-and-renewals)."
 
 ### Applying for a {% data variables.product.prodname_student_pack %}