Merge lp:~akiban-technologies/akiban-persistit/3.1.5-update into lp:akiban-persistit

[Nathan Williams]

Bump version to 3.1.5 after release.

Includes two small typo fixes in the README file.

[Peter Beaman (pbeaman)]

Thanks.

[Peter Beaman (pbeaman)]

review: Approve

=== modified file 'README.rst'
--- README.rst	2012-08-02 21:23:37 +0000
+++ README.rst	2012-08-02 23:15:23 +0000
@@ -40,7 +40,7 @@
 Building and Running the Examples
 ---------------------------------
 
-Small examples are located in the ``examples`` directory. Each has a short README file describing the example, and an Ant build script (http://ant.apache.org). After building the main akiban-persisit jar file using Maven, you may run::
+Small examples are located in the ``examples`` directory. Each has a short README file describing the example, and an Ant build script (http://ant.apache.org). After building the main akiban-persistit jar file using Maven, you may run::
 
   ant run
 
@@ -50,7 +50,7 @@
 Download and Install Akiban Persistit From Binaries
 ---------------------------------------------------
 
-Pre-built jars can be downloaded directlry from http://akiban.com/akiban-persistit.
+Pre-built jars can be downloaded directly from http://akiban.com/akiban-persistit.
 
 Unpack the distribution kit into a convenient directory using the appropriate utility (e.g. unzip or tar).
 
@@ -59,6 +59,6 @@
 Working With Persistit
 ----------------------
 
-Add the ``akiban-persistit-3.1.4.jar`` file, found in the root directory of the distribution kit, to your project's classpath. For example, copy it to ``jre/lib/ext`` in your Java Runtime Environment, or add it to your classpath environment variable. 
+Add the jar file (e.g. ``akiban-persistit-3.1.5.jar``), found in the root directory of the distribution kit, to your project's classpath. For example, copy it to ``jre/lib/ext`` in your Java Runtime Environment, or add it to your classpath environment variable. 
 
 That's it. You are ready to work with Persistit.
 
=== modified file 'doc/conf.py'
--- doc/conf.py	2012-06-15 16:29:28 +0000
+++ doc/conf.py	2012-08-02 23:15:23 +0000
@@ -50,7 +50,7 @@
 #
 # version = short X.Y version.
 # release = full version, including alpha/beta/rc tags.
-version = '3.1.1'
+version = '3.1.5'
 release = version
 
 # Included while processing every rst file. Used only for working around inability
 
=== modified file 'pom.xml'
--- pom.xml	2012-08-02 14:19:26 +0000
+++ pom.xml	2012-08-02 23:15:23 +0000
@@ -4,7 +4,7 @@
 
     <groupId>com.akiban</groupId>
     <artifactId>akiban-persistit</artifactId>
-    <version>3.1.4-SNAPSHOT</version>
+    <version>3.1.5-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>akiban-persistit</name>