diff --git a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
index b17745585b5e..bb0910cc2b0e 100644
--- a/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
+++ b/content/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent.md
@@ -20,18 +20,26 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% data reusables.command_line.open_the_multi_os_terminal %}
2. Paste the text below, substituting in your {% data variables.product.product_name %} email address.
```shell
- $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ $ ssh-keygen -t ed25519 -C "your_email@example.com"
```
+ {% note %}
+
+ **Note:** If you are using a legacy system that doesn't support the Ed25519 algorithm, use:
+ ```shell
+ $ ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
+ ```
+
+ {% endnote %}
This creates a new ssh key, using the provided email as a label.
```shell
- > Generating public/private rsa key pair.
+ > Generating public/private ed25519 key pair.
```
3. When you're prompted to "Enter a file in which to save the key," press Enter. This accepts the default file location.
{% mac %}
```shell
- > Enter a file in which to save the key (/Users/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/Users/you/.ssh/id_ed25519): [Press enter]
```
{% endmac %}
@@ -39,7 +47,7 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% windows %}
```shell
- > Enter a file in which to save the key (/c/Users/you/.ssh/id_rsa):[Press enter]
+ > Enter a file in which to save the key (/c/Users/you/.ssh/id_ed25519):[Press enter]
```
{% endwindows %}
@@ -47,7 +55,7 @@ If you don't want to reenter your passphrase every time you use your SSH key, yo
{% linux %}
```shell
- > Enter a file in which to save the key (/home/you/.ssh/id_rsa): [Press enter]
+ > Enter a file in which to save the key (/home/you/.ssh/id_ed25519): [Press enter]
```
{% endlinux %}
@@ -81,18 +89,18 @@ Before adding a new SSH key to the ssh-agent to manage your keys, you should hav
$ touch ~/.ssh/config
```
- * Open your `~/.ssh/config` file, then modify the file, replacing ` ~/.ssh/id_rsa` if you are not using the default location and name for your `id_rsa` key.
+ * Open your `~/.ssh/config` file, then modify the file, replacing ` ~/.ssh/id_ed25519` if you are not using the default location and name for your `id_ed25519` key.
```
Host *
AddKeysToAgent yes
UseKeychain yes
- IdentityFile ~/.ssh/id_rsa
+ IdentityFile ~/.ssh/id_ed25519
```
3. Add your SSH private key to the ssh-agent and store your passphrase in the keychain. {% data reusables.ssh.add-ssh-key-to-ssh-agent %}
```shell
- $ ssh-add -K ~/.ssh/id_rsa
+ $ ssh-add -K ~/.ssh/id_ed25519
```
{% note %}
diff --git a/content/github/working-with-github-pages/about-github-pages.md b/content/github/working-with-github-pages/about-github-pages.md
index 322179be556a..c030e487fdbf 100644
--- a/content/github/working-with-github-pages/about-github-pages.md
+++ b/content/github/working-with-github-pages/about-github-pages.md
@@ -34,9 +34,9 @@ Organization owners can disable the publication of {% data variables.product.pro
There are three types of {% data variables.product.prodname_pages %} sites: project, user, and organization. Project sites are connected to a specific project hosted on {% data variables.product.product_name %}, such as a JavaScript library or a recipe collection. User and organization sites are connected to a specific {% data variables.product.product_name %} account.
-To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
+To publish a user site, you must create a repository owned by your user account that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. To publish an organization site, you must create a repository owned by an organization that's named {% if currentVersion == "free-pro-team@latest" %}`.github.io`{% else %}`.`{% endif %}. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, user and organization sites are available at `http(s)://.github.io` or `http(s)://.github.io`.{% elsif currentVersion == "github-ae@latest" %}User and organization sites are available at `http(s)://pages./` or `http(s)://pages./`.{% endif %}
-The source files for a project site are stored in the same repository as their project. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
+The source files for a project site are stored in the same repository as their project. {% if currentVersion == "free-pro-team@latest" %}Unless you're using a custom domain, project sites are available at `http(s)://.github.io/` or `http(s)://.github.io/`.{% elsif currentVersion == "github-ae@latest" %}Project sites are available at `http(s)://pages.///` or `http(s)://pages.///`.{% endif %}
{% if currentVersion == "free-pro-team@latest" %}
For more information about how custom domains affect the URL for your site, see "[About custom domains and {% data variables.product.prodname_pages %}](/articles/about-custom-domains-and-github-pages)."
@@ -60,7 +60,7 @@ For more information, see "[Enabling subdomain isolation](/enterprise/{{ current
{% if currentVersion == "free-pro-team@latest" %}
{% note %}
-**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
+**Note:** Repositories using the legacy `.github.com` naming scheme will still be published, but visitors will be redirected from `http(s)://.github.com` to `http(s)://.github.io`. If both a `.github.com` and `.github.io` repository exist, only the `.github.io` repository will be published.
{% endnote %}
{% endif %}