Updates because of the migration to gitbox
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 2a2b867..9e1fd77 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -509,8 +509,8 @@
<title>Source code (Git)</title>
<para>The project repositories are at the Apache Software Foundation.
- These Apache repositories are mirrored back to GitHub (read-only), which
- is practical for sending patches via usual GitHub forking and pull
+ These Apache repositories are also accessible through GitHub, which is
+ practical for sending patches via usual GitHub forking and pull
requests.</para>
<para>The key repositories are:</para>
@@ -575,7 +575,7 @@
<para>There are some other FreeMarker-related repositories, such FMPP
and Tutorials, which you can only find on the <olink
targetdoc="githubProjectOld">old GitHub project</olink> page, as they
- aren't part of the ongoing Apache Incubation effort.</para>
+ aren't part of the project at Apache.</para>
</section>
<section>
@@ -1391,24 +1391,9 @@
</listitem>
</itemizedlist>
- <para>To merge the pull request:</para>
-
- <programlisting language="unknown">git pull --no-ff https://github.com/apache/<PROJECT> refs/pull/<PR_NUMBER>/head</programlisting>
-
- <para>Where:</para>
-
- <itemizedlist>
- <listitem>
- <para><literal> <replaceable><PROJECT></replaceable>
- </literal>is usually <literal>freemarker</literal></para>
- </listitem>
-
- <listitem>
- <para><literal> <replaceable><PR_NUMBER></replaceable>
- </literal>is the pull request number that GitHub shows prominently
- after a <quote>#</quote></para>
- </listitem>
- </itemizedlist>
+ <para>To merge the pull request, the merge button on Github should
+ work (since we have migrated to gitbox - earlier it was more
+ complicated).</para>
<para>The commit comment should automatically describe that it's a
merge and where it was merged from. After that you may also want to
@@ -1417,37 +1402,13 @@
<para>In general, pull request merge commits should adhere to the same
policies that Committers use to commit directly into the Apache git
repository.</para>
-
- <para>Pushing the merge commit to the ASF repo will automatically
- close the pull request on Github.</para>
</section>
<section xml:id="close-pull-request-without-merging">
<title>Closing GitHub pull requests without merging</title>
- <programlisting language="unknown">git commit --allow-empty -m "closes apache/<PROJECT>#<PR_NUMBER>: <WHY>"</programlisting>
-
- <para>Where:</para>
-
- <itemizedlist>
- <listitem>
- <para><literal> <replaceable><PROJECT></replaceable>
- </literal>is usually <literal>freemarker</literal></para>
- </listitem>
-
- <listitem>
- <para><literal> <replaceable><PR_NUMBER></replaceable>
- </literal>is the pull request number that GitHub shows prominently
- after a <quote>#</quote></para>
- </listitem>
-
- <listitem>
- <para><literal> <replaceable><WHY></replaceable>
- </literal>is the reason of the closing. For clarity, you may want
- to end it with <quote>Closed PR without merging.</quote> or
- something similar.</para>
- </listitem>
- </itemizedlist>
+ <para>Yet again the github buttons for this should work. You should
+ state the reason of closing in the closing comment.</para>
</section>
<section xml:id="making-releases">
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 7e37126..f92ae0c 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -68,13 +68,13 @@
// External URL-s:
onlineTemplateTester: "https://try.freemarker.apache.org/"
twitter: "https://twitter.com/freemarker"
- gitFreemarker: "https://git-wip-us.apache.org/repos/asf/freemarker.git"
+ gitFreemarker: "https://gitbox.apache.org/repos/asf/freemarker.git"
githubMirrorFreemarker: "https://github.com/apache/freemarker"
- gitDocgen: "https://git-wip-us.apache.org/repos/asf/freemarker-docgen.git"
+ gitDocgen: "https://gitbox.apache.org/repos/asf/freemarker-docgen.git"
githubMirrorDocgen: "https://github.com/apache/freemarker-docgen"
- gitSite: "https://git-wip-us.apache.org/repos/asf/freemarker-site.git"
+ gitSite: "https://gitbox.apache.org/repos/asf/freemarker-site.git"
githubMirrorSite: "https://github.com/apache/freemarker-site"
- gitOnlineTester: "https://git-wip-us.apache.org/repos/asf/freemarker-online-tester.git"
+ gitOnlineTester: "https://gitbox.apache.org/repos/asf/freemarker-online-tester.git"
githubMirrorOnlineTester: "https://github.com/apache/freemarker-online-tester"
githubProject: "olink:githubMirrorFreemarker"
githubProjectOld: "https://github.com/freemarker/"