Updated contributing procedure with GitHub workflow.

Author: y82

xml/en/community.xml

@@ -1,5 +1,4 @@
 <!--
-  Copyright (C) Igor Sysoev
   Copyright (C) Nginx, Inc.
   -->
 
@@ -8,7 +7,7 @@
 <article name="nginx: community"
          link="/en/community.html"
          lang="en"
-         rev="2">
+         rev="3">
 
 <section name="Community and Governance">
 
@@ -19,16 +18,15 @@ As the internet has grown, so have we, from our initial web server to the
 myriad of projects involving JavaScript, Kubernetes, API gateways,
 OpenTelemetry, and WebAssembly.
 NGINX is committed to open source both in ethos and practicality, aiming to
-deliver reliable and cutting-edge technology within a healthy open source
-culture.
+deliver reliable and cutting-edge technology
+within a healthy open source culture.
 Whether NGINX is part of your open source past or a step in your present,
 we welcome you into the future together.
 </para>
 
 <para>
 To learn more about our commitment, please visit
-our <link url="/en/docs/governance.html">Governance</link>
-page.
+our <link doc="docs/governance.xml">Governance</link> page.
 </para>
 
 </section>
@@ -37,8 +35,8 @@ page.
 <section name="Committed to Our Mission">
 
 <para>
-We believe that healthy communities are core to innovation and open source
-sustainability.
+We believe that healthy communities are core to innovation
+and open source sustainability.
 It is our mission to enable the NGINX community to engage with
 and develop solutions based on open and available NGINX technologies.
 Together we can power the future.
@@ -58,14 +56,15 @@ Thanks for joining us.
 <para>
 Per our values, NGINX strives to create an inclusive community for all.
 Please remember our
-<link url="https://github.com/nginxinc/.github/blob/main/CODE_OF_CONDUCT.md">
-Code of Conduct</link> (CoC) when participating in the NGINX community.
+<link url="https://github.com/nginx/nginx/blob/master/CODE_OF_CONDUCT.md">
+Code of Conduct</link>
+(CoC) when participating in the NGINX community.
 </para>
 
 <para>
-If you wish to tell us about a CoC violation, please email us here:
- <link url="mailto://[email protected]">[email protected]
-</link>
+If you wish to tell us about a CoC violation,
+please email us here:
+<link url="mailto://[email protected]">[email protected]</link>
 </para>
 
 </section>
@@ -78,6 +77,10 @@ Find the NGINX community here:
 
 <list type="bullet">
 
+<listitem>
+<link url="https://github.com/nginx/nginx/discussions">GitHub Discussions</link>
+</listitem>
+
 <listitem>
 <link url="https://community.nginx.org/joinslack">Slack</link>
 </listitem>
@@ -164,12 +167,12 @@ archive</link>
 </listitem>
 
 <listitem>
-<link url="http://trac.nginx.org/nginx/browser">
+<link url="https://github.com/nginx/nginx">
 Browse a Source Code</link>
 </listitem>
 
 <listitem>
-<link url="http://trac.nginx.org/nginx/report">
+<link url="https://github.com/nginx/nginx/issues">
 Report a Bug</link>
 </listitem>
 
@@ -187,9 +190,9 @@ Participate</link>
 <section name="Commercial Support">
 
 <para>
-We offer
+F5, Inc. offers
 <link url="https://www.f5.com/support">commercial support</link>
-for nginx and our commercial products.
+for nginx and its commercial products.
 </para>
 
 </section>

xml/en/docs/contributing_changes.xml

@@ -14,12 +14,12 @@
 <section id="getting_sources" name="Getting Sources">
 
 <para>
-<link url="https://www.mercurial-scm.org">Mercurial</link> is used
+<link url="https://github.com">GitHub</link> is used
 to store source code.
-The <link url="http://hg.nginx.org/nginx">repository</link> can be cloned
+The <link url="https://github.com/nginx/nginx">repository</link> can be cloned
 with the following command:
 <programlisting>
-hg clone http://hg.nginx.org/nginx
+git clone https://github.com/nginx/nginx.git
 </programlisting>
 </para>
 
@@ -39,34 +39,34 @@ code.
 </para>
 
 <para>
-Commit the changes to create a Mercurial
-<link url="https://www.mercurial-scm.org/wiki/ChangeSet">changeset</link>.
+<link url="https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits">Commit</link>
+the changes in your nginx GitHub fork.
 Please ensure that the specified
