Repository: roller-website
Updated Branches:
  refs/heads/master 123581686 -> 53bfbb01b


Convert docs README to markdown, point to ODT docs instead of PDF.


Project: http://git-wip-us.apache.org/repos/asf/roller-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller-website/commit/53bfbb01
Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/53bfbb01
Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/53bfbb01

Branch: refs/heads/master
Commit: 53bfbb01bd11174d415052f3bac2c9f0f6cd8595
Parents: 1235816
Author: Dave Johnson <[email protected]>
Authored: Sun Feb 25 17:50:42 2018 -0500
Committer: Dave Johnson <[email protected]>
Committed: Sun Feb 25 17:50:42 2018 -0500

----------------------------------------------------------------------
 README.md                                  | 5 +++++
 content/downloads/downloads.html           | 4 ++--
 content/index.html                         | 5 +++--
 sources/src/main/jbake/templates/index.ftl | 5 +++--
 4 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller-website/blob/53bfbb01/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..97444ee
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# README.md
+
+To understand how to update and publish the Roller website take a look at the 
**edit_website.md** file, which you can view online at the:
+
+ [Edit Website page of the Roller 
website](http://roller.apache.org/getinvolved/edit_website.html).

http://git-wip-us.apache.org/repos/asf/roller-website/blob/53bfbb01/content/downloads/downloads.html
----------------------------------------------------------------------
diff --git a/content/downloads/downloads.html b/content/downloads/downloads.html
index 402b1de..c517da1 100644
--- a/content/downloads/downloads.html
+++ b/content/downloads/downloads.html
@@ -82,10 +82,10 @@
         <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><strong><a 
href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.2/v5.2.0/";>Roller 
5.2.0</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>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.2/v5.2.0/bin/";><a 
href="http://www.apache.org/dyn/closer.cgi/roller/roller-5.2/v5.2.0/bin/";>http://www.apache.org/dyn/closer.cgi/roller/roller-5.2/v5.2.0/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

http://git-wip-us.apache.org/repos/asf/roller-website/blob/53bfbb01/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 059d4ad..c85070b 100644
--- a/content/index.html
+++ b/content/index.html
@@ -110,8 +110,9 @@
             <h2>Documentation</h2>
             <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="https://github.com/apache/roller/tree/master/docs"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
+            <p>
+                <a class="btn btn-default" 
href="https://github.com/apache/roller/tree/roller-5.2.0/docs"; 
role="button">Docs for latest release in Open Office (ODT) format</a>
+            </p>
         </div>
     </div>
 </div>

http://git-wip-us.apache.org/repos/asf/roller-website/blob/53bfbb01/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 75949a8..ce032a4 100644
--- a/sources/src/main/jbake/templates/index.ftl
+++ b/sources/src/main/jbake/templates/index.ftl
@@ -36,8 +36,9 @@
             <h2>Documentation</h2>
             <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="https://github.com/apache/roller/tree/master/docs"; role="button">Latest 
Nightly Docs (ODT) &raquo;</a></p>
+            <p>
+                <a class="btn btn-default" 
href="https://github.com/apache/roller/tree/roller-5.2.0/docs"; 
role="button">Docs for latest release in Open Office (ODT) format</a>
+            </p>
         </div>
     </div>
 </div>

Reply via email to