From ca8b750451c69ac1f85b3b952b007ef6fa6445e9 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Thu, 28 Jan 2021 11:52:38 +0000 Subject: [PATCH 1/3] Put visibility info closer to decision info --- .../creating-a-github-pages-site-with-jekyll.md | 4 ++-- .../creating-a-github-pages-site.md | 4 ++-- data/reusables/pages/new-or-existing-repo.md | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md b/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md index c75b0a636b62..9e9fa730b805 100644 --- a/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md +++ b/content/github/working-with-github-pages/creating-a-github-pages-site-with-jekyll.md @@ -25,8 +25,6 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % {% data reusables.pages.new-or-existing-repo %} -{% data reusables.pages.private_pages_are_public_warning %} - {% data reusables.repositories.create_new %} {% data reusables.repositories.owner-drop-down %} {% data reusables.pages.create-repo-name %} @@ -36,6 +34,8 @@ Before you can use Jekyll to create a {% data variables.product.prodname_pages % {% data reusables.pages.must-have-repo-first %} +{% data reusables.pages.private_pages_are_public_warning %} + {% data reusables.command_line.open_the_multi_os_terminal %} 2. If you don't already have a local copy of your repository, navigate to the location where you want to store your site's source files, replacing _PARENT-FOLDER_ with the folder you want to contain the folder for your repository. ```shell diff --git a/content/github/working-with-github-pages/creating-a-github-pages-site.md b/content/github/working-with-github-pages/creating-a-github-pages-site.md index 08acc1c05d20..d8d0f6a57dd1 100644 --- a/content/github/working-with-github-pages/creating-a-github-pages-site.md +++ b/content/github/working-with-github-pages/creating-a-github-pages-site.md @@ -20,8 +20,6 @@ versions: {% data reusables.pages.new-or-existing-repo %} -{% data reusables.pages.private_pages_are_public_warning %} - {% data reusables.repositories.create_new %} {% data reusables.repositories.owner-drop-down %} {% data reusables.pages.create-repo-name %} @@ -33,6 +31,8 @@ versions: {% data reusables.pages.must-have-repo-first %} +{% data reusables.pages.private_pages_are_public_warning %} + {% data reusables.pages.navigate-site-repo %} {% data reusables.pages.decide-publishing-source %} 3. If your chosen publishing source already exists, navigate to the publishing source. If your chosen publishing source doesn't exist, create the publishing source. diff --git a/data/reusables/pages/new-or-existing-repo.md b/data/reusables/pages/new-or-existing-repo.md index 4fdcdaf871e9..7e8369dd519a 100644 --- a/data/reusables/pages/new-or-existing-repo.md +++ b/data/reusables/pages/new-or-existing-repo.md @@ -1,3 +1,6 @@ -If your site is an independent project, you can create a new repository to store your site's source code. If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project. +If your site is an independent project, you can create a new repository to store your site's source code. In this case, it is best to create a public repository. {% data variables.product.prodname_pages %} is supported for private repositories for paid accounts, but using a public repository makes it easy to remember that the content is published publicly. + +If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project. If you want to create a site in an existing repository, skip to the "[Creating your site](#creating-your-site)" section. + From 9a9ff141fe079bca3b8ac63b00f2af96c777e2fa Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Mon, 1 Feb 2021 10:30:22 +0000 Subject: [PATCH 2/3] Clarify and add condition for GitHub.com only --- data/reusables/pages/new-or-existing-repo.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/reusables/pages/new-or-existing-repo.md b/data/reusables/pages/new-or-existing-repo.md index 7e8369dd519a..e2063a936f4d 100644 --- a/data/reusables/pages/new-or-existing-repo.md +++ b/data/reusables/pages/new-or-existing-repo.md @@ -1,6 +1,5 @@ -If your site is an independent project, you can create a new repository to store your site's source code. In this case, it is best to create a public repository. {% data variables.product.prodname_pages %} is supported for private repositories for paid accounts, but using a public repository makes it easy to remember that the content is published publicly. +If your site is an independent project, you can create a new repository to store your site's source code. {% if currentVersion == "free-pro-team@latest" %}If you are using a {% data variables.product.prodname_free_user %} or a {% data variables.product.prodname_free_team %} for organizations account, this should be a public repository.{% endif %} If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project. If you want to create a site in an existing repository, skip to the "[Creating your site](#creating-your-site)" section. - From 4845e1a08f0de8779e1bc01d6be2ee130cc80d98 Mon Sep 17 00:00:00 2001 From: Felicity Chapman Date: Tue, 2 Feb 2021 08:44:14 +0000 Subject: [PATCH 3/3] Update data/reusables/pages/new-or-existing-repo.md Co-authored-by: Laura Coursen --- data/reusables/pages/new-or-existing-repo.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/reusables/pages/new-or-existing-repo.md b/data/reusables/pages/new-or-existing-repo.md index e2063a936f4d..bfb5ba3b47a5 100644 --- a/data/reusables/pages/new-or-existing-repo.md +++ b/data/reusables/pages/new-or-existing-repo.md @@ -1,5 +1,5 @@ -If your site is an independent project, you can create a new repository to store your site's source code. {% if currentVersion == "free-pro-team@latest" %}If you are using a {% data variables.product.prodname_free_user %} or a {% data variables.product.prodname_free_team %} for organizations account, this should be a public repository.{% endif %} +If your site is an independent project, you can create a new repository to store your site's source code. If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project. -If your site is associated with an existing project, you can add the source code {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}to that project's repository, in a `/docs` folder on the default branch or on a different branch.{% else %}for your site to a `gh-pages` branch or a `docs` folder on the `master` branch in that project's repository.{% endif %} For example, if you're creating a site to publish documentation for a project that's already on {% data variables.product.product_name %}, you may want to store the source code for the site in the same repository as the project. +{% if currentVersion == "free-pro-team@latest" %}If the account that owns the repository uses {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_free_team %}, the repository must be public.{% endif %} If you want to create a site in an existing repository, skip to the "[Creating your site](#creating-your-site)" section.