From c8ade94a255fcc8535456cba1c453508e36c44c5 Mon Sep 17 00:00:00 2001 From: Rafael Fontenelle Date: Sep 28 2020 15:03:34 +0000 Subject: Fix pull request name Pagure has 'pull request', not 'merge request' --- diff --git a/modules/contributing/pages/adding-new-docs.adoc b/modules/contributing/pages/adding-new-docs.adoc index 59517a1..8eb6fad 100644 --- a/modules/contributing/pages/adding-new-docs.adoc +++ b/modules/contributing/pages/adding-new-docs.adoc @@ -27,13 +27,13 @@ Before you start creating an entirely new documentation set, consult the mailing . Once you finish, commit your changes and push them to your fork. -. Use pagure to make a merge request from your fork to the main repository's master branch. +. Use pagure to make a pull request from your fork to the main repository's master branch. -. Someone will see your merge request and either merge it, or provide feedback if there is something you should change. Work with the people commenting to make sure your contributions are up to standards. +. Someone will see your pull request and either merge it, or provide feedback if there is something you should change. Work with the people commenting to make sure your contributions are up to standards. + [NOTE] ==== -If nobody reacts to your merge request in several days, try bringing it up on one of the link:++https://apps.fedoraproject.org/calendar/docs/++[weekly meetings], the IRC channel (`#fedora-docs` on FreeNode), or the link:++https://lists.fedoraproject.org/archives/list/docs@lists.fedoraproject.org/++[mailing list]. +If nobody reacts to your pull request in several days, try bringing it up on one of the link:++https://apps.fedoraproject.org/calendar/docs/++[weekly meetings], the IRC channel (`#fedora-docs` on FreeNode), or the link:++https://lists.fedoraproject.org/archives/list/docs@lists.fedoraproject.org/++[mailing list]. ==== . Your new content will need to be published for the first time, and at the moment this does not happen automatically. Send an e-mail to the link:++https://lists.fedoraproject.org/archives/list/docs@lists.fedoraproject.org/++[docs mailing list] asking for your content to be published. diff --git a/modules/contributing/pages/local-preview.adoc b/modules/contributing/pages/local-preview.adoc index 50c7f39..5f328b9 100644 --- a/modules/contributing/pages/local-preview.adoc +++ b/modules/contributing/pages/local-preview.adoc @@ -1,7 +1,7 @@ :experimental: = Building a local preview -Because the documentation site is using a markup language instead of a WYSIWYG editor, the sources do not look exactly like the rendered page will. Therefore it is necessary to check that your changes look the way you want them to before you push and make a merge request. This involves building a local preview. +Because the documentation site is using a markup language instead of a WYSIWYG editor, the sources do not look exactly like the rendered page will. Therefore it is necessary to check that your changes look the way you want them to before you push and make a pull request. This involves building a local preview. There are two shell scripts available in each existing repository (including the template repository used to create new content): `build.sh` and `preview.sh`.