Merge branch 'master' of https://github.com/functionaljava/functionaljava.github.io

Author: mperry

community.html

@@ -107,7 +107,7 @@ <h2 id="_communication">Communication</h2>
 <p><a href="mailto:functionaljava@googlegroups.com">Group email: <a href="mailto:functionaljava@googlegroups.com">functionaljava@googlegroups.com</a></a></p>
 </li>
 <li>
-<p>IRC Channel: #functionaljava</p>
+<p>IRC Channel: <a href="irc://irc.freenode.net/#functionaljava">#functionaljava</a></p>
 </li>
 </ul>
 </div>

docs.html

@@ -114,22 +114,28 @@ <h2 id="_javadoc">Javadoc</h2>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="https://functionaljava.ci.cloudbees.com/job/master/javadoc/">Latest (4.2-beta-2-SNAPSHOT)</a></p>
+<p><a href="https://functionaljava.ci.cloudbees.com/job/master/javadoc/">Latest 4.x (currently 4.3-SNAPSHOT)</a></p>
 </li>
 <li>
-<p><a href="javadoc/4.1">4.1</a></p>
+<p><a href="http://www.functionaljava.org/javadoc/4.2/functionaljava/index.html">4.2 - functionaljava</a></p>
 </li>
 <li>
-<p><a href="javadoc/4.0">4.0</a></p>
+<p><a href="http://www.functionaljava.org/javadoc/4.2/functionaljava-java8/index.html">4.2 - functionaljava-java8</a></p>
 </li>
 <li>
-<p><a href="https://functionaljava.ci.cloudbees.com/job/3.x/javadoc/">Latest 3.x</a></p>
+<p><a href="http://www.functionaljava.org/javadoc/4.1/index.html">4.1</a></p>
 </li>
 <li>
-<p><a href="javadoc/3.2">3.2</a></p>
+<p><a href="http://www.functionaljava.org/javadoc/4.0/index.html">4.0</a></p>
 </li>
 <li>
-<p><a href="javadoc/3.1">3.1</a></p>
+<p><a href="https://functionaljava.ci.cloudbees.com/job/3.x/javadoc/">Latest 3.x (currently 3.3-SNAPSHOT)</a></p>
+</li>
+<li>
+<p><a href="http://www.functionaljava.org/javadoc/3.2/index.html">3.2</a></p>
+</li>
+<li>
+<p><a href="http://www.functionaljava.org/javadoc/3.1/index.html">3.1</a></p>
 </li>
 <li>
 <p><a href="https://functionaljava.googlecode.com/svn/artifacts/3.0/javadoc/index.html">3.0</a></p>
@@ -148,7 +154,7 @@ <h2 id="_building">Building</h2>
 <p>FunctionalJava uses the Retro Lambda project to backport Java 8 lambdas to Java 7 bytecode.  This requires access to both JDK 7 and 8.  The build system requires the environment variables <code>JAVA7_HOME</code> and <code>JAVA8_HOME</code> to refer to the appropriate directories.</p>
 </div>
 <div class="paragraph">
-<p>Building is done using Gradle 2.0.  In the root directory run:</p>
+<p>Building is done using Gradle.  In the root directory run:</p>
 </div>
 <div class="listingblock">
 <div class="content">

feed.xml

@@ -6,8 +6,8 @@
     <atom:link href="http://functionaljava.github.io/feed.xml" rel="self" type="application/rss+xml" />
     <description>Functional programming in Java</description>
     <language>en</language>
-    <pubDate>15/12/2014 1:32:57 AM</pubDate>
-    <lastBuildDate>15/12/2014 1:32:57 AM</lastBuildDate>
+    <pubDate>18/01/2015 12:08:48 AM</pubDate>
+    <lastBuildDate>18/01/2015 12:08:48 AM</lastBuildDate>
 
   </channel> 
 </rss>

quickstart.html

@@ -67,7 +67,7 @@ <h2>Quickstart</h2>
             <p><div id="preamble">
 <div class="sectionbody">
 <div class="paragraph">
-<p>The latest stable version as at Aug 2014 is <code>4.2-beta-1</code>.  Here is how to quickly add the library to your project and get started.</p>
+<p>The latest stable version as at January 2015 is <code>4.2</code>.  Here is how to quickly add the library to your project and get started.</p>
 </div>
 <div class="paragraph">
 <p>The Functional Java artifact is published to Maven Central using the group <code>org.functionaljava</code> with two published artifacts:</p>
@@ -92,8 +92,8 @@ <h2 id="_gradle">Gradle</h2>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>compile "org.functionaljava:functionaljava:4.2-beta-1"
-compile "org.functionaljava:functionaljava-java8:4.2-beta-1"</pre>
+<pre>compile "org.functionaljava:functionaljava:4.2"
+compile "org.functionaljava:functionaljava-java8:4.2"</pre>
 </div>
 </div>
 </div>
@@ -106,17 +106,16 @@ <h2 id="_maven">Maven</h2>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre>&lt;dependency&gt;
+<pre class="prettyprint xml language-xml"><code>&lt;dependency&gt;
     &lt;groupId&gt;org.functionaljava&lt;/groupId&gt;
     &lt;artifactId&gt;functionaljava&lt;/artifactId&gt;
-    &lt;version&gt;4.2-beta-1&lt;/version&gt;
+    &lt;version&gt;4.2&lt;/version&gt;
 &lt;/dependency&gt;
 &lt;dependency&gt;
     &lt;groupId&gt;org.functionaljava&lt;/groupId&gt;
     &lt;artifactId&gt;functionaljava-java8&lt;/artifactId&gt;
-    &lt;version&gt;4.2-beta-1&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
+    &lt;version&gt;4.2&lt;/version&gt;
+&lt;/dependency&gt;</code></pre>
 </div>
 </div>
 </div>