diff --git a/README.rst b/README.rst
index c9d169b57..498f3e30f 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ Cantera
Version 2.4.0b1 (development)
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.170284.svg
- :target: https://doi.org/10.5281/zenodo.170284
+ :target: https://doi.org/10.5281/zenodo.1174508
What is Cantera?
================
diff --git a/doc/sphinx/about.rst b/doc/sphinx/about.rst
index 7bd18be8a..622335d50 100644
--- a/doc/sphinx/about.rst
+++ b/doc/sphinx/about.rst
@@ -57,7 +57,7 @@ follows:
David G. Goodwin, Harry K. Moffat, and Raymond L. Speth. *Cantera: An object-
oriented software toolkit for chemical kinetics, thermodynamics, and
- transport processes*. http://www.cantera.org, 2017. Version 2.3.0.
+ transport processes*. http://www.cantera.org, 2017. Version 2.4.0.
doi:10.5281/zenodo.170284
The following BibTeX entry may also be used::
@@ -66,10 +66,10 @@ The following BibTeX entry may also be used::
author = "David G. Goodwin and Harry K. Moffat and Raymond L. Speth",
title = "Cantera: An Object-oriented Software Toolkit for Chemical
Kinetics, Thermodynamics, and Transport Processes",
- year = 2017,
- note = "Version 2.3.0",
+ year = 2018,
+ note = "Version 2.4.0",
howpublished = "\url{http://www.cantera.org}",
- doi = {10.5281/zenodo.170284}
+ doi = {10.5281/zenodo.1174508}
}
If you are using a different version of Cantera, update the ``version`` and
diff --git a/doc/sphinx/compiling/config-options.rst b/doc/sphinx/compiling/config-options.rst
index 481529fa3..190ef6911 100644
--- a/doc/sphinx/compiling/config-options.rst
+++ b/doc/sphinx/compiling/config-options.rst
@@ -552,7 +552,7 @@ Options List
* ``versioned_shared_library``: [ ``yes`` | ``no`` ]
If enabled, create a versioned shared library, with symlinks to the
- more generic library name, e.g. ``libcantera_shared.so.2.3.0`` as the
+ more generic library name, e.g. ``libcantera_shared.so.2.4.0`` as the
actual library and ``libcantera_shared.so`` and ``libcantera_shared.so.2``
as symlinks.
diff --git a/doc/sphinx/compiling/source-code.rst b/doc/sphinx/compiling/source-code.rst
index 6992779f5..565ab0d91 100644
--- a/doc/sphinx/compiling/source-code.rst
+++ b/doc/sphinx/compiling/source-code.rst
@@ -14,7 +14,7 @@ Stable Release
Then, check out the tag of the most recent stable version::
- git checkout tags/v2.3.0
+ git checkout tags/v2.4.0
A list of all the tags can be shown by::
@@ -36,7 +36,7 @@ Beta Release
* **Option 1**: Check out the tag with the most recent beta release::
- git checkout tags/v2.3.0b1
+ git checkout tags/v2.4.0b1
Note that the most recent beta version might be older than the most recent
stable release. A list of all the tags, including stable and beta versions can
@@ -47,9 +47,9 @@ Beta Release
* **Option 2**: Check out the branch with all the bug fixes leading to the
next minor release of the stable version::
- git checkout 2.3
+ git checkout 2.4
- This branch has all the work on the 2.3.x version of the software.
+ This branch has all the work on the 2.4.x version of the software.
Development Version
-------------------
diff --git a/doc/sphinx/cxx-guide/simple-example.rst b/doc/sphinx/cxx-guide/simple-example.rst
index 2c44cf87c..b0d70f506 100644
--- a/doc/sphinx/cxx-guide/simple-example.rst
+++ b/doc/sphinx/cxx-guide/simple-example.rst
@@ -16,7 +16,7 @@ Before you can run this program, it first needs to be compiled. On a Linux
system using the GCC compiler, a typical command line for compiling this program
might look like this::
- g++ -o combustor -pthread -O3 -std=c++0x -I/opt/cantera-2.3.0/include -L/opt/cantera-2.3.0/lib -lcantera -lsundials_cvodes -lsundials_ida -lsundials_nvecserial combustor.cpp
+ g++ -o combustor -pthread -O3 -std=c++0x -I/opt/cantera-2.4.0/include -L/opt/cantera-2.4.0/lib -lcantera -lsundials_cvodes -lsundials_ida -lsundials_nvecserial combustor.cpp
The locations of the Cantera header files (specified by the `-I` option) and the
libraries (specified by the `-L` option) will vary depending on where you
diff --git a/doc/sphinx/install.rst b/doc/sphinx/install.rst
index d420bda4e..c84261060 100644
--- a/doc/sphinx/install.rst
+++ b/doc/sphinx/install.rst
@@ -88,7 +88,7 @@ Windows
=======
Windows installers are provided for stable versions of Cantera. These
-installation instructions are for Cantera 2.3.0. Use these installers if you
+installation instructions are for Cantera 2.4.0. Use these installers if you
want to work with a copy of Python downloaded from `Python.org
`_. If you are using Anaconda / Miniconda, see the
directions :ref:`above `.
@@ -98,7 +98,8 @@ directions :ref:`above `.
- On Windows, Installers are provided for Python 2.7, Python 3.4, Python 3.5,
and Python 3.6. Python 3.6 is recommended unless you need to use legacy
code that does not work with Python 3. You can install multiple Cantera
- Python modules simultaneously.
+ Python modules simultaneously. Note that Cantera 2.4 will be the last
+ version to support Python 2.7.
- Cantera supports both 32- and 64- bit Python installations.
@@ -159,7 +160,7 @@ directions :ref:`above `.
1.x series for Python *X.Y* that matches your Python architecture. In the
filename, the digits after "cp" indicate the Python version, e.g.
``numpy‑1.11.2+mkl‑cp35‑none‑win_amd64.whl`` is the installer for 64-bit
- Python 3.5. The Windows installers for Cantera 2.3.0 require Numpy 1.10 or
+ Python 3.5. The Windows installers for Cantera 2.4.0 require Numpy 1.10 or
newer.
- From an administrative command prompt, install the downloaded wheel using
@@ -186,10 +187,10 @@ directions :ref:`above `.
- Go to the `Cantera Releases `_
page.
- - *64-bit*: Download **Cantera-2.3.0-x64.msi** and
- **Cantera-Python-2.3.0-x64-pyX.Y.msi**.
- - *32-bit*: Download **Cantera-2.3.0-x86.msi** and
- **Cantera-Python-2.3.0-x86-pyX.Y.msi**.
+ - *64-bit*: Download **Cantera-2.4.0-x64.msi** and
+ **Cantera-Python-2.4.0-x64-pyX.Y.msi**.
+ - *32-bit*: Download **Cantera-2.4.0-x86.msi** and
+ **Cantera-Python-2.4.0-x86-pyX.Y.msi**.
- If you are only using the Python module, you do not need to download and
install the base package.
@@ -402,9 +403,9 @@ Ubuntu
======
Ubuntu packages are provided for recent versions of Ubuntu using a Personal
-Package Archive (PPA). As of Cantera 2.3.0, packages are available for Ubuntu
-Ubuntu 16.04 (Xenial Xerus) and Ubuntu 16.10 (Yakkety Yak). To see which Ubuntu
-releases and Cantera versions are currently available, visit
+Package Archive (PPA). As of Cantera 2.4.0, packages are available for Ubuntu
+Ubuntu 16.04 (Xenial Xerus) and Ubuntu 17.10 (Artful Aardvark). To see which
+Ubuntu releases and Cantera versions are currently available, visit
https://launchpad.net/~speth/+archive/ubuntu/cantera
The available packages are: