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/05 07:25:33 UTC
[1/6] incubator-freemarker-site git commit: Fix for typo.
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/master 3df6d2525 -> cbafd5e20
Fix for typo.
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/d2d3c4e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/d2d3c4e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/d2d3c4e0
Branch: refs/heads/master
Commit: d2d3c4e062692d7e7c480e088a62bb700bd030ec
Parents: 3df6d25
Author: Jacopo Cappellato <ja...@gmail.com>
Authored: Thu Jan 5 07:24:21 2017 +0100
Committer: Jacopo Cappellato <ja...@gmail.com>
Committed: Thu Jan 5 07:24:21 2017 +0100
----------------------------------------------------------------------
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/d2d3c4e0/README
----------------------------------------------------------------------
diff --git a/README b/README
index 05741f8..ab0e59c 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ This is the project with which we generate the freemarker.org home page.
Note that most of the work is done by Apache FreeMarker Docgen, which is
a dependency of this project.
-To publish the built site, comit the output into the "asf-site" branch.
+To publish the built site, commit the output into the "asf-site" branch.
Note that as of this writing, the "docgen" dependency is get from the Ivy
repo on the published homepage (http://freemarker.org/repos/ivy/). Those
[2/6] incubator-freemarker-site git commit: Replaced "dispute" with
"discussion": the latter better describes what usually happens during a
commit review by the community.
Posted by dd...@apache.org.
Replaced "dispute" with "discussion": the latter better describes
what usually happens during a commit review by the community.
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/17156466
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/17156466
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/17156466
Branch: refs/heads/master
Commit: 171564660a9a54456ba37a98a205e8cb2dc02470
Parents: d2d3c4e
Author: Jacopo Cappellato <ja...@gmail.com>
Authored: Thu Jan 5 07:36:51 2017 +0100
Committer: Jacopo Cappellato <ja...@gmail.com>
Committed: Thu Jan 5 07:36:51 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/17156466/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index c7bcca5..bb713f7 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1292,9 +1292,9 @@ two freemarker.jar-s and unpredictable behavior!
into the <quote>main</quote> branch (or branches), and (s)he is
expected to use that wisely. Depending on the complexity of the
feature, the number of active Committers in the time period, and
- whether the feature is expected to be disputed by the community, (s)he
+ whether the feature is expected to be discussed by the community, (s)he
may should work in a feature branch instead. If the feature is
- finished and disputes were resolved (on some way described by Apache
+ finished and discussions were resolved (on some way described by Apache
policies), it can be merged back into the <quote>main</quote>
branch.</para>
[4/6] incubator-freemarker-site git commit: Replaced "release
engineer" with "release manager" because the latter is the term used in other
ASF resources:
http://www.apache.org/dev/release-publishing.html#release_manager
Posted by dd...@apache.org.
Replaced "release engineer" with "release manager" because the latter is
the term used in other ASF resources:
http://www.apache.org/dev/release-publishing.html#release_manager
Also slightly modified the sentence to avoid the usage of the verb
"appointed" that may imply the presence of a hierarchy, which is not
the case.
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/2024fc5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/2024fc5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/2024fc5b
Branch: refs/heads/master
Commit: 2024fc5b002108eff2f6d155a31158c40d79064a
Parents: 699553d
Author: Jacopo Cappellato <ja...@gmail.com>
Authored: Thu Jan 5 07:48:34 2017 +0100
Committer: Jacopo Cappellato <ja...@gmail.com>
Committed: Thu Jan 5 07:48:34 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/2024fc5b/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 0769ecb..b1621d0 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1355,8 +1355,8 @@ two freemarker.jar-s and unpredictable behavior!
<simplesect>
<title>Making releases</title>
- <para>For each release, a release engineer is appointed among the
- Committers. The release engineer should follow the procedure here, and
+ <para>For each release, one of the Committers plays the role of Release
+ Manager. The Release Manager should follow the procedure here, and
(s)he should update this page where (s)he has to deviate from
it.</para>
[6/6] incubator-freemarker-site git commit: Merge commit
'refs/pull/2/head' of https://github.com/apache/incubator-freemarker-site
Posted by dd...@apache.org.
Merge commit 'refs/pull/2/head' of https://github.com/apache/incubator-freemarker-site
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/cbafd5e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/cbafd5e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/cbafd5e2
Branch: refs/heads/master
Commit: cbafd5e2027a647c8d9e90ae0597428f1703cd61
Parents: 3df6d25 98d6eb9
Author: ddekany <dd...@apache.org>
Authored: Thu Jan 5 08:24:25 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Jan 5 08:24:25 2017 +0100
----------------------------------------------------------------------
README | 2 +-
src/main/docgen/book.xml | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[5/6] incubator-freemarker-site git commit: Modified the way "source"
and "binary" releases are described to be compliant with the description of a
"valid release" for the ASF:
http://www.apache.org/dev/release-publishing.html#valid
Posted by dd...@apache.org.
Modified the way "source" and "binary" releases are described to be
compliant with the description of a "valid release" for the ASF:
http://www.apache.org/dev/release-publishing.html#valid
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/98d6eb9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/98d6eb9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/98d6eb9e
Branch: refs/heads/master
Commit: 98d6eb9ed23b33a36178c44eaba6da8a11956baf
Parents: 2024fc5
Author: Jacopo Cappellato <ja...@gmail.com>
Authored: Thu Jan 5 08:03:13 2017 +0100
Committer: Jacopo Cappellato <ja...@gmail.com>
Committed: Thu Jan 5 08:03:13 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/98d6eb9e/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index b1621d0..0de3d13 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1389,9 +1389,11 @@ two freemarker.jar-s and unpredictable behavior!
</listitem>
<listitem>
- <para>Releases should have both an src and bin tar.gz
- (downloadable from the Apache Software Foundation, as
- usual)</para>
+ <para>The official release is provided as source code to build
+ the project (src tar.gz). For the convenience of users the release
+ is also accompanied by compiled binaries (bin tar.gz).
+ Both artifacts are downloadable from the Apache Software Foundation,
+ as usual</para>
</listitem>
<listitem>
[3/6] incubator-freemarker-site git commit: Fix for typo.
Posted by dd...@apache.org.
Fix for typo.
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/699553d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/699553d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/699553d3
Branch: refs/heads/master
Commit: 699553d36946ad87bc512d138831aa2cc9652362
Parents: 1715646
Author: Jacopo Cappellato <ja...@gmail.com>
Authored: Thu Jan 5 07:41:20 2017 +0100
Committer: Jacopo Cappellato <ja...@gmail.com>
Committed: Thu Jan 5 07:41:20 2017 +0100
----------------------------------------------------------------------
src/main/docgen/book.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/699553d3/src/main/docgen/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index bb713f7..0769ecb 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -1298,7 +1298,7 @@ two freemarker.jar-s and unpredictable behavior!
policies), it can be merged back into the <quote>main</quote>
branch.</para>
- <para>All commits should have helpful comments; don't afraid of
+ <para>All commits should have helpful comments; don't be afraid of
writing long descriptions. If the commit is related to a Jira issue,
the comment should start with the Jira issue identifier, like
<quote>FREEMARKER-16: ...</quote></para>