-<link url="https://www.mercurial-scm.org/wiki/QuickStart#Setting_a_username">e-mail</link>
-address and real name of the change’s author are correct.
+<link url="https://docs.github.com/en/get-started/getting-started-with-git/setting-your-username-in-git">e-mail</link>
+address and real name of the author are correct.
 </para>
 
 <para>
 The commit message should have a single-line synopsis followed by verbose
 description after an empty line.
-It is desirable that the first line is no longer than 67 symbols.
-The resulting changeset as a patch can be obtained using the
-<literal>hg export</literal> command:
+It is desirable that the first line is no longer than 67 symbols,
+and the remaining lines are no longer than 76 symbols.
+The resulting commit can be obtained using the
+<literal>git show</literal> command:
 <programlisting>
-# HG changeset patch
-# User Filipe Da Silva &lt;[email protected]>
-# Date 1368089668 -7200
-#      Thu May 09 10:54:28 2013 +0200
-# Node ID 2220de0521ca2c0b664a8ea1e201ce1cb90fd7a2
-# Parent  822b82191940ef309cd1e6502f94d50d811252a1
-Mail: removed surplus ngx_close_connection() call.
+commit 8597218f386351d6c6cdced24af6716e19a18fc3
+Author: Filipe Da Silva &lt;[email protected]&gt;
+Date:   Thu May 9 10:54:28 2013 +0200
 
-It is already called for a peer connection a few lines above.
+    Mail: removed surplus ngx_close_connection() call.
 
