Repository: roller-website
Updated Branches:
  refs/heads/master 129d34e12 -> 5d3c5005f


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/5d3c5005
Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/5d3c5005
Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/5d3c5005

Branch: refs/heads/master
Commit: 5d3c5005f80cc741209feb0b11c1d010cf185abf
Parents: 129d34e
Author: Dave Johnson <snoopd...@apache.org>
Authored: Sun Oct 2 14:36:56 2016 -0400
Committer: Dave Johnson <snoopd...@apache.org>
Committed: Sun Oct 2 14:36:56 2016 -0400

----------------------------------------------------------------------
 content/downloads/downloads.html                | 44 ++++++-----
 content/getinvolved/edit_website.html           | 43 ++++++++---
 content/index.html                              |  8 +-
 content/project/whoweare.html                   | 19 +++--
 sources/pom.xml                                 | 24 ++++++
 .../main/jbake/content/downloads/downloads.md   | 81 +++++---------------
 sources/src/main/jbake/templates/header.ftl     |  6 +-
 sources/src/main/jbake/templates/index.ftl      |  2 +-
 8 files changed, 117 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/content/downloads/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads/downloads.html b/content/downloads/downloads.html
index c2c4a1c..402b1de 100644
--- a/content/downloads/downloads.html
+++ b/content/downloads/downloads.html
@@ -32,7 +32,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="./index.html">Apache Roller</a>
+            <a class="navbar-brand" href="/index.html">Apache Roller</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -52,13 +52,13 @@
                     <ul class="dropdown-menu" role="menu">
                         <li><a 
href="https://issues.apache.org/jira/browse/ROL";>Issue Tracker</a></li>
                         <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources";>Development
 Information</a></li>
-                        <li><a 
href="http://svn.apache.org/viewvc/roller/";>Browse Source</a></li>
+                        <li><a href="https://github.com/apache/roller";>Browse 
Source</a></li>
                         <li><a 
href="https://builds.apache.org/job/Roller/";>Jenkins CI</a></li>
                         <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project";>Sonar
 Analysis</a></li>
                         <li><a href="/getinvolved/edit_website.html">Website 
Admin</a></li>
                     </ul>
                 </li>
-                <li><a href="./downloads/downloads.html">Download</a></li>
+                <li><a href="/downloads/downloads.html">Download</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">ASF <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
@@ -79,23 +79,27 @@
     <!-- 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> (&quot;best available&quot;)</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>
-<pre><code>        % pgpk -a KEYS
-
-        % pgpv ${filename}.tar.gz.asc
-
-    or
-
-        % pgp -ka KEYS
-
-        % pgp ${filename}.tar.gz.asc
-
-    or
-
-        % 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>
+        <p><h2>Apache Roller Releases</h2>
+<p>Releases of the Apache Roller blog server are made available to the general 
public at no charge, under the <a href="http://apache.org/licenses/";>Apache 
License,</a> in both binary and source distributions.</p>
+<h3>General Availability (GA) Releases</strong> - <em>Ready for Prime 
Time!</em></h3>
+<p><strong><a 
href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/";>Roller 
5.1.2</a> (&quot;best available&quot;)</strong></p>
+<p>Previous source and binary distributions, including documentation, are 
available in the <a class="external" 
href="http://archive.apache.org/dist/roller/";>Apache archives</a>.</p>
+<p>Project releases are approved by vote of the Apache Roller Project 
Management Committee (PMC). Support for a release is provided by project 
volunteers on the project <a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>mailing
 lists</a>. Bugs found in a release may be discussed on the list and reported 
through the <a href="https://issues.apache.org/jira/browse/ROL";>issue 
tracker</a>. The user mailing list and issue tracker are the 
<strong>only</strong> 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. To do so, use the checksum and signature 
files from the main Apache site at <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. First download the <a 
href="http://www.apache.org/dist/roller/KEYS";>KEYS</a> as well as the 
<code>asc</code> signature file for the particular distribution. Make sure you 
get these files from the <a href="http://www.apache.org/dist/roller/";>main 
distribution directory,</a> rather than from a mirror. Then verify the 
signatures using <code>pgpk</code> as follows:</p>
+<pre><code>% pgpk -a KEYS
+% pgpv ${filename}.tar.gz.asc
+</code></pre>
+<p>or</p>
+<pre><code>% pgp -ka KEYS
+% pgp ${filename}.tar.gz.asc
+</code></pre>
+<p>or</p>
+<pre><code>% gpg --import KEYS
+% gpg --verify ${filename}.tar.gz.asc
+</code></pre>
+<p>Alternatively, you can verify the MD5 signature on the files. A Unix 
program called<br/><code>md5</code> or <code>md5sum</code> is included in many 
Unix distributions. It is also available as part of <a 
href="http://www.gnu.org/software/textutils/textutils.html";>GNU Textutils.</a> 
Windows users can get binary md5 programs from <a 
href="http://www.fourmilab.ch/md5/";>here,</a> <a 
href="http://www.pc-tools.net/win32/freeware/console/";>here,</a> or <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/5d3c5005/content/getinvolved/edit_website.html
----------------------------------------------------------------------
diff --git a/content/getinvolved/edit_website.html 
b/content/getinvolved/edit_website.html
index 9e25b97..3270e51 100644
--- a/content/getinvolved/edit_website.html
+++ b/content/getinvolved/edit_website.html
@@ -32,7 +32,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="./index.html">Apache Roller</a>
+            <a class="navbar-brand" href="/index.html">Apache Roller</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -52,13 +52,13 @@
                     <ul class="dropdown-menu" role="menu">
                         <li><a 
href="https://issues.apache.org/jira/browse/ROL";>Issue Tracker</a></li>
                         <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources";>Development
 Information</a></li>
-                        <li><a 
href="http://svn.apache.org/viewvc/roller/";>Browse Source</a></li>
+                        <li><a href="https://github.com/apache/roller";>Browse 
Source</a></li>
                         <li><a 
href="https://builds.apache.org/job/Roller/";>Jenkins CI</a></li>
                         <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project";>Sonar
 Analysis</a></li>
                         <li><a href="/getinvolved/edit_website.html">Website 
Admin</a></li>
                     </ul>
                 </li>
-                <li><a href="./downloads/downloads.html">Download</a></li>
+                <li><a href="/downloads/downloads.html">Download</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">ASF <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
@@ -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                     &lt;-- The automatically generated 
website, don&#39;t edit things here!
 |
 |-- sources
@@ -102,14 +105,30 @@
                 |-- content     &lt;-- One markdown page for each page of the 
website
                 |
                 |-- templates   &lt;-- 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 &quot;my wonderful changes&quot; 
.</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 &quot;my wonderful changes&quot; 
.</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/5d3c5005/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index cc2a374..059d4ad 100644
--- a/content/index.html
+++ b/content/index.html
@@ -32,7 +32,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="./index.html">Apache Roller</a>
+            <a class="navbar-brand" href="/index.html">Apache Roller</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -52,13 +52,13 @@
                     <ul class="dropdown-menu" role="menu">
                         <li><a 
href="https://issues.apache.org/jira/browse/ROL";>Issue Tracker</a></li>
                         <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources";>Development
 Information</a></li>
-                        <li><a 
href="http://svn.apache.org/viewvc/roller/";>Browse Source</a></li>
+                        <li><a href="https://github.com/apache/roller";>Browse 
Source</a></li>
                         <li><a 
href="https://builds.apache.org/job/Roller/";>Jenkins CI</a></li>
                         <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project";>Sonar
 Analysis</a></li>
                         <li><a href="/getinvolved/edit_website.html">Website 
Admin</a></li>
                     </ul>
                 </li>
-                <li><a href="./downloads/downloads.html">Download</a></li>
+                <li><a href="/downloads/downloads.html">Download</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">ASF <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
@@ -111,7 +111,7 @@
             <p>Roller's installation guide covers deployment on Tomcat, 
GlassFish, and JBoss application servers using a MySQL,
                 Derby, or PostgreSQL database. Users however have reported 
success running Roller on other app servers and databases.</p>
             <p><a class="btn btn-default" 
href="https://dist.apache.org/repos/dist/release/roller/roller-5.1/v5.1.1/docs/";
 role="button">Current Release Docs (PDF) &raquo;</a>
-                <a class="btn btn-default" 
href="http://svn.apache.org/viewvc/roller/trunk/docs/"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
+                <a class="btn btn-default" 
href="https://github.com/apache/roller/tree/master/docs"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
         </div>
     </div>
 </div>

http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/content/project/whoweare.html
----------------------------------------------------------------------
diff --git a/content/project/whoweare.html b/content/project/whoweare.html
index 0ee3579..a6f663f 100644
--- a/content/project/whoweare.html
+++ b/content/project/whoweare.html
@@ -32,7 +32,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="./index.html">Apache Roller</a>
+            <a class="navbar-brand" href="/index.html">Apache Roller</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -52,13 +52,13 @@
                     <ul class="dropdown-menu" role="menu">
                         <li><a 
href="https://issues.apache.org/jira/browse/ROL";>Issue Tracker</a></li>
                         <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources";>Development
 Information</a></li>
-                        <li><a 
href="http://svn.apache.org/viewvc/roller/";>Browse Source</a></li>
+                        <li><a href="https://github.com/apache/roller";>Browse 
Source</a></li>
                         <li><a 
href="https://builds.apache.org/job/Roller/";>Jenkins CI</a></li>
                         <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project";>Sonar
 Analysis</a></li>
                         <li><a href="/getinvolved/edit_website.html">Website 
Admin</a></li>
                     </ul>
                 </li>
-                <li><a href="./downloads/downloads.html">Download</a></li>
+                <li><a href="/downloads/downloads.html">Download</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">ASF <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
@@ -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>

http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/sources/pom.xml
----------------------------------------------------------------------
diff --git a/sources/pom.xml b/sources/pom.xml
index a2202e9..2aa555d 100644
--- a/sources/pom.xml
+++ b/sources/pom.xml
@@ -17,6 +17,7 @@
                 <configuration>
                     <outputDirectory>../content</outputDirectory>
                 </configuration>
+                
                 <executions>
                     <execution>
                         <id>default-generate</id>
@@ -26,6 +27,29 @@
                         </goals>
                     </execution>
                 </executions>
+
+                <dependencies>
+
+                    <dependency>
+                        <groupId>org.jbake</groupId>
+                        <artifactId>jbake-core</artifactId>
+                        <version>2.4.0</version>
+                    </dependency>
+                    
+                    <dependency>
+                        <groupId>org.freemarker</groupId>
+                        <artifactId>freemarker</artifactId>
+                        <version>2.3.23</version>
+                    </dependency>
+                    
+                    <dependency>
+                        <groupId>org.pegdown</groupId>
+                        <artifactId>pegdown</artifactId>
+                        <version>1.6.0</version>
+                    </dependency>
+
+                </dependencies>
+                
             </plugin>
 
         </plugins>

http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/sources/src/main/jbake/content/downloads/downloads.md
----------------------------------------------------------------------
diff --git a/sources/src/main/jbake/content/downloads/downloads.md 
b/sources/src/main/jbake/content/downloads/downloads.md
index 4f75661..c8cd0e0 100644
--- a/sources/src/main/jbake/content/downloads/downloads.md
+++ b/sources/src/main/jbake/content/downloads/downloads.md
@@ -5,82 +5,37 @@ type=page
 
 ## Apache Roller Releases
 
-Releases of the Apache Roller blog server are made available to the 
-general public at no charge, under the 
-<a href="http://apache.org/licenses/";>Apache License,</a>
-in both binary and source distributions.
+Releases of the Apache Roller blog server are made available to the general 
public at no charge, under the <a href="http://apache.org/licenses/";>Apache 
License,</a> in both binary and source distributions.
 
-General Availability (GA) Releases</strong> - <em>Ready for Prime Time!</em>
-<a 
href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/";>Roller 
5.1.2</a> (&quot;best available&quot;)
+### General Availability (GA) Releases</strong> - <em>Ready for Prime 
Time!</em>
+__<a 
href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.1/v5.1.2/";>Roller 
5.1.2</a> (&quot;best available&quot;)__
 
-Previous source and binary distributions, including documentation,
-are available in the
-<a class="external" href="http://archive.apache.org/dist/roller/";>
-Apache archives</a>.
+Previous source and binary distributions, including documentation, are 
available in the <a class="external" 
href="http://archive.apache.org/dist/roller/";>Apache archives</a>.
 
-Project releases are approved by vote of the Apache Roller Project 
-Management Committee (PMC). Support for a release is provided by project 
-volunteers on the project 
-<a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>mailing
 lists</a>.
-Bugs found in a release may be discussed on the list and 
-reported through the
-<a href="https://issues.apache.org/jira/browse/ROL";>issue tracker</a>.
-The user mailing list and issue tracker are the <strong>only</strong>
-support options hosted by the Apache Roller project.
+Project releases are approved by vote of the Apache Roller Project Management 
Committee (PMC). Support for a release is provided by project volunteers on the 
project <a 
href="https://cwiki.apache.org/confluence/display/ROLLER/How+to+ask+for+help";>mailing
 lists</a>. Bugs found in a release may be discussed on the list and reported 
through the <a href="https://issues.apache.org/jira/browse/ROL";>issue 
tracker</a>. The user mailing list and issue tracker are the 
<strong>only</strong> support options hosted by the Apache Roller project.
 
 
-Note: When downloading from a mirror, please be sure to verify that checksums 
and signatures are correct.
-To do so, use the checksum and signature files from the main Apache site at
-<a class="external" 
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>
+Note: When downloading from a mirror, please be sure to verify that checksums 
and signatures are correct. To do so, use the checksum and signature files from 
the main Apache site at <a class="external" 
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>
 Find here the KEYS file, which contains all OpenPGP keys we use to sign 
releases:
 <a class="external" 
href="http://www.apache.org/dist/roller/";>http://www.apache.org/dist/roller/</a>
 
-The PGP signatures can be verified using PGP or GPG.
-First download the
-<a href="http://www.apache.org/dist/roller/KEYS";>KEYS</a>
-as well as the
-<code>asc</code>
-signature file for the particular
-distribution.
-Make sure you get these files from the
-<a href="http://www.apache.org/dist/roller/";>main distribution
-    directory,</a>
-rather than from a mirror.
-Then verify the signatures using
+The PGP signatures can be verified using PGP or GPG. First download the <a 
href="http://www.apache.org/dist/roller/KEYS";>KEYS</a> as well as the ``asc`` 
signature file for the particular distribution. Make sure you get these files 
from the <a href="http://www.apache.org/dist/roller/";>main distribution 
directory,</a> rather than from a mirror. Then verify the signatures using 
``pgpk`` as follows:
 
-            % pgpk -a KEYS
+    % pgpk -a KEYS
+    % pgpv ${filename}.tar.gz.asc
 
-            % pgpv ${filename}.tar.gz.asc
-
-        or
-
-            % pgp -ka KEYS
-
-            % pgp ${filename}.tar.gz.asc
-
-        or
-
-            % gpg --import KEYS
-
-            % gpg --verify ${filename}.tar.gz.asc
-
-Alternatively, you can verify the MD5 signature on the files.
-A Unix program called
-<code>md5</code>
 or
-<code>md5sum</code>
-is
-included in many Unix distributions.
-It is also available as part of
-<a href="http://www.gnu.org/software/textutils/textutils.html";>
-    GNU Textutils.</a>
-Windows users can get binary md5 programs from
-<a href="http://www.fourmilab.ch/md5/";>here,</a>
-<a href="http://www.pc-tools.net/win32/freeware/console/";>
-    here,</a>
+
+    % pgp -ka KEYS
+    % pgp ${filename}.tar.gz.asc
+     
 or
-<a href="http://www.slavasoft.com/fsum/";>here.</a>
 
+    % gpg --import KEYS
+    % gpg --verify ${filename}.tar.gz.asc
+
+Alternatively, you can verify the MD5 signature on the files. A Unix program 
called
+``md5`` or ``md5sum`` is included in many Unix distributions. It is also 
available as part of <a 
href="http://www.gnu.org/software/textutils/textutils.html";>GNU Textutils.</a> 
Windows users can get binary md5 programs from <a 
href="http://www.fourmilab.ch/md5/";>here,</a> <a 
href="http://www.pc-tools.net/win32/freeware/console/";>here,</a> or <a 
href="http://www.slavasoft.com/fsum/";>here</a>.
 
 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>.
 

http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/sources/src/main/jbake/templates/header.ftl
----------------------------------------------------------------------
diff --git a/sources/src/main/jbake/templates/header.ftl 
b/sources/src/main/jbake/templates/header.ftl
index e9f8f75..8c89c90 100644
--- a/sources/src/main/jbake/templates/header.ftl
+++ b/sources/src/main/jbake/templates/header.ftl
@@ -32,7 +32,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="./index.html">Apache Roller</a>
+            <a class="navbar-brand" href="/index.html">Apache Roller</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -52,13 +52,13 @@
                     <ul class="dropdown-menu" role="menu">
                         <li><a 
href="https://issues.apache.org/jira/browse/ROL";>Issue Tracker</a></li>
                         <li><a 
href="https://cwiki.apache.org/confluence/display/ROLLER/Developer+Resources";>Development
 Information</a></li>
-                        <li><a 
href="http://svn.apache.org/viewvc/roller/";>Browse Source</a></li>
+                        <li><a href="https://github.com/apache/roller";>Browse 
Source</a></li>
                         <li><a 
href="https://builds.apache.org/job/Roller/";>Jenkins CI</a></li>
                         <li><a 
href="https://analysis.apache.org/dashboard/index/org.apache.roller:roller-project";>Sonar
 Analysis</a></li>
                         <li><a href="/getinvolved/edit_website.html">Website 
Admin</a></li>
                     </ul>
                 </li>
-                <li><a href="./downloads/downloads.html">Download</a></li>
+                <li><a href="/downloads/downloads.html">Download</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" 
data-toggle="dropdown">ASF <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">

http://git-wip-us.apache.org/repos/asf/roller-website/blob/5d3c5005/sources/src/main/jbake/templates/index.ftl
----------------------------------------------------------------------
diff --git a/sources/src/main/jbake/templates/index.ftl 
b/sources/src/main/jbake/templates/index.ftl
index 1f134f8..75949a8 100644
--- a/sources/src/main/jbake/templates/index.ftl
+++ b/sources/src/main/jbake/templates/index.ftl
@@ -37,7 +37,7 @@
             <p>Roller's installation guide covers deployment on Tomcat, 
GlassFish, and JBoss application servers using a MySQL,
                 Derby, or PostgreSQL database. Users however have reported 
success running Roller on other app servers and databases.</p>
             <p><a class="btn btn-default" 
href="https://dist.apache.org/repos/dist/release/roller/roller-5.1/v5.1.1/docs/";
 role="button">Current Release Docs (PDF) &raquo;</a>
-                <a class="btn btn-default" 
href="http://svn.apache.org/viewvc/roller/trunk/docs/"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
+                <a class="btn btn-default" 
href="https://github.com/apache/roller/tree/master/docs"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
         </div>
     </div>
 </div>

Reply via email to