diff --git a/content/admin/authentication/using-ldap.md b/content/admin/authentication/using-ldap.md index c0c06c8abd..959c6df2fb 100644 --- a/content/admin/authentication/using-ldap.md +++ b/content/admin/authentication/using-ldap.md @@ -63,7 +63,7 @@ Use these attributes to finish configuring LDAP for {% data variables.product.pr | `Host` | Required | The LDAP host, e.g. `ldap.example.com` or `10.0.0.30`. If the hostname is only available from your internal network, you may need to configure {% data variables.product.product_location %}'s DNS first so it can resolve the hostname using your internal nameservers. | | `Port` | Required | The port the host's LDAP services are listening on. Examples include: 389 and 636 (for LDAPS). | | `Encryption` | Required | The encryption method used to secure communications to the LDAP server. Examples include plain (no encryption), SSL/LDAPS (encrypted from the start), and StartTLS (upgrade to encrypted communication once connected). | -| `Domain search user` | Optional | The LDAP user that performs user lookups to authenticate other users when they sign in. This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`. With Active Directory, you can also use the `[DOMAIN]\[USERNAME]` syntax (e.g. `WINDOWS\Administrator`) for the domain search user with Active Directory. | +| `Domain search user` | Optional | The LDAP user that looks up other users that sign in, to allow authentication. This is typically a service account created specifically for third-party integrations. Use a fully qualified name, such as `cn=Administrator,cn=Users,dc=Example,dc=com`. With Active Directory, you can also use the `[DOMAIN]\[USERNAME]` syntax (e.g. `WINDOWS\Administrator`) for the domain search user with Active Directory. | | `Domain search password` | Optional | The password for the domain search user. | | `Administrators group` | Optional | Users in this group are promoted to site administrators when signing into your appliance. If you don't configure an LDAP Administrators group, the first LDAP user account that signs into your appliance will be automatically promoted to a site administrator. | | `Domain base` | Required | The fully qualified `Distinguished Name` (DN) of an LDAP subtree you want to search for users and groups. You can add as many as you like; however, each group must be defined in the same domain base as the users that belong to it. If you specify restricted user groups, only users that belong to those groups will be in scope. We recommend that you specify the top level of your LDAP directory tree as your domain base and use restricted user groups to control access. | diff --git a/content/admin/authentication/using-saml.md b/content/admin/authentication/using-saml.md index 9ce7104c78..e4cdd3808e 100644 --- a/content/admin/authentication/using-saml.md +++ b/content/admin/authentication/using-saml.md @@ -82,7 +82,7 @@ These attributes are available. You can change the attribute names in the [manag {% endtip %} 5. Select **Disable administrator demotion/promotion** if you **do not** want your SAML provider to determine administrator rights for users on {% data variables.product.product_location %}. -![SAML disable admin config](/assets/images/enterprise/management-console/disable-admin-demotion-promotion.png) +![SAML disable admin configuration](/assets/images/enterprise/management-console/disable-admin-demotion-promotion.png) 6. In the **Single sign-on URL** field, type the HTTP or HTTPS endpoint on your IdP for single sign-on requests. This value is provided by your IdP configuration. If the host is only available from your internal network, you may need to [configure {% data variables.product.product_location %} to use internal nameservers](/enterprise/{{ currentVersion }}/admin/guides/installation/configuring-dns-nameservers/). ![SAML authentication](/assets/images/enterprise/management-console/saml-single-sign-url.png) 7. Optionally, in the **Issuer** field, type your SAML issuer's name. This verifies the authenticity of messages sent to {% data variables.product.product_location %}. diff --git a/content/admin/configuration/accessing-the-administrative-shell-ssh.md b/content/admin/configuration/accessing-the-administrative-shell-ssh.md index a56c2aaf35..73cf3530c7 100644 --- a/content/admin/configuration/accessing-the-administrative-shell-ssh.md +++ b/content/admin/configuration/accessing-the-administrative-shell-ssh.md @@ -55,7 +55,7 @@ To specify a private SSH key using the command line, run `ssh` with the `-i` arg ssh -i /path/to/ghe_private_key -p 122 admin@hostname ``` -You can also specify a private SSH key using the SSH config file (`~/.ssh/config`). +You can also specify a private SSH key using the SSH configuration file (`~/.ssh/config`). ```shell Host hostname diff --git a/content/admin/configuration/command-line-utilities.md b/content/admin/configuration/command-line-utilities.md index 9cf036766e..188d0e4936 100644 --- a/content/admin/configuration/command-line-utilities.md +++ b/content/admin/configuration/command-line-utilities.md @@ -72,7 +72,7 @@ $ ghe-config core.github-hostname 'example.com' $ ghe-config -l # Lists all the configuration values ``` -Allows you to find the uuid of your node in `cluster.conf`. +Allows you to find the universally unique identifier (UUID) of your node in `cluster.conf`. ```shell $ ghe-config HOSTNAME.uuid diff --git a/content/admin/configuration/configuring-backups-on-your-appliance.md b/content/admin/configuration/configuring-backups-on-your-appliance.md index 4fa7ac5d45..dbea15fc26 100644 --- a/content/admin/configuration/configuring-backups-on-your-appliance.md +++ b/content/admin/configuration/configuring-backups-on-your-appliance.md @@ -83,7 +83,7 @@ In the event of prolonged outage or catastrophic event at the primary site, you {%if currentVersion ver_gt "enterprise-server@2.22"%} {% note %} -**Note:** If {% data variables.product.product_location %} has {% data variables.product.prodname_actions %} enabled, you must first configure the {% data variables.product.prodname_actions %} external storage provider on the replacement appliance before running the the `ghe-restore` command. For more information, see "[Backing up and restoring {% data variables.product.prodname_ghe_server %} with {% data variables.product.prodname_actions %} enabled](/admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled)." +**Note:** If {% data variables.product.product_location %} has {% data variables.product.prodname_actions %} enabled, you must first configure the {% data variables.product.prodname_actions %} external storage provider on the replacement appliance before running the `ghe-restore` command. For more information, see "[Backing up and restoring {% data variables.product.prodname_ghe_server %} with {% data variables.product.prodname_actions %} enabled](/admin/github-actions/backing-up-and-restoring-github-enterprise-server-with-github-actions-enabled)." {% endnote %} {% endif %} @@ -116,4 +116,3 @@ $ ghe-restore -c 169.154.1.1 You can use these additional options with `ghe-restore` command: - The `-c` flag overwrites the settings, certificate, and license data on the target host even if it is already configured. Omit this flag if you are setting up a staging instance for testing purposes and you wish to retain the existing configuration on the target. For more information, see the "Using using backup and restore commands" section of the [{% data variables.product.prodname_enterprise_backup_utilities %} README](https://github.com/github/backup-utils#using-the-backup-and-restore-commands). - The `-s` flag allows you to select a different backup snapshot. - diff --git a/content/admin/configuration/configuring-built-in-firewall-rules.md b/content/admin/configuration/configuring-built-in-firewall-rules.md index d6a3059f53..1ee5bcda80 100644 --- a/content/admin/configuration/configuring-built-in-firewall-rules.md +++ b/content/admin/configuration/configuring-built-in-firewall-rules.md @@ -15,7 +15,7 @@ versions: After you install {% data variables.product.prodname_ghe_server %}, all required network ports are automatically opened to accept connections. Every non-required port is automatically configured as `deny`, and the default outgoing policy is configured as `allow`. Stateful tracking is enabled for any new connections; these are typically network packets with the `SYN` bit set. For more information, see "[Network ports](/enterprise/admin/guides/installation/network-ports)." -The UFW firewall also opens several other ports that are required for {% data variables.product.prodname_ghe_server %} to operate properly. For more information on the UFW ruleset, see [the UFW README](https://bazaar.launchpad.net/~jdstrand/ufw/0.30-oneiric/view/head:/README#L213). +The UFW firewall also opens several other ports that are required for {% data variables.product.prodname_ghe_server %} to operate properly. For more information on the UFW rule set, see [the UFW README](https://bazaar.launchpad.net/~jdstrand/ufw/0.30-oneiric/view/head:/README#L213). ### Viewing the default firewall rules diff --git a/content/admin/configuration/configuring-email-for-notifications.md b/content/admin/configuration/configuring-email-for-notifications.md index 1c33cf1d8e..cc3aac5d7c 100644 --- a/content/admin/configuration/configuring-email-for-notifications.md +++ b/content/admin/configuration/configuring-email-for-notifications.md @@ -131,7 +131,7 @@ This log shows that the appliance: #### Check {% data variables.product.product_location %} logs -If you need to verify that your inbound email is functioning, there are two logfiles that you can examine on your instance: To verify that */var/log/mail.log* and */var/log/mail-replies/metroplex.log*. +If you need to verify that your inbound email is functioning, there are two log files that you can examine on your instance: To verify that */var/log/mail.log* and */var/log/mail-replies/metroplex.log*. */var/log/mail.log* verifies that messages are reaching your server. Here's an example of a successful email reply: diff --git a/content/admin/configuration/site-admin-dashboard.md b/content/admin/configuration/site-admin-dashboard.md index 6e24da8a36..da953a8cd3 100644 --- a/content/admin/configuration/site-admin-dashboard.md +++ b/content/admin/configuration/site-admin-dashboard.md @@ -10,7 +10,7 @@ versions: --- To access the dashboard, in the upper-right corner of any 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) +![Rocket ship icon for accessing site admin settings](/assets/images/enterprise/site-admin-settings/access-new-settings.png) {% if currentVersion ver_gt "enterprise-server@2.21" %} diff --git a/content/admin/enterprise-management/about-geo-replication.md b/content/admin/enterprise-management/about-geo-replication.md index a704afecb1..dfa868e556 100644 --- a/content/admin/enterprise-management/about-geo-replication.md +++ b/content/admin/enterprise-management/about-geo-replication.md @@ -12,7 +12,7 @@ Multiple active replicas can provide a shorter distance to the nearest replica. The active replica proxies requests that it can't process itself to the primary instance. The replicas function as a point of presence terminating all SSL connections. Traffic between hosts is sent through an encrypted VPN connection, similar to a two-node high availability configuration without geo-replication. -Git requests and specific fileserver requests, such as LFS and file uploads, can be served directly from the replica without loading any data from the primary. Web requests are always routed to the primary, but if the replica is closer to the user the requests are faster due to the closer SSL termination. +Git requests and specific file server requests, such as LFS and file uploads, can be served directly from the replica without loading any data from the primary. Web requests are always routed to the primary, but if the replica is closer to the user the requests are faster due to the closer SSL termination. Geo DNS, such as [Amazon's Route 53 service](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-geo), is required for geo-replication to work seamlessly. The hostname for the instance should resolve to the replica that is closest to the user's location. diff --git a/content/admin/enterprise-management/cluster-network-configuration.md b/content/admin/enterprise-management/cluster-network-configuration.md index 34f63de9b3..b11cc7bb1f 100644 --- a/content/admin/enterprise-management/cluster-network-configuration.md +++ b/content/admin/enterprise-management/cluster-network-configuration.md @@ -10,7 +10,7 @@ versions: ### Network considerations -The simplest network design for clustering is to place the nodes on a single LAN. If a cluster must span subnets, we do not recommend configuring any firewall rules between the networks. The latency between nodes should be less than 1 millisecond. +The simplest network design for clustering is to place the nodes on a single LAN. If a cluster must span subnetworks, we do not recommend configuring any firewall rules between the networks. The latency between nodes should be less than 1 millisecond. {% if currentVersion ver_gt "enterprise-server@2.21" %}For high availability, the latency between the network with the active nodes and the network with the passive nodes must be less than 70 milliseconds. We don't recommend configuring a firewall between the two networks.{% endif %} @@ -54,12 +54,12 @@ If a network level firewall is in place between nodes, these ports will need to | 6379/TCP | Redis | | 8001/TCP | Grafana | | 8090/TCP | Internal GPG access | -| 8149/TCP | GitRPC fileserver access | +| 8149/TCP | GitRPC file server access | | 8300/TCP | Consul | | 8301/TCP | Consul | | 8302/TCP | Consul | | 9000/TCP | Git Daemon | -| 9102/TCP | Pages fileserver | +| 9102/TCP | Pages file server | | 9105/TCP | LFS server | | 9200/TCP | Elasticsearch | | 9203/TCP | Semantic code service | diff --git a/content/admin/enterprise-management/upgrade-requirements.md b/content/admin/enterprise-management/upgrade-requirements.md index 9354cab526..60da0b3d30 100644 --- a/content/admin/enterprise-management/upgrade-requirements.md +++ b/content/admin/enterprise-management/upgrade-requirements.md @@ -25,7 +25,7 @@ versions: - If you’re several versions behind, upgrade {% data variables.product.product_location %} as far forward as possible with each step of your upgrade process. Using the latest version possible on each upgrade allows you to take advantage of performance improvements and bug fixes. For example, you could upgrade from {% data variables.product.prodname_enterprise %} 2.7 to 2.8 to 2.10, but upgrading from {% data variables.product.prodname_enterprise %} 2.7 to 2.9 to 2.10 uses a later version in the second step. - Use the latest patch release when upgrading. {% data reusables.enterprise_installation.enterprise-download-upgrade-pkg %} - Use a staging instance to test the upgrade steps. For more information, see "[Setting up a staging instance](/enterprise/{{ currentVersion }}/admin/guides/installation/setting-up-a-staging-instance/)." -- When running multiple upgrades, wait at least 24 hours between feature upgrades to allow data migrations and backgrounded upgrade tasks to fully complete. +- When running multiple upgrades, wait at least 24 hours between feature upgrades to allow data migrations and upgrade tasks running in the background to fully complete. ### Requirements diff --git a/content/admin/overview/system-overview.md b/content/admin/overview/system-overview.md index 146923377e..c86afe795a 100644 --- a/content/admin/overview/system-overview.md +++ b/content/admin/overview/system-overview.md @@ -108,7 +108,7 @@ For more information about {% data variables.product.prodname_ghe_server %}'s us #### Audit and access logging -{% data variables.product.prodname_ghe_server %} stores both traditional operating system and application logs. The application also writes detailed auditing and security logs, which {% data variables.product.prodname_ghe_server %} stores permanently. You can forward both types of logs in realtime to multiple destinations via the `syslog-ng` protocol. For more information, see "[Log forwarding](/admin/user-management/log-forwarding)." +{% data variables.product.prodname_ghe_server %} stores both traditional operating system and application logs. The application also writes detailed auditing and security logs, which {% data variables.product.prodname_ghe_server %} stores permanently. You can forward both types of logs in real time to multiple destinations via the `syslog-ng` protocol. For more information, see "[Log forwarding](/admin/user-management/log-forwarding)." Access and audit logs include information like the following. diff --git a/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md b/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md index 859a41504f..1f15dc49c2 100644 --- a/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md +++ b/content/admin/packages/configuring-package-ecosystem-support-for-your-enterprise.md @@ -26,13 +26,13 @@ To use {% data variables.product.prodname_registry %} with Docker, you must have {% data reusables.enterprise_management_console.save-settings %} {% if currentVersion == "enterprise-server@3.0" or currentVersion ver_gt "enterprise-server@3.0" %} -### Connecting to the official NPM registry +### Connecting to the official npm registry -If you've enabled npm packages on your enterprise and want to allow access to the official NPM registry as well as the {% data variables.product.prodname_registry %} npm registry, then you must perform some additional configuration. +If you've enabled npm packages on your enterprise and want to allow access to the official npm registry as well as the {% data variables.product.prodname_registry %} npm registry, then you must perform some additional configuration. -{% data variables.product.prodname_registry %} uses a transparent proxy for network traffic that connects to the official NPM registry at `registry.npmjs.com`. The proxy is enabled by default and cannot be disabled. +{% data variables.product.prodname_registry %} uses a transparent proxy for network traffic that connects to the official npm registry at `registry.npmjs.com`. The proxy is enabled by default and cannot be disabled. -To allow network connections to the NPM registry, you will need to configure network ACLs that allow {% data variables.product.prodname_ghe_server %} to send HTTPS traffic to `registry.npmjs.com` over port 443: +To allow network connections to the npm registry, you will need to configure network ACLs that allow {% data variables.product.prodname_ghe_server %} to send HTTPS traffic to `registry.npmjs.com` over port 443: | Source | Destination | Port | Type | |---|---|---|---| diff --git a/content/admin/policies/about-pre-receive-hooks.md b/content/admin/policies/about-pre-receive-hooks.md index b3d43b0176..ec699e2ccf 100644 --- a/content/admin/policies/about-pre-receive-hooks.md +++ b/content/admin/policies/about-pre-receive-hooks.md @@ -17,7 +17,7 @@ Examples of how you can use pre-receive hooks: - Require commit messages to follow a specific pattern or format, such as including a valid ticket number or being over a certain length. - Lock a branch or repository by rejecting all pushes. -- Prevent sensitive data from being added to the repository by blocking keywords, patterns or filetypes. +- Prevent sensitive data from being added to the repository by blocking keywords, patterns or file types. - Prevent a PR author from merging their own changes. ### Impact on performance and workflows diff --git a/content/admin/policies/creating-a-pre-receive-hook-script.md b/content/admin/policies/creating-a-pre-receive-hook-script.md index 2022ef49c5..c501d76e58 100644 --- a/content/admin/policies/creating-a-pre-receive-hook-script.md +++ b/content/admin/policies/creating-a-pre-receive-hook-script.md @@ -177,7 +177,7 @@ You can test a pre-receive hook script locally before you create or update it on $ docker cp data:/home/git/.ssh/id_ed25519 . ``` -10. Modify the remote of a test repository and push to the `test.git` repo within the Docker container. This example uses `git@github.com:octocat/Hello-World.git` but you can use any repo you want. This example assumes your local machine (127.0.0.1) is binding port 52311, but you can use a different IP address if docker is running on a remote machine. +10. Modify the remote of a test repository and push to the `test.git` repo within the Docker container. This example uses `git@github.com:octocat/Hello-World.git` but you can use any repository you want. This example assumes your local machine (127.0.0.1) is binding port 52311, but you can use a different IP address if docker is running on a remote machine. ```shell $ git clone git@github.com:octocat/Hello-World.git diff --git a/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md b/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md index 7393f3992e..806dd27df9 100644 --- a/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md +++ b/content/admin/policies/managing-pre-receive-hooks-on-the-github-enterprise-server-appliance.md @@ -68,4 +68,4 @@ A repository owner can only configure a hook if the site administrator selected 4. In the left sidebar, click **Hooks & Services**. ![Hooks and services](/assets/images/enterprise/repos/hooks-services.png) 5. Next to the pre-receive hook that you want to configure, click the **Hook permissions** drop-down menu. Select whether to enable or disable the pre-receive hook. -![Repo hook permissions](/assets/images/enterprise/repos/repo-hook-permissions.png) +![Repository hook permissions](/assets/images/enterprise/repos/repo-hook-permissions.png) diff --git a/content/admin/user-management/exporting-migration-data-from-githubcom.md b/content/admin/user-management/exporting-migration-data-from-githubcom.md index 2b499848ef..7856792cb0 100644 --- a/content/admin/user-management/exporting-migration-data-from-githubcom.md +++ b/content/admin/user-management/exporting-migration-data-from-githubcom.md @@ -35,7 +35,7 @@ The Migrations API is currently in a preview period, which means that the endpoi 1. Notify members of your organization that you'll be performing a migration. The export can take several minutes, depending on the number of repositories being exported. The full migration including import may take several hours so we recommend doing a trial run in order to determine how long the full process will take. For more information, see "[About Migrations](/enterprise/admin/migrations/about-migrations#types-of-migrations)." -2. Start a migration by `POST`ing to the migration endpoint. You'll need: +2. Start a migration by sending a `POST` request to the migration endpoint. You'll need: * Your access token for authentication. * A [list of the repositories](/rest/reference/repos#list-organization-repositories) you want to migrate: ```shell diff --git a/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md b/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md index 786051f2b8..c6e85b46cc 100644 --- a/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md +++ b/content/admin/user-management/preparing-to-migrate-data-to-your-enterprise.md @@ -128,13 +128,13 @@ The same process can be used to create mappings for each record that supports cu #### Applying modified migration data -1. After making changes, use the [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) command to apply your modified *conflicts.csv* (or any other mapping csv in the correct format) to the target instance: +1. After making changes, use the [`scp`](https://linuxacademy.com/blog/linux/ssh-and-scp-howto-tips-tricks#scp) command to apply your modified *conflicts.csv* (or any other mapping *.csv* file in the correct format) to the target instance: ```shell $ scp -P 122 ~/Desktop/conflicts.csv admin@hostname:/home/admin/ ``` -2. Re-map the migration data using the `ghe-migrator map` command, passing in the path to your modified csv file and the Migration GUID: +2. Re-map the migration data using the `ghe-migrator map` command, passing in the path to your modified *.csv* file and the Migration GUID: ```shell $ ghe-migrator map -i conflicts.csv -g MIGRATION_GUID diff --git a/content/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop.md b/content/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop.md index b54b8f7a63..49f5e18901 100644 --- a/content/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop.md +++ b/content/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop.md @@ -49,7 +49,7 @@ After you install {% data variables.product.prodname_desktop %}, you can configu {% mac %} -You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialogs, and set privacy preferences in the {% data variables.product.prodname_desktop %} Preferences window. For more information, see "[Configuring basic settings](/desktop/getting-started-with-github-desktop/configuring-basic-settings)." +You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Preferences window. For more information, see "[Configuring basic settings](/desktop/getting-started-with-github-desktop/configuring-basic-settings)." ![The basic settings in the Preference window](/assets/images/help/desktop/mac-appearance-tab-themes.png) @@ -57,7 +57,7 @@ You can connect or remove accounts on {% data variables.product.prodname_dotcom {% windows %} -You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialogs, and set privacy preferences in the {% data variables.product.prodname_desktop %} Options window. For more information, see "[Configuring basic settings](/desktop/getting-started-with-github-desktop/configuring-basic-settings)." +You can connect or remove accounts on {% data variables.product.prodname_dotcom %} or {% data variables.product.prodname_enterprise %}, choose a default text editor or shell, edit your Git configuration, change the appearance of {% data variables.product.prodname_desktop %}, customize system dialog boxes, and set privacy preferences in the {% data variables.product.prodname_desktop %} Options window. For more information, see "[Configuring basic settings](/desktop/getting-started-with-github-desktop/configuring-basic-settings)." ![The basic settings in the Options window](/assets/images/help/desktop/windows-appearance-tab-themes.png) diff --git a/content/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom.md b/content/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom.md index 0ed3baed4f..e1557e8113 100644 --- a/content/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom.md +++ b/content/education/manage-coursework-with-github-classroom/connect-a-learning-management-system-to-github-classroom.md @@ -36,7 +36,7 @@ Using LTI helps keep your information safe and secure. LTI is an industry-standa - Moodle - Sakai -Currently, {% data variables.product.prodname_classroom %} doesn't support import of roster data from Blackboard or Brightspace +Currently, {% data variables.product.prodname_classroom %} doesn't support import of roster data from Blackboard or Brightspace. ### Generating configuration credentials for your classroom @@ -45,7 +45,7 @@ Currently, {% data variables.product.prodname_classroom %} doesn't support impor {% data reusables.classroom.click-students %} 1. If your classroom already has a roster, you can either update the roster or delete the roster and create a new roster. - For more information about deleting and creating a roster, see "[Deleting a roster for a classroom](/education/manage-coursework-with-github-classroom/manage-classrooms#deleting-a-roster-for-a-classroom)" and "[Creating a roster for your classroom](/education/manage-coursework-with-github-classroom/manage-classrooms#creating-a-roster-for-your-classroom)." - - For more information about updating a roster, see "[Adding students to the roster for your classroom](/education/manage-coursework-with-github-classroom/manage-classrooms#adding-students-to-the-roster-for-your-classroom)." + - For more information about updating a roster, see "[Adding students to the roster for your classroom](/education/manage-coursework-with-github-classroom/manage-classrooms#adding-students-to-the-roster-for-your-classroom)." 1. In the list of LMSes, click your LMS. If your LMS is not supported, click **Other LMS**. ![List of LMSes](/assets/images/help/classroom/classroom-settings-click-lms.png) 1. Read about connecting your LMS, then click **Connect to _LMS_**. @@ -82,13 +82,13 @@ You can configure {% data variables.product.prodname_classroom %} as an external | **Shared Secret** | Shared secret from {% data variables.product.prodname_classroom %} | | **Allow this tool to access the IMS Names and Role Provisioning Service** | Enabled | | **Configuration URL** | Launch URL from {% data variables.product.prodname_classroom %} | - + {% note %} - + **Note**: If you don't see a checkbox in Canvas labeled "Allow this tool to access the IMS Names and Role Provisioning Service", then your Canvas administrator must contact Canvas support to enable membership service configuration for your Canvas account. Without enabling this feature, you won't be able to sync the roster from Canvas. For more information, see [How do I contact Canvas Support?](https://community.canvaslms.com/t5/Canvas-Basics-Guide/How-do-I-contact-Canvas-Support/ta-p/389767) on the Canvas website. - + {% endnote %} - + 1. Click **Submit**. 1. In the left sidebar, click **Home**. 1. To prompt Canvas to send a confirmation email, in the left sidebar, click **GitHub Classroom**. Follow the instructions in the email to finish linking {% data variables.product.prodname_classroom %}. diff --git a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md index 5580bb4b01..845faf1938 100644 --- a/content/education/manage-coursework-with-github-classroom/manage-classrooms.md +++ b/content/education/manage-coursework-with-github-classroom/manage-classrooms.md @@ -20,7 +20,7 @@ redirect_from: After you create a classroom, {% data variables.product.prodname_classroom %} will prompt you to invite teaching assistants (TAs) and admins to the classroom. Each classroom can have one or more admins. Admins can be teachers, TAs, or any other course administrator who you'd like to have control over your classrooms on {% data variables.product.prodname_classroom %}. -Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classrom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)." +Invite TAs and admins to your classroom by inviting the user accounts on {% data variables.product.product_name %} to your organization as organization owners and sharing the URL for your classroom. Organization owners can administer any classroom for the organization. For more information, see "[Permission levels for an organization](/github/setting-up-and-managing-organizations-and-teams/permission-levels-for-an-organization)" and "[Inviting users to join your organization](/github/setting-up-and-managing-organizations-and-teams/inviting-users-to-join-your-organization)." When you're done using a classroom, you can archive the classroom and refer to the classroom, roster, and assignments later, or you can delete the classroom if you no longer need the classroom. @@ -65,7 +65,7 @@ If your course already has a roster, you can update the students on the roster o ### Adding students to the roster for your classroom -Your classroom must have an existing roster to add students to the roster. For more information about creating a roster, see "[Creating a roster for your classrom](#creating-a-roster-for-your-classroom)." +Your classroom must have an existing roster to add students to the roster. For more information about creating a roster, see "[Creating a roster for your classroom](#creating-a-roster-for-your-classroom)." {% data reusables.classroom.sign-into-github-classroom %} {% data reusables.classroom.click-classroom-in-list %} diff --git a/content/education/manage-coursework-with-github-classroom/view-autograding-results.md b/content/education/manage-coursework-with-github-classroom/view-autograding-results.md index d631a18680..55c928c737 100644 --- a/content/education/manage-coursework-with-github-classroom/view-autograding-results.md +++ b/content/education/manage-coursework-with-github-classroom/view-autograding-results.md @@ -23,7 +23,7 @@ The **Actions** tab shows the full history of test runs. You can click a specific test run to review log output, like compilation errors and test failures. -![The "{% data variables.product.prodname_classroom %} Autograding Workflow" test results logs in {% data variables.product.prodname_actions %} ](/assets/images/help/classroom/autograding-actions-logs.png) +![The "{% data variables.product.prodname_classroom %} Autograding Workflow" test results logs in {% data variables.product.prodname_actions %} ](/assets/images/help/classroom/autograding-actions-logs.png) ### Further reading diff --git a/content/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces.md b/content/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces.md index 82ab059334..4fc3f4126f 100644 --- a/content/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces.md +++ b/content/github/developing-online-with-codespaces/managing-encrypted-secrets-for-codespaces.md @@ -29,7 +29,7 @@ You can choose which repositories should have access to each secret. Then, you c 1. To the right of "Codespaces secrets", click **New secret**. !["New secret" button](/assets/images/help/settings/codespaces-new-secret-button.png) 1. Under "Name", type a name for your secret. - !["Name" textbox](/assets/images/help/settings/codespaces-secret-name-field.png) + !["Name" text box](/assets/images/help/settings/codespaces-secret-name-field.png) {% data reusables.user_settings.codespaces-secret-value %} {% data reusables.user_settings.codespaces-secret-repository-access %} 1. Click **Add secret**. diff --git a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md index 065d9ded30..cc973aea5e 100644 --- a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md +++ b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio-code.md @@ -39,12 +39,12 @@ After you connect your {% data variables.product.product_name %} account to the ### Opening a codespace in {% data variables.product.prodname_vscode %} {% data reusables.codespaces.click-remote-explorer-icon-vscode %} -2. Under Codespaces, click the codespace you want to develop in. +2. Under "Codespaces", click the codespace you want to develop in. 3. Click the Connect to Codespace icon. ![The Connect to Codespace icon in {% data variables.product.prodname_vscode %}](/assets/images/help/codespaces/click-connect-to-codespace-icon-vscode.png) ### Deleting a codespace in {% data variables.product.prodname_vscode %} -1. Under Codespaces, right-click the codespace you want to delete. +1. Under "Codespaces", right-click the codespace you want to delete. 2. In the drop-down menu, click **Delete Codespace**. ![Deleting a codespace in {% data variables.product.prodname_dotcom %}](/assets/images/help/codespaces/delete-codespace-vscode.png) diff --git a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md index 43129ca548..64cedbedb9 100644 --- a/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md +++ b/content/github/developing-online-with-codespaces/using-codespaces-in-visual-studio.md @@ -12,7 +12,7 @@ versions: {% endnote %} -### About Codespaces in {% data variables.product.prodname_vs %} +### About codespaces in {% data variables.product.prodname_vs %} You can create a codespace in {% data variables.product.prodname_vs %} to develop applications in a Windows environment. When you use a codespace in {% data variables.product.prodname_vs %}, you can browse source code, build solutions, and commit changes to your repository. diff --git a/content/github/getting-started-with-github/create-a-repo.md b/content/github/getting-started-with-github/create-a-repo.md index 683c0983d8..e04f4e2030 100644 --- a/content/github/getting-started-with-github/create-a-repo.md +++ b/content/github/getting-started-with-github/create-a-repo.md @@ -16,7 +16,7 @@ You can store a variety of projects in {% data variables.product.product_name %} {% elsif enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} -You can store a variety of projects in {% data variables.product.product_name %} repositories, including innersource projects. With innersource, you can share code to make better, more reliable software. For more information on innersource, see {% data variables.product.company_short %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." +You can store a variety of projects in {% data variables.product.product_name %} repositories, including innersource projects. With innersource, you can share code to make better, more reliable software. For more information on innersource, see {% data variables.product.company_short %}'s white paper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." {% endif %} @@ -58,7 +58,7 @@ When you created your new repository, you initialized it with a *README* file. * Let's commit a change to the *README* file. 1. In your repository's list of files, click ***README.md***. - ![Readme file in file list](/assets/images/help/repository/create-commit-open-readme.png) + ![README file in file list](/assets/images/help/repository/create-commit-open-readme.png) 2. Above the file's content, click {% octicon "pencil" aria-label="The edit icon" %}. 3. On the **Edit file** tab, type some information about yourself. ![New content in file](/assets/images/help/repository/edit-readme-light.png) diff --git a/content/github/getting-started-with-github/fork-a-repo.md b/content/github/getting-started-with-github/fork-a-repo.md index 598d326259..74914f4ea5 100644 --- a/content/github/getting-started-with-github/fork-a-repo.md +++ b/content/github/getting-started-with-github/fork-a-repo.md @@ -25,11 +25,11 @@ For example, you can use forks to propose changes related to fixing a bug. Rathe Open source software is based on the idea that by sharing code, we can make better, more reliable software. For more information, see the "[About the Open Source Initiative](http://opensource.org/about)" on the Open Source Initiative. -For more information about applying open source principles to your organization's development work on {% data variables.product.product_location %}, see {% data variables.product.prodname_dotcom %}'s whitepaper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." +For more information about applying open source principles to your organization's development work on {% data variables.product.product_location %}, see {% data variables.product.prodname_dotcom %}'s white paper "[An introduction to innersource](https://resources.github.com/whitepapers/introduction-to-innersource/)." {% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %} -When creating your public repository from a fork of someone's project, make sure to include a license file that determines how you want your project to be shared with others. For more information, see "[Choose an open source license](http://choosealicense.com/)" at choosealicense. +When creating your public repository from a fork of someone's project, make sure to include a license file that determines how you want your project to be shared with others. For more information, see "[Choose an open source license](http://choosealicense.com/)" at choosealicense.com. {% data reusables.open-source.open-source-guide-repositories %} {% data reusables.open-source.open-source-learning-lab %} diff --git a/content/github/getting-started-with-github/git-and-github-learning-resources.md b/content/github/getting-started-with-github/git-and-github-learning-resources.md index 19943c46a0..eaa0caf0a9 100644 --- a/content/github/getting-started-with-github/git-and-github-learning-resources.md +++ b/content/github/getting-started-with-github/git-and-github-learning-resources.md @@ -15,7 +15,7 @@ authors: ### Using Git -Familiarize yourself with Git by visiting the [official Git project site](https://git-scm.com) and reading the [ProGit ebook](http://git-scm.com/book). You can review the [Git command list](https://git-scm.com/docs) or [Git command lookup reference](http://gitref.org) while using the [Try Git](https://try.github.com) simulator. +Familiarize yourself with Git by visiting the [official Git project site](https://git-scm.com) and reading the [ProGit book](http://git-scm.com/book). You can review the [Git command list](https://git-scm.com/docs) or [Git command lookup reference](http://gitref.org) while using the [Try Git](https://try.github.com) simulator. ### Using {% data variables.product.product_name %} diff --git a/content/github/getting-started-with-github/keyboard-shortcuts.md b/content/github/getting-started-with-github/keyboard-shortcuts.md index 2983f732dc..26090a8dae 100644 --- a/content/github/getting-started-with-github/keyboard-shortcuts.md +++ b/content/github/getting-started-with-github/keyboard-shortcuts.md @@ -161,8 +161,8 @@ For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirr |command + space or control + space | In the workflow editor, get suggestions for your workflow file. |g f | Go to the workflow file |shift + t or T | Toggle timestamps in logs -|shift + f or F | Toggle fullscreen logs -|esc | Exit fullscreen logs +|shift + f or F | Toggle full-screen logs +|esc | Exit full-screen logs {% endif %} diff --git a/content/github/getting-started-with-github/troubleshooting-connectivity-problems.md b/content/github/getting-started-with-github/troubleshooting-connectivity-problems.md index 4249a68c65..d90d234467 100644 --- a/content/github/getting-started-with-github/troubleshooting-connectivity-problems.md +++ b/content/github/getting-started-with-github/troubleshooting-connectivity-problems.md @@ -21,7 +21,7 @@ If you're having connectivity problems on your company or organization's network ### Troubleshooting the captcha If you're unable to verify with the captcha: -- Ensure javascript is enabled on your browser. +- Ensure JavaScript is enabled on your browser. - Ensure your browser is supported. If your browser isn't supported, upgrade your browser or install a supported browser. For a list of supported browsers, see "[Supported browsers](/articles/supported-browsers)." - Ensure your network configuration is not blocking https://octocaptcha.com/ or https://arkoselabs.com/. If you're behind a corporate firewall, contact your IT administrator to allow those domains. To verify access to these domains, visit https://octocaptcha.com/test and ensure the text "Connection successfully made!" is displayed, then visit https://client-demo.arkoselabs.com/github and ensure you are able to load the captcha. - Ensure your browser does not have plug-ins or extensions that may be interfering with GitHub. If so, temporarily disable the plug-ins or extensions during captcha verification. diff --git a/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md b/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md index c3cc863659..2620b22569 100644 --- a/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md +++ b/content/github/setting-up-and-managing-your-github-profile/viewing-contributions-on-your-profile.md @@ -54,11 +54,11 @@ Your contributions calendar shows your contribution activity. #### Viewing contributions from specific times - Click on a day's square to show the contributions made during that 24-hour period. -- Press *Shift* and click on another day's square to show contributions made during that timespan. +- Press *Shift* and click on another day's square to show contributions made during that time span. {% note %} -**Note:** You can select up to a one-month range on your contributions calendar. If you select a larger timespan, we will only display one month of contributions. +**Note:** You can select up to a one-month range on your contributions calendar. If you select a larger time span, we will only display one month of contributions. {% endnote %} diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md b/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md index c56e5dff8a..c51237a55c 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/sponsoring-an-open-source-contributor.md @@ -50,7 +50,7 @@ Before you can sponsor an account, you must have a verified email address. For m 1. Navigate to your sponsorship dashboard for the account. - To sponsor a developer, under the developer's name, click **Sponsor**. ![Sponsor button](/assets/images/help/profile/sponsor-button.png) - - To sponsor an organization, to the right of the the organization's name, click **Sponsor**. + - To sponsor an organization, to the right of the organization's name, click **Sponsor**. ![Sponsor button](/assets/images/help/sponsors/sponsor-org-button.png) 1. Optionally, on the right side of the page, to sponsor the account on behalf of your organization, use the **Sponsor as** drop-down menu, and click the organization. ![Drop-down menu to choose the account you'll sponsor as](/assets/images/help/sponsors/sponsor-as-drop-down-menu.png) diff --git a/content/github/supporting-the-open-source-community-with-github-sponsors/viewing-your-sponsors-and-sponsorships.md b/content/github/supporting-the-open-source-community-with-github-sponsors/viewing-your-sponsors-and-sponsorships.md index cf39f2e15c..20cf721790 100644 --- a/content/github/supporting-the-open-source-community-with-github-sponsors/viewing-your-sponsors-and-sponsorships.md +++ b/content/github/supporting-the-open-source-community-with-github-sponsors/viewing-your-sponsors-and-sponsorships.md @@ -30,5 +30,5 @@ You can export your sponsorship transactions by month. {% data variables.product {% data reusables.sponsors.activity-tab %} 1. Click {% octicon "download" aria-label="The download icon" %} **Export**. ![Export button](/assets/images/help/sponsors/export-all.png) -1. Choose a timeframe and a format for the data you'd like to export, then click **Start export**. +1. Choose a time frame and a format for the data you'd like to export, then click **Start export**. ![Options for data export](/assets/images/help/sponsors/export-your-sponsors.png) \ No newline at end of file diff --git a/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md b/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md index d1d49acece..d472ee4b10 100644 --- a/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md +++ b/content/github/working-with-github-pages/about-jekyll-build-errors-for-github-pages-sites.md @@ -17,7 +17,7 @@ versions: Sometimes, {% data variables.product.prodname_pages %} will not attempt to build your site after you push changes to your site's publishing source.{% if currentVersion == "free-pro-team@latest" %} - The person who pushed the changes hasn't verified their email address. For more information, see "[Verifying your email address](/articles/verifying-your-email-address)."{% endif %} - You're pushing with a deploy key. If you want to automate pushes to your site's repository, you can set up a machine user instead. For more information, see "[Managing deploy keys](/developers/overview/managing-deploy-keys#machine-users)." -- You're using a CI service that isn't configured to build your publishing source. For example, Travis CI won't build the `gh-pages` branch unless you add the branch to a safelist. For more information, see "[Customizing the build](https://docs.travis-ci.com/user/customizing-the-build/#safelisting-or-blocklisting-branches)" on Travis CI, or your CI service's documentation. +- You're using a CI service that isn't configured to build your publishing source. For example, Travis CI won't build the `gh-pages` branch unless you add the branch to a safe list. For more information, see "[Customizing the build](https://docs.travis-ci.com/user/customizing-the-build/#safelisting-or-blocklisting-branches)" on Travis CI, or your CI service's documentation. {% note %}