You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/01/06 22:12:42 UTC
[1/2] incubator-freemarker-site git commit: Github replaced with
GitHub
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/master 71def7a22 -> 70aa33ade
Github replaced with GitHub
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/db9c95d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/db9c95d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/db9c95d5
Branch: refs/heads/master
Commit: db9c95d50f9acefd4a8e2c6acc81fc3def43929e
Parents: 71def7a
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 21:41:37 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 21:41:37 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/db9c95d5/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index d8b8f5c..56f89cd 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -471,7 +471,7 @@ two freemarker.jar-s and unpredictable behavior!
<td><link
xlink:href="https://github.com/freemarker/FreeMarker.tmbundle">Install
- from Github Project</link></td>
+ from GitHub Project</link></td>
</tr>
<tr>
@@ -1295,7 +1295,7 @@ two freemarker.jar-s and unpredictable behavior!
<title>Git commit policies</title>
<para>A Committer can commit directly into the Apache Git repository
- of FreeMarker, and so preferably doesn't use Github pull requests.
+ of FreeMarker, and so preferably doesn't use GitHub pull requests.
(See <link linkend="sourcecode">the repositories and branches
here</link>.)</para>
@@ -1316,9 +1316,9 @@ two freemarker.jar-s and unpredictable behavior!
</section>
<section xml:id="merging-pull-request">
- <title>Merging in pull requests from Github</title>
+ <title>Merging in pull requests from GitHub</title>
- <para>Pull requests from Github are merged in by Committers. Before
+ <para>Pull requests from GitHub are merged in by Committers. Before
accepting a pull request, ensure that:</para>
<itemizedlist>
@@ -1348,7 +1348,7 @@ two freemarker.jar-s and unpredictable behavior!
<listitem>
<para><literal> <replaceable><PR_NUMBER></replaceable>
- </literal> is the pull request number that Github shows
+ </literal> is the pull request number that GitHub shows
prominently after a <quote>#</quote></para>
</listitem>
</itemizedlist>
[2/2] incubator-freemarker-site git commit: Added to Committer
how-to: Closing GitHub PR requests without merging
Posted by dd...@apache.org.
Added to Committer how-to: Closing GitHub PR requests without merging
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/70aa33ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/70aa33ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/70aa33ad
Branch: refs/heads/master
Commit: 70aa33adee469b8f5e86316e2345cf1504434985
Parents: db9c95d
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 6 23:12:43 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 6 23:12:43 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 35 ++++++++++++++++++++++++++++++++---
1 file changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/70aa33ad/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 56f89cd..52e513f 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1342,14 +1342,14 @@ two freemarker.jar-s and unpredictable behavior!
<itemizedlist>
<listitem>
<para><literal> <replaceable><PROJECT></replaceable>
- </literal> is usually
+ </literal>is usually
<literal>incubator-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>
+ </literal>is the pull request number that GitHub shows prominently
+ after a <quote>#</quote></para>
</listitem>
</itemizedlist>
@@ -1365,6 +1365,35 @@ two freemarker.jar-s and unpredictable behavior!
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>incubator-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>
+ </section>
+
<section xml:id="making-releases">
<title>Making releases</title>