From 1c36bb982169f4fd1d84dcfea4073f9cf1e7ec2a Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 10 Nov 2021 12:41:21 +0100 Subject: [PATCH 1/6] fixes tombstoning bug --- .../converting-an-organization-into-a-user.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index 2f91d92795..27576077c4 100644 --- a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -16,12 +16,20 @@ shortTitle: Convert organization to user {% ifversion fpt or ghec %} +{% warning %} + +**Warning:** After an account is deleted, the username at the time of deletion becomes unavailable for reuse for 90 days. To reuse an organization's username immediately, you must change the username before you delete the organization. + + {% endwarning %} + 1. [Sign up](/articles/signing-up-for-a-new-github-account) for a new GitHub user account. 2. [Have the user's role changed to an owner](/articles/changing-a-person-s-role-to-owner). 3. {% data variables.product.signin_link %} to the new user account. 4. [Transfer each organization repository](/articles/how-to-transfer-a-repository) to the new user account. -5. [Delete the organization](/articles/deleting-an-organization-account). -6. [Rename the user](/articles/changing-your-github-username) to the organization's name. +5. [Rename the organization](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username) to make the current username available. +6. [Rename the user](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username) to the organization's name. +6. [Delete the organization](/organizations/managing-organization-settings/deleting-an-organization-account). + {% else %} From 0e87297a3d6a34e949a439f89ff40eef6d3f00ef Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 10 Nov 2021 12:51:15 +0100 Subject: [PATCH 2/6] clarifies username delay --- .../deleting-your-user-account.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md index 4a436ff103..3c7f8ac4e8 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md @@ -45,7 +45,7 @@ Before you delete your user account, make a copy of all repositories, private fo ![Account deletion button](/assets/images/help/settings/settings-account-delete.png) 4. In the "Make sure you want to do this" dialog box, complete the steps to confirm you understand what happens when your account is deleted: ![Delete account confirmation dialog](/assets/images/help/settings/settings-account-deleteconfirm.png) - {% ifversion fpt or ghec %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and pages owned by your account will be deleted, your billing will end, and your username will be available to anyone for use on {% data variables.product.product_name %}. + {% ifversion fpt or ghec %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and pages owned by your account will be deleted, your billing will end, and your username will be available to anyone for use on {% data variables.product.product_name %} again after 90 days. {% else %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and pages owned by your account will be deleted, and your username will be available for use on {% data variables.product.product_name %}. {% endif %}- In the first field, type your {% data variables.product.product_name %} username or email. - In the second field, type the phrase from the prompt. From 9c00b476ffe4df6c0a6dca1343a4757b7b0dfd66 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 10 Nov 2021 13:21:07 +0100 Subject: [PATCH 3/6] fix bold warning --- .../converting-an-organization-into-a-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index 27576077c4..902cefcc3c 100644 --- a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -18,7 +18,7 @@ shortTitle: Convert organization to user {% warning %} -**Warning:** After an account is deleted, the username at the time of deletion becomes unavailable for reuse for 90 days. To reuse an organization's username immediately, you must change the username before you delete the organization. +**Warning**: After an account is deleted, the username at the time of deletion becomes unavailable for reuse for 90 days. To reuse an organization's username immediately, you must change the username before you delete the organization. {% endwarning %} From d74751c05cc6cc29b09f16ea1529758d9cfc5f8a Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 10 Nov 2021 13:31:35 +0100 Subject: [PATCH 4/6] change warning to note --- .../converting-an-organization-into-a-user.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index 902cefcc3c..d77b25a0d3 100644 --- a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -16,11 +16,11 @@ shortTitle: Convert organization to user {% ifversion fpt or ghec %} -{% warning %} +{% note %} -**Warning**: After an account is deleted, the username at the time of deletion becomes unavailable for reuse for 90 days. To reuse an organization's username immediately, you must change the username before you delete the organization. +**Note**: After an account is deleted, the username at the time of deletion becomes unavailable for reuse for 90 days. To reuse an organization's username immediately, you must change the username before you delete the organization. - {% endwarning %} + {% endnote %} 1. [Sign up](/articles/signing-up-for-a-new-github-account) for a new GitHub user account. 2. [Have the user's role changed to an owner](/articles/changing-a-person-s-role-to-owner). From 89baeb2abb00984314224a63301d4112415e19ce Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Wed, 10 Nov 2021 13:36:53 +0100 Subject: [PATCH 5/6] fix number in list --- .../converting-an-organization-into-a-user.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md index d77b25a0d3..c303abd963 100644 --- a/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md +++ b/content/organizations/managing-organization-settings/converting-an-organization-into-a-user.md @@ -28,7 +28,7 @@ shortTitle: Convert organization to user 4. [Transfer each organization repository](/articles/how-to-transfer-a-repository) to the new user account. 5. [Rename the organization](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username) to make the current username available. 6. [Rename the user](/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/changing-your-github-username) to the organization's name. -6. [Delete the organization](/organizations/managing-organization-settings/deleting-an-organization-account). +7. [Delete the organization](/organizations/managing-organization-settings/deleting-an-organization-account). {% else %} From f61cac97a4e4a47df3e409cc2cb5284f9d756979 Mon Sep 17 00:00:00 2001 From: Jules Parker <19994093+jules-p@users.noreply.github.com> Date: Thu, 11 Nov 2021 07:54:52 +0100 Subject: [PATCH 6/6] Update content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md Co-authored-by: Laura Coursen --- .../deleting-your-user-account.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md index 3c7f8ac4e8..fc6276d612 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/deleting-your-user-account.md @@ -45,7 +45,7 @@ Before you delete your user account, make a copy of all repositories, private fo ![Account deletion button](/assets/images/help/settings/settings-account-delete.png) 4. In the "Make sure you want to do this" dialog box, complete the steps to confirm you understand what happens when your account is deleted: ![Delete account confirmation dialog](/assets/images/help/settings/settings-account-deleteconfirm.png) - {% ifversion fpt or ghec %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and pages owned by your account will be deleted, your billing will end, and your username will be available to anyone for use on {% data variables.product.product_name %} again after 90 days. + {% ifversion fpt or ghec %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and {% data variables.product.prodname_pages %} sites owned by your account will be deleted and your billing will end immediately, and your username will be available to anyone for use on {% data variables.product.product_name %} after 90 days. {% else %}- Recall that all repositories, forks of private repositories, wikis, issues, pull requests and pages owned by your account will be deleted, and your username will be available for use on {% data variables.product.product_name %}. {% endif %}- In the first field, type your {% data variables.product.product_name %} username or email. - In the second field, type the phrase from the prompt.