From c9543d027ab7709b3b00a57f8fc93b32235b1235 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Nov 13 2020 23:12:47 +0000 Subject: Migrate default git branch from master to main (closes #86) Last month, GitHub switched their default git branch from `master` to `main`. So, if GitHub is doing it for their millions and millions of repos and users, there are few good reasons not to for this repo. https://github.com/github/renaming This commit changes all references of `master` to `main` in the Antora site configuration. This commit is already pushed to a git branch, `main`, on the council-docs repo. But this commit will be opened as a Pull Request to the `master` branch. **Do not merge without coordinating on the fedora-docs/docs-fp-o PR**. If the builder is still configured to build onto `master`, well, that obviously will not work. Please coordinate these changes simultaneously. Closes #86. cc: @mattdm Signed-off-by: Justin W. Flory (he/him) --- diff --git a/council/antora.yml b/council/antora.yml index 97ec4f4..2ed6d04 100644 --- a/council/antora.yml +++ b/council/antora.yml @@ -1,11 +1,11 @@ # Name will be mostly visible in the URL. Treat it as an indentifier. # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: council -# Title will be visible on the page. +# Title will be visible on the page. title: Fedora Council # If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: master -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +version: main +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component. nav: diff --git a/council/modules/ROOT/pages/index.adoc b/council/modules/ROOT/pages/index.adoc index b69e33b..033198f 100644 --- a/council/modules/ROOT/pages/index.adoc +++ b/council/modules/ROOT/pages/index.adoc @@ -321,7 +321,7 @@ https://fedorahosted.org/council/ticket/13[Oct. 9th, 2014] and is in effect as of Nov. 26th, 2014. Any other significant changes will be noted here; smaller changes (minor wording or formating, etc., without impact on meaning) can be found in the -https://pagure.io/Fedora-Council/council-docs/commits/master[git repository] +https://pagure.io/Fedora-Council/council-docs/commits/main[git repository] for Council documents. 2017-11-15: Update Diversity Advisor to Diversity Team Representative diff --git a/council/modules/ROOT/pages/procedures/team_directory.adoc b/council/modules/ROOT/pages/procedures/team_directory.adoc index 6fcf5a6..91d77c5 100644 --- a/council/modules/ROOT/pages/procedures/team_directory.adoc +++ b/council/modules/ROOT/pages/procedures/team_directory.adoc @@ -16,7 +16,7 @@ However, presence in the directory may be used by other teams to evaluate fundin == Content -Teams should list the following information in the format specified by https://pagure.io/Fedora-Council/council-docs/blob/master/f/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc[the template]: +Teams should list the following information in the format specified by https://pagure.io/Fedora-Council/council-docs/blob/main/f/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc[the template]: * Team name * Team summary @@ -51,7 +51,7 @@ Checks can be done at any time, but should be done around the branch date for ea The directory requires a file that contains the information about the team. The suggested naming convention is `NAME_team_info.adoc`, but any valid file name is acceptable. The file may be stored in the team's own documentation repository or in the https://pagure.io/Fedora-Council/council-docs/[council-docs repository]. -See the https://pagure.io/Fedora-Council/council-docs/blob/master/f/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc[example template] for format and structure. +See the https://pagure.io/Fedora-Council/council-docs/blob/main/f/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc[example template] for format and structure. === Rendering the directory @@ -60,5 +60,5 @@ After `include`-ing the info file, the index page must include the `team_render. === Reusing the data on team pages -Teams can include their `NAME_team_info.adoc` file on their page(s), and then use `{team_name}`, `{team_summary}` etc. anywhere on the page. +Teams can include their `NAME_team_info.adoc` file on their page(s), and then use `{team_name}`, `{team_summary}` etc. anywhere on the page. diff --git a/engineering/antora.yml b/engineering/antora.yml index a36817b..f2aa43d 100644 --- a/engineering/antora.yml +++ b/engineering/antora.yml @@ -2,13 +2,13 @@ # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: engineering # <---- PLEASE MODIFY -# Title will be visible on the page. +# Title will be visible on the page. title: Engineering Teams # <---- PLEASE MODIFY -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: master +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. +version: main -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component. diff --git a/mindshare/antora.yml b/mindshare/antora.yml index 1d1dbfe..65a46e7 100644 --- a/mindshare/antora.yml +++ b/mindshare/antora.yml @@ -2,13 +2,13 @@ # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: mindshare # <---- PLEASE MODIFY -# Title will be visible on the page. +# Title will be visible on the page. title: Mindshare Teams # <---- PLEASE MODIFY -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: master +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. +version: main -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component. diff --git a/project/antora.yml b/project/antora.yml index 855b68b..20f8c54 100644 --- a/project/antora.yml +++ b/project/antora.yml @@ -2,13 +2,13 @@ # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: project -# Title will be visible on the page. +# Title will be visible on the page. title: Fedora Project -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: master +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. +version: main -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component.