-diff -r 822b82191940 -r 2220de0521ca src/mail/ngx_mail_auth_http_module.c
---- a/src/mail/ngx_mail_auth_http_module.c      Wed May 15 15:04:49 2013 +0400
-+++ b/src/mail/ngx_mail_auth_http_module.c      Thu May 09 10:54:28 2013 +0200
-@@ -699,7 +699,6 @@ ngx_mail_auth_http_process_headers(ngx_m
+    It is already called for a peer connection a few lines above.
+
+diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
+index 2e9b9f24d..8094bbc5c 100644
+--- a/src/mail/ngx_mail_auth_http_module.c
++++ b/src/mail/ngx_mail_auth_http_module.c
+@@ -699,7 +699,6 @@ ngx_mail_auth_http_process_headers(ngx_mail_session_t *s,
 
                      p = ngx_pnalloc(s->connection->pool, ctx->err.len);
                      if (p == NULL) {
@@ -100,10 +100,10 @@ case, if possible.
 <listitem>
 Passing your changes through the test suite is a good way to ensure
 that they do not cause a regression.
-The <link url="http://hg.nginx.org/nginx-tests">repository</link> with
+The <link url="https://github.com/nginx/nginx-tests">repository</link> with
 tests can be cloned with the following command:
 <programlisting>
-hg clone http://hg.nginx.org/nginx-tests
+git clone https://github.com/nginx/nginx-tests.git
 </programlisting>
 </listitem>
 
@@ -116,13 +116,10 @@ hg clone http://hg.nginx.org/nginx-tests
 <section id="submitting_changes" name="Submitting Changes">
 
 <para>
-The proposed changes should be sent to the
-<link doc="../support.xml" id="nginx_devel">nginx development</link>
-mailing list.
-The preferred and convenient method of submitting changesets
-is with the
-<link url="https://www.mercurial-scm.org/wiki/PatchbombExtension">patchbomb</link>
-extension.
+The proposed changes should be submitted from your fork to
+<link url="https://github.com/nginx/nginx">nginx repository</link>
+as a
+<link url="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork">pull request</link>.
 </para>
 
 </section>
@@ -131,9 +128,14 @@ extension.
 <section id="website" name="Website">
 
 <para>
-<link url="https://www.github.com/nginx/nginx.org">GitHub</link> is used
-to store the sources for this website. Documentation changes should be
-submitted as a pull request.
+GitHub is used to store the sources for this website.
+The <link url="https://www.github.com/nginx/nginx.org">repository</link>
+can be cloned with the following command:
+<programlisting>
+git clone https://github.com/nginx/nginx.org.git
+</programlisting>
+Documentation changes should be submitted from your fork
+as a pull request.
 </para>
 
 </section>

xml/en/docs/governance.xml

@@ -21,10 +21,11 @@ NGINX is proud to be part of that change, from our very beginning.
 </para>
 
 <para>
-NGINX embraces open source ethos and intends to remain an active contributor
-and leader in the ecosystem.
-This is encapsulated by our Core Commitments and Principles, which serve to
-help the longevity, transparency, and impact of our open source projects.
+NGINX embraces open source ethos and intends to remain
+an active contributor and leader in the ecosystem.
+This is encapsulated by our Core Commitments and Principles,
+which serve to help the longevity, transparency,
+and impact of our open source projects.
 </para>
 
 </section>

xml/en/docs/howto_build_on_win32.xml

@@ -9,7 +9,7 @@
 <article name="Building nginx on the Win32 platform with Visual C"
          link="/en/docs/howto_build_on_win32.html"
          lang="en"
-         rev="27">
+         rev="28">
 
 <section name="Prerequisites">
 
@@ -35,7 +35,7 @@ or <link url="http://strawberryperl.com">Strawberry Perl</link>.
 </listitem>
 
 <listitem>
-<link url="https://www.mercurial-scm.org">Mercurial</link> client.
+<link url="https://cli.github.com/">Git</link> client.
 </listitem>
 
 <listitem>
@@ -52,7 +52,7 @@ and <link url="http://www.openssl.org">OpenSSL</link> libraries sources.
          name="Build steps">
 
 <para>
-Ensure that paths to Perl, Mercurial and MSYS bin directories are added to
+Ensure that paths to Perl, Git and MSYS bin directories are added to
 PATH environment variable before you start build. To set Visual C environment
 run vcvarsall.bat script from Visual C directory.
 </para>
@@ -67,9 +67,9 @@ Start MSYS bash.
 </listitem>
 
 <listitem>
-Check out nginx sources from the hg.nginx.org repository. For example:
+Check out nginx sources from the GitHub repository:
 <programlisting>
-hg clone http://hg.nginx.org/nginx
+git clone https://github.com/nginx/nginx.git
 </programlisting>
 </listitem>
 

xml/en/download.xml

@@ -8,7 +8,7 @@
 <article name="nginx: download"
          link="/en/download.html"
          lang="en"
-         rev="3">
+         rev="4">
 
 
 <section name="Mainline version">
@@ -35,41 +35,35 @@
 <section name="Source Code">
 
 <para>
-Read-only Mercurial repositories:
+GitHub repositories:
 <list type="bullet">
 
 <listitem>
-code: <literal>http://hg.nginx.org/nginx</literal>
+code: <literal>https://github.com/nginx/nginx</literal>
 </listitem>
 
 <listitem>
-website: <literal>http://hg.nginx.org/nginx.org</literal>
-(mirror of GitHub repository)
+website: <literal>https://github.com/nginx/nginx.org</literal>
 </listitem>
 
 </list>
 </para>
 
 <para>
-GitHub repositories:
+Mercurial mirrors:
 <list type="bullet">
 
 <listitem>
-code: <link url="https://github.com/nginx/nginx"/>
-(mirror of Mercurial repository)
+code: <literal>http://hg.nginx.org/nginx</literal>
 </listitem>
 
 <listitem>
-website: <link url="https://github.com/nginx/nginx.org"/>
+website: <literal>http://hg.nginx.org/nginx.org</literal>
 </listitem>
 
 </list>
 </para>
 
-<para>
-<link url="http://trac.nginx.org/nginx/browser">Trac source browser</link>
-</para>
-
 </section>
 
 

xml/en/security_advisories.xml

@@ -14,7 +14,9 @@
 
 <para>
 All nginx security issues should be reported to
-<link url="mailto:[email protected]">[email protected]</link>.
+<link url="mailto:[email protected]">[email protected]</link>
+or via one of the methods listed
+<link url="https://github.com/nginx/nginx/blob/update_security_file/SECURITY.md">here</link>.
 </para>
 
 <para>

xml/menu.xml

@@ -189,7 +189,7 @@
 <item href="/ru/docs/"> документация </item>
 <item href="/ru/docs/faq.html"> faq </item>
 <item href="/en/books.html" lang="en"> книги </item>
-<item href="/ru/support.html"> поддержка </item>
+<item href="/ru/community.html"> сообщество </item>
 <item />
 
 <item href="http://trac.nginx.org/nginx"> trac </item>

xml/ru/GNUmakefile

@@ -20,6 +20,7 @@ DOCS =									\
 		beginners_guide						\
 		configure						\
 		quic							\
+		governance						\
 
 FAQ =									\
 		sys_errlist						\
@@ -126,5 +127,5 @@ REFS =									\
 
 TOP =									\
 		download						\
-		support							\
+		community						\
 		linux_packages						\