You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2016/10/02 18:39:37 UTC
[1/2] roller-website git commit: Correct formatting of releases page,
fix links, change links to point to GitHub instead of SVN.
Repository: roller-website
Updated Branches:
refs/heads/master 5d3c5005f -> 0cda43677
Correct formatting of releases page, fix links, change links to point to GitHub instead of SVN.
Project: http://git-wip-us.apache.org/repos/asf/roller-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller-website/commit/34d0f142
Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/34d0f142
Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/34d0f142
Branch: refs/heads/master
Commit: 34d0f1427db34cbf6878f35f54614ba3218f7782
Parents: 129d34e
Author: Dave Johnson <sn...@apache.org>
Authored: Sun Oct 2 14:38:09 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Sun Oct 2 14:38:09 2016 -0400
----------------------------------------------------------------------
content/downloads/downloads.html | 12 ++++++++--
content/getinvolved/edit_website.html | 37 ++++++++++++++++++++++--------
content/project/whoweare.html | 13 +++++++----
3 files changed, 47 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller-website/blob/34d0f142/content/downloads/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads/downloads.html b/content/downloads/downloads.html
index c2c4a1c..3a8febc 100644
--- a/content/downloads/downloads.html
+++ b/content/downloads/downloads.html
@@ -79,7 +79,13 @@
<!-- Example row of columns -->
<div class="row">
<h1>Downloads</h1>
- <p><h2>Apache Roller Releases</h2><p>Releases of the Apache Roller blog server are made available to the<br/>general public at no charge, under the<br/><a href="http://apache.org/licenses/">Apache License,</a><br/>in both binary and source distributions.</p><p>General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em><br/><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/">Roller 5.1.2</a> ("best available")</p><p>Previous source and binary distributions, including documentation,<br/>are available in the<br/><a class="external" href="http://archive.apache.org/dist/roller/"><br/>Apache archives</a>.</p><p>Project releases are approved by vote of the Apache Roller Project<br/>Management Committee (PMC). Support for a release is provided by project<br/>volunteers on the project<br/><a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help">mailing lists</a>.<br/>Bugs found in a release may be discussed on th
e list and<br/>reported through the<br/><a href="https://issues.apache.org/jira/browse/ROL">issue tracker</a>.<br/>The user mailing list and issue tracker are the <strong>only</strong><br/>support options hosted by the Apache Roller project.</p><p>Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct.<br/>To do so, use the checksum and signature files from the main Apache site at<br/><a class="external" href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/"><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/</a">http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/</a</a><br/>Find here the KEYS file, which contains all OpenPGP keys we use to sign releases:<br/><a class="external" href="http://www.apache.org/dist/roller/"><a href="http://www.apache.org/dist/roller/</a">http://www.apache.org/dist/roller/</a</a></p><p>The PGP signatures can be verified using PGP or GPG.<br/>First
download the<br/><a href="http://www.apache.org/dist/roller/KEYS">KEYS</a><br/>as well as the<br/><code>asc</code><br/>signature file for the particular<br/>distribution.<br/>Make sure you get these files from the<br/><a href="http://www.apache.org/dist/roller/">main distribution<br/> directory,</a><br/>rather than from a mirror.<br/>Then verify the signatures using</p>
+ <p><h2>Apache Roller Releases</h2>
+<p>Releases of the Apache Roller blog server are made available to the<br/>general public at no charge, under the<br/><a href="http://apache.org/licenses/">Apache License,</a><br/>in both binary and source distributions.</p>
+<p>General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em><br/><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/">Roller 5.1.2</a> ("best available")</p>
+<p>Previous source and binary distributions, including documentation,<br/>are available in the<br/><a class="external" href="http://archive.apache.org/dist/roller/"><br/>Apache archives</a>.</p>
+<p>Project releases are approved by vote of the Apache Roller Project<br/>Management Committee (PMC). Support for a release is provided by project<br/>volunteers on the project<br/><a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help">mailing lists</a>.<br/>Bugs found in a release may be discussed on the list and<br/>reported through the<br/><a href="https://issues.apache.org/jira/browse/ROL">issue tracker</a>.<br/>The user mailing list and issue tracker are the <strong>only</strong><br/>support options hosted by the Apache Roller project.</p>
+<p>Note: When downloading from a mirror, please be sure to verify that checksums and signatures are correct.<br/>To do so, use the checksum and signature files from the main Apache site at<br/><a class="external" href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/"><a href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/">http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/bin/</a></a><br/>Find here the KEYS file, which contains all OpenPGP keys we use to sign releases:<br/><a class="external" href="http://www.apache.org/dist/roller/"><a href="http://www.apache.org/dist/roller/">http://www.apache.org/dist/roller/</a></a></p>
+<p>The PGP signatures can be verified using PGP or GPG.<br/>First download the<br/><a href="http://www.apache.org/dist/roller/KEYS">KEYS</a><br/>as well as the<br/><code>asc</code><br/>signature file for the particular<br/>distribution.<br/>Make sure you get these files from the<br/><a href="http://www.apache.org/dist/roller/">main distribution<br/> directory,</a><br/>rather than from a mirror.<br/>Then verify the signatures using</p>
<pre><code> % pgpk -a KEYS
% pgpv ${filename}.tar.gz.asc
@@ -95,7 +101,9 @@
% gpg --import KEYS
% gpg --verify ${filename}.tar.gz.asc
-</code></pre><p>Alternatively, you can verify the MD5 signature on the files.<br/>A Unix program called<br/><code>md5</code><br/>or<br/><code>md5sum</code><br/>is<br/>included in many Unix distributions.<br/>It is also available as part of<br/><a href="http://www.gnu.org/software/textutils/textutils.html"><br/> GNU Textutils.</a><br/>Windows users can get binary md5 programs from<br/><a href="http://www.fourmilab.ch/md5/">here,</a><br/><a href="http://www.pc-tools.net/win32/freeware/console/"><br/> here,</a><br/>or<br/><a href="http://www.slavasoft.com/fsum/">here.</a></p><p>If you want to build directly from the sources, please check the <a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+build+Roller">Project Wiki</a>.</p></p>
+</code></pre>
+<p>Alternatively, you can verify the MD5 signature on the files.<br/>A Unix program called<br/><code>md5</code><br/>or<br/><code>md5sum</code><br/>is<br/>included in many Unix distributions.<br/>It is also available as part of<br/><a href="http://www.gnu.org/software/textutils/textutils.html"><br/> GNU Textutils.</a><br/>Windows users can get binary md5 programs from<br/><a href="http://www.fourmilab.ch/md5/">here,</a><br/><a href="http://www.pc-tools.net/win32/freeware/console/"><br/> here,</a><br/>or<br/><a href="http://www.slavasoft.com/fsum/">here.</a></p>
+<p>If you want to build directly from the sources, please check the <a href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+build+Roller">Project Wiki</a>.</p></p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/roller-website/blob/34d0f142/content/getinvolved/edit_website.html
----------------------------------------------------------------------
diff --git a/content/getinvolved/edit_website.html b/content/getinvolved/edit_website.html
index 9e25b97..24630d2 100644
--- a/content/getinvolved/edit_website.html
+++ b/content/getinvolved/edit_website.html
@@ -79,12 +79,15 @@
<!-- Example row of columns -->
<div class="row">
<h1>Edit Website</h1>
- <p><p>The Roller website is generated using <a href="http://jbake.org">JBake</a> and Maven. Content is written in <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. Page layouts are written in HTML within <a href="http://freemarker.org">FreeMarker</a> template files. The HTML uses the Bootstrap framework. The website is stored in a Git repository and when you push your changes to the asf_site branch, after a short delay, the changes will go live on the website.</p><h2>Prerequisites</h2><p>This page is not a tutorial. To update the website you will have to understand how JBake, Markdown and possibly HTML and Bootstrap work. Refer to the links above for documentation on those topics. You'll also need this software installed on your machine to update the website:</p>
+ <p><p>The Roller website is generated using <a href="http://jbake.org">JBake</a> and Maven. Content is written in <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. Page layouts are written in HTML within <a href="http://freemarker.org">FreeMarker</a> template files. The HTML uses the Bootstrap framework. The website is stored in a Git repository and when you push your changes to the asf_site branch, after a short delay, the changes will go live on the website.</p>
+<h2>Prerequisites</h2>
+<p>This page is not a tutorial. To update the website you will have to understand how JBake, Markdown and possibly HTML and Bootstrap work. Refer to the links above for documentation on those topics. You'll also need this software installed on your machine to update the website:</p>
<ul>
<li>Git</li>
<li>Java</li>
<li>Maven</li>
-</ul><h2>Git repository layout</h2>
+</ul>
+<h2>Git repository layout</h2>
<pre><code>|-- content <-- The automatically generated website, don't edit things here!
|
|-- sources
@@ -102,14 +105,30 @@
|-- content <-- One markdown page for each page of the website
|
|-- templates <-- Freemarker templates for website HTML layout
-</code></pre><h2>Steps to update the website</h2>
+</code></pre>
+<h2>Steps to update the website</h2>
<ol>
- <li><p>Use Git to clone the roller-website repo, for example:</p><p><code>git clone https://git-wip-us.apache.org/repos/asf/roller-website.git</code></p></li>
- <li><p>Go to the roller-website directory, make sure you are on the master branch:</p><p><code>cd roller-website</code><br/><code>git checkout master</code></p></li>
- <li><p>Make your changes to Markdowna (.md) and FreeMarker (.ftl) files under the source directory.</p></li>
- <li><p>Generate the website via Maven. Running mvn install will generate the website into the roller-website/content directory.</p><p><code>cd roller-website/sources</code><br/><code>mvn install</code></p><p>Or alternatively, run <code>mvn jbake:inline</code> so you can view the website locally at <a href="http://localhost:8080">http://localhost:8080</a></p></li>
- <li><p>Once the site looks good, commit your changes and merge them into the asf_site branch.</p><p><code>git commit -m "my wonderful changes" .</code><br/><code>git checkout asf_site</code><br/><code>git merge master</code></p></li>
- <li><p>Push your changes to the ASF Git repo. The ASF website infrastructure will pick up your changes and publish them to the website.</p></li>
+ <li>
+ <p>Use Git to clone the roller-website repo, for example:</p>
+ <p><code>git clone https://git-wip-us.apache.org/repos/asf/roller-website.git</code></p>
+ </li>
+ <li>
+ <p>Go to the roller-website directory, make sure you are on the master branch:</p>
+ <p><code>cd roller-website</code><br/><code>git checkout master</code></p>
+ </li>
+ <li>
+ <p>Make your changes to Markdowna (.md) and FreeMarker (.ftl) files under the source directory.</p></li>
+ <li>
+ <p>Generate the website via Maven. Running mvn install will generate the website into the roller-website/content directory.</p>
+ <p><code>cd roller-website/sources</code><br/><code>mvn install</code></p>
+ <p>Or alternatively, run <code>mvn jbake:inline</code> so you can view the website locally at <a href="http://localhost:8080">http://localhost:8080</a></p>
+ </li>
+ <li>
+ <p>Once the site looks good, commit your changes and merge them into the asf_site branch.</p>
+ <p><code>git commit -m "my wonderful changes" .</code><br/><code>git checkout asf_site</code><br/><code>git merge master</code></p>
+ </li>
+ <li>
+ <p>Push your changes to the ASF Git repo. The ASF website infrastructure will pick up your changes and publish them to the website.</p></li>
</ol></p>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/roller-website/blob/34d0f142/content/project/whoweare.html
----------------------------------------------------------------------
diff --git a/content/project/whoweare.html b/content/project/whoweare.html
index 0ee3579..3ebc832 100644
--- a/content/project/whoweare.html
+++ b/content/project/whoweare.html
@@ -79,16 +79,21 @@
<!-- Example row of columns -->
<div class="row">
<h1>Who we are</h1>
- <p><h2>Roller Committers</h2><p>The current Roller committer list (* = PMC member):</p>
+ <p><h2>Roller Committers</h2>
+<p>The current Roller committer list (* = PMC member):</p>
<ul>
<li>Anil R. Gangolli (*)</li>
<li>Greg Huber (*)</li>
<li><a href="http://rollerweblogger.org/roller/">David M Johnson</a> (*)</li>
- <li><a href="http://www.nailedtothex.org/roller/">Kohei Nozaki</a></li>
+ <li>
+ <a href="http://www.nailedtothex.org/roller/">Kohei Nozaki</a></li>
<li><a href="http://raibledesigns.com/">Matt Raible</a> (*)</li>
<li>Craig L Russell (*)</li>
- <li><a href="http://gauravsaini.me/">Gaurav Saini</a></li>
-</ul><h2>Emeritus Committers</h2><p>The Apache Roller project expresses appreciation for our past volunteers:</p>
+ <li>
+ <a href="http://gauravsaini.me/">Gaurav Saini</a></li>
+</ul>
+<h2>Emeritus Committers</h2>
+<p>The Apache Roller project expresses appreciation for our past volunteers:</p>
<ul>
<li>Jeff Blattman</li>
<li>Allen Gilliland</li>
[2/2] roller-website git commit: Merge branch 'asf-site'
Posted by sn...@apache.org.
Merge branch 'asf-site'
Conflicts:
content/downloads/downloads.html
Project: http://git-wip-us.apache.org/repos/asf/roller-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller-website/commit/0cda4367
Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/0cda4367
Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/0cda4367
Branch: refs/heads/master
Commit: 0cda43677a25f7ec1d531a34f6759c3853fc9701
Parents: 5d3c500 34d0f14
Author: Dave Johnson <sn...@apache.org>
Authored: Sun Oct 2 14:39:33 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Sun Oct 2 14:39:33 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------