Merge branch 'master' into wiki-no-s

Author: sbliven

_config.yml

@@ -71,7 +71,8 @@ kramdown:
 
 # Release settings
 release:
- version: 4.2.1
+ version: 4.2.0
+ legacy: 1.9.1
 
 collections:
   wiki:

_layouts/page.html

@@ -5,7 +5,7 @@
 
   <header>
     <h2>{{ page.title }}</h2>
-    <p>{{ page.categories | join ' ' }}</p>
+    <p>{{ page.categories | join: ' ' }} {{ page.tags | join: ' ' }}</p>
   </header>
 
   <section class="wrapper style5">

_wiki/BioJava_GetStarted.md

@@ -20,7 +20,7 @@ You can get the latest version of BioJava3+ from the download page
 
 You can get the latest version of BioJava-legacy (a.k.a. BioJava1) from
 the download page [BioJava1 (v) (requires Java
-1.5+)](/wiki/BioJava:Download_{{current version legacy}} "wikilink").
+1.5+)](/wiki/BioJava:Download_{{site.release.legacy}} "wikilink").
 
 You can also integrate BioJava with NetBeans IDE. To find out how follow
 this [link](/wiki/How_to_integrate_BioJava_in_NetBeans_IDE "wikilink").
@@ -41,17 +41,17 @@ BioJava, as of release 4.0.0 is available through Maven Central.
 You can add the BioJava repository by adding the following XML to your
 project pom.xml file:
 
-            
+
             <dependencies>
                     ...
                     <dependency>
                             <groupId>org.biojava</groupId>
                             <artifactId>biojava-core</artifactId>
-                            <version>4.2.0</version>
+                            <version>{{site.release.version}}</version>
                     </dependency>
                     <!-- other biojava jars as needed -->
             </dependencies>
-        
+
 
 Installation
 ------------

_wiki/BioJava_GetStartedLegacy.md

@@ -37,7 +37,7 @@ available on many other platforms: if in doubt, contact your vendor.
 BioJava binaries are distributed in .jar (Java ARchive) format.
 
 You can get the latest version from the download page [BioJava (requires
-Java 1.5+)](/wiki/BioJava:Download_{{current version legacy}} "wikilink").
+Java 1.5+)](/wiki/BioJava:Download_{{site.release.legacy}} "wikilink").
 
 You can also integrate BioJava with NetBeans IDE. To find out how follow
 this [link](How_to_integrate_BioJava_in_NetBeans_IDE "wikilink").

feed.xml

@@ -8,14 +8,14 @@ layout: null
     <description>{{ site.description | xml_escape }}</description>
     <link>{{ site.url }}{{ site.baseurl }}/</link>
     <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
-    <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
-    <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
+    <pubDate>{{ site.time  }}</pubDate>
+    <lastBuildDate>{{ site.time  }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
     {% for post in site.wiki limit:10 %}
       <item>
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
-        <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
+        <pubDate>{{ post.date  }}</pubDate>
         <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
         <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
         {% for tag in post.tags %}