From 229fc9ab11ebeda8a013a9f3747954037ff02fca Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Mon, 19 Oct 2020 14:00:20 +0530 Subject: [PATCH 1/7] Simplified language in translation page --- documenting.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/documenting.rst b/documenting.rst index 4b1b76bce7..548dca8088 100644 --- a/documenting.rst +++ b/documenting.rst @@ -1790,10 +1790,9 @@ Ask on doc-sig, or better, make a PR on the `devguide I have a translation, but not on git, what should I do? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Just ask for help on the doc-sig mailing list and our python-fu, git-fu -and bash-fu combined will help you create an appropriate repository. If -you use a tool like transifex don’t worry. Keeping them in sync is not -that hard. +Ask for help on the doc-sig mailing list and our python console, git +and bash command line interface combined will help you create an appropriate repository. +Using a tool like transifex can help keeping them in sync. My git hierarchy does not match yours, can I keep it? From 4cfb57567ac679ed4aec47f5ae12bc82e1bf4e4c Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:09:28 +0530 Subject: [PATCH 2/7] Simplified the language Co-authored-by: Carol Willing --- documenting.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documenting.rst b/documenting.rst index 548dca8088..1caa460ea2 100644 --- a/documenting.rst +++ b/documenting.rst @@ -1790,7 +1790,7 @@ Ask on doc-sig, or better, make a PR on the `devguide I have a translation, but not on git, what should I do? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Ask for help on the doc-sig mailing list and our python console, git +Ask for help on the doc-sig mailing list and bash command line interface combined will help you create an appropriate repository. Using a tool like transifex can help keeping them in sync. From c60e7528fd6fd52462b67f27dae5f4f0d6da52ad Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:09:39 +0530 Subject: [PATCH 3/7] Simplified the language Co-authored-by: Carol Willing --- documenting.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documenting.rst b/documenting.rst index 1caa460ea2..9ab3f28f39 100644 --- a/documenting.rst +++ b/documenting.rst @@ -1791,7 +1791,7 @@ I have a translation, but not on git, what should I do? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Ask for help on the doc-sig mailing list -and bash command line interface combined will help you create an appropriate repository. +about creating an appropriate repository. Using a tool like transifex can help keeping them in sync. From 05fdb7115242d1795d63bf8be83390cde89e0497 Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:09:57 +0530 Subject: [PATCH 4/7] Simplified the language Co-authored-by: Carol Willing --- documenting.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documenting.rst b/documenting.rst index 9ab3f28f39..e1adf835f4 100644 --- a/documenting.rst +++ b/documenting.rst @@ -1792,7 +1792,7 @@ I have a translation, but not on git, what should I do? Ask for help on the doc-sig mailing list about creating an appropriate repository. -Using a tool like transifex can help keeping them in sync. +Using a tool like transifex can help keep translations in sync. My git hierarchy does not match yours, can I keep it? From 50155221b68f6f336442484e8d97c6ca3be4c38c Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:42:05 +0530 Subject: [PATCH 5/7] Updated Zulip to Discourse --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 2b4e26dd16..6bc361e8fc 100644 --- a/README.rst +++ b/README.rst @@ -7,9 +7,9 @@ The CPython Developer's Guide :target: https://devguide.python.org :alt: Documentation Status -.. |Zulip| image:: https://img.shields.io/badge/zulip-join_chat-brightgreen.svg - :alt: Python Zulip chat - :target: https://python.zulipchat.com +.. |Discourse| image:: https://img.shields.io/badge/discourse-join_chat-brightgreen.svg + :alt: Python Discourse chat + :target: https://pypi.org/project/pydiscourse/ .. |Codestyle| image:: https://img.shields.io/badge/code%20style-black-000000.svg :target: https://github.com/psf/black From 8c078bbff1a182ff81d64e0950c500e7eca6229a Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 09:46:13 +0530 Subject: [PATCH 6/7] Update zulip to discourse --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6bc361e8fc..515b3cf773 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ The CPython Developer's Guide ============================= -|ReadTheDocs| |Zulip| |Codestyle| +|ReadTheDocs| |Discourse| |Codestyle| .. |ReadTheDocs| image:: https://readthedocs.org/projects/cpython-devguide/badge/ :target: https://devguide.python.org From 5c9e4dcd952e82d3418de3da5c863d2872b1ba86 Mon Sep 17 00:00:00 2001 From: Aliya Rahmani <65673692+aliya-rahmani@users.noreply.github.com> Date: Tue, 20 Oct 2020 17:51:02 +0530 Subject: [PATCH 7/7] Update README.rst --- README.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 515b3cf773..29f09b4404 100644 --- a/README.rst +++ b/README.rst @@ -1,15 +1,15 @@ The CPython Developer's Guide ============================= -|ReadTheDocs| |Discourse| |Codestyle| +|ReadTheDocs| |Zulip| |Codestyle| .. |ReadTheDocs| image:: https://readthedocs.org/projects/cpython-devguide/badge/ :target: https://devguide.python.org :alt: Documentation Status -.. |Discourse| image:: https://img.shields.io/badge/discourse-join_chat-brightgreen.svg - :alt: Python Discourse chat - :target: https://pypi.org/project/pydiscourse/ +.. |Zulip| image:: https://img.shields.io/badge/zulip-join_chat-brightgreen.svg + :alt: Python Zulip chat + :target: https://python.zulipchat.com .. |Codestyle| image:: https://img.shields.io/badge/code%20style-black-000000.svg :target: https://github.com/psf/black @@ -29,4 +29,3 @@ supports the ``venv`` module, because the ``make html`` command will create a virtual environment and will install the ``Sphinx`` package:: make html -