diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000000000000000000000000000000000000..ec90221075d7264ec28faae8284929a6d74a92cb
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,5 @@
+
+For a full list of changes between the different releases of NEST,
+please see the release page on GitHub:
+
+ https://github.com/nest/nest-simulator/releases
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecb7213b0934640c4634e39df1c1b4f727ec6819..ec2a53e2cc1aaecfbfad55ca471ef503e49f394a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set( NEST_USER_EMAIL "nest_user@nest-initiative.org" )
# VERSION exported to libnestutil/config.h, extras/create_release.sh
set( NEST_VERSION_MAJOR 2 )
-set( NEST_VERSION_MINOR 11 )
+set( NEST_VERSION_MINOR 12 )
set( NEST_VERSION_PATCHLEVEL 0 )
set( NEST_VERSION_VERSION "${NEST_VERSION_MAJOR}.${NEST_VERSION_MINOR}.${NEST_VERSION_PATCHLEVEL}" )
diff --git a/README.md b/README.md
index 9a51b3958781447ca7d46b3d83abb2eeaec4d654..85f5a3ebfa6189a2ee3a956a641ebf237ec35172 100644
--- a/README.md
+++ b/README.md
@@ -105,65 +105,42 @@ you received in the NEST sources.
## Citing NEST
-Please cite NEST if you use it in your work. If you use this version of NEST,
-please cite it as `Bos, Hannah et al. (2015). NEST 2.10.0. Zenodo.
-10.5281/zenodo.44222`. The full citation is available in different formats on
-[Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
+Please cite NEST if you use it in your work.
-Here is a suitable BibTeX entry:
+If you use NEST 2.12.0, please cite it as `Kunkel, Susanne et al. (2017).
+NEST 2.12.0. Zenodo. 10.5281/zenodo.259534`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.259534).
-```latex
-@misc{bos_2015_44222,
- author = {Bos, Hannah and
- Morrison, Abigail and
- Peyser, Alexander and
- Hahne, Jan and
- Helias, Moritz and
- Kunkel, Susanne and
- Ippen, Tammo and
- Eppler, Jochen Martin and
- Schmidt, Maximilian and
- Seeholzer, Alex and
- Djurfeldt, Mikael and
- Diaz, Sandra and
- Morén, Janne and
- Deepu, Rajalekshmi and
- Stocco, Teo and
- Deger, Moritz and
- Michler, Frank and
- Plesser, Hans Ekkehard},
- title = {NEST 2.10.0},
- month = dec,
- year = 2015,
- doi = {10.5281/zenodo.44222},
- url = {http://dx.doi.org/10.5281/zenodo.44222}
-}
-```
+If you use NEST v2.10.0, please cite it as **Bos, Hannah et al. (2015).
+NEST 2.10.0. Zenodo. 10.5281/zenodo.44222**. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
-If you use NEST v2.8.0, please cite it as `Eppler, Jochen Martin et al. (2015).
-NEST 2.8.0. Zenodo. 10.5281/zenodo.32969`. The full citation is available in
-different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.32969).
+If you use NEST v2.8.0, please cite it as `Eppler, Jochen Martin et al. (2015).
+NEST 2.8.0. Zenodo. 10.5281/zenodo.32969`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.32969).
-For all other versions below NEST v2.8.0 please use: [Gewaltig M-O & Diesmann M
-(2007) NEST (Neural Simulation Tool) Scholarpedia
+For all versions below NEST v2.8.0 and for citing NEST without referring to a
+specific version, please use: [Gewaltig M-O & Diesmann M (2007) NEST (Neural
+Simulation Tool) Scholarpedia
2(4):1430](http://www.scholarpedia.org/article/NEST_(Neural_Simulation_Tool)).
Here is a suitable BibTeX entry:
```latex
@ARTICLE{Gewaltig:NEST,
- author = {Marc-Oliver Gewaltig and Markus Diesmann},
- title = {NEST (NEural Simulation Tool)},
+ author = {Marc-Oliver Gewaltig and Markus Diesmann},
+ title = {NEST (NEural Simulation Tool)},
journal = {Scholarpedia},
- year = {2007},
- volume = {2},
- pages = {1430},
- number = {4}
+ year = {2007},
+ volume = {2},
+ pages = {1430},
+ number = {4}
}
```
Please get in touch with us about your publications that used NEST, we will add
-it to our publication list, thus making it visible to potential readers.
+them to our [publication list](http://www.nest-simulator.org/publications), thus
+making them visible to potential readers.
## Editor support
diff --git a/extras/create_rcsinfo.sh b/extras/create_rcsinfo.sh
index 71be44672d969a4ef10f90affbb2407c63b2c0aa..1b2200a7d7be4a5c234c5a98fec02499a3446116 100755
--- a/extras/create_rcsinfo.sh
+++ b/extras/create_rcsinfo.sh
@@ -6,7 +6,7 @@
# default value, if git is not installed or if the source directory is
# not under version control
-version="v2.11.0"
+version="v2.12.0"
# check if we can run the git command
if command -v git >/dev/null 2>&1; then
diff --git a/extras/userdoc/md/documentation/download.md b/extras/userdoc/md/documentation/download.md
index 1519e905df2dda407c28c88d4a2059fde16ca7ab..2eb3710dd119e861219ae0ceffce883989d3eee6 100644
--- a/extras/userdoc/md/documentation/download.md
+++ b/extras/userdoc/md/documentation/download.md
@@ -13,31 +13,42 @@ For details about how to contribute to the development of NEST, see the [develop
## Citing NEST
-Please cite NEST in any of your work which is based on NEST.
+Please cite NEST if you use it in your work.
-If you use this version of NEST, please cite it as
-**Bos, Hannah et al. (2015). NEST 2.10.0. Zenodo. 10.5281/zenodo.44222**.
-The full citation is available in different formats on
-[Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
+If you use NEST 2.12.0, please cite it as `Kunkel, Susanne et al. (2017).
+NEST 2.12.0. Zenodo. 10.5281/zenodo.259534`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.259534).
-For all other versions below NEST v2.8.0 use: Gewaltig M-O & Diesmann M (2007)
-[NEST (Neural Simulation Tool)](http://www.scholarpedia.org/article/NEST_(Neural_Simulation_Tool))
-*Scholarpedia* 2(4):1430.
+If you use NEST v2.10.0, please cite it as **Bos, Hannah et al. (2015).
+NEST 2.10.0. Zenodo. 10.5281/zenodo.44222**. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
+
+If you use NEST v2.8.0, please cite it as `Eppler, Jochen Martin et al. (2015).
+NEST 2.8.0. Zenodo. 10.5281/zenodo.32969`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.32969).
+
+For all versions below NEST v2.8.0 and for citing NEST without referring to a
+specific version, please use: [Gewaltig M-O & Diesmann M (2007) NEST (Neural
+Simulation Tool) Scholarpedia
+2(4):1430](http://www.scholarpedia.org/article/NEST_(Neural_Simulation_Tool)).
Here is a suitable BibTeX entry:
- @ARTICLE{Gewaltig:NEST,
- author = {Marc-Oliver Gewaltig and Markus Diesmann},
- title = {NEST (NEural Simulation Tool)},
- journal = {Scholarpedia},
- year = {2007},
- volume = {2},
- pages = {1430},
- number = {4}
- }
-
-If you tell us about your publications that used NEST, we will add it to our
-publication list, thus making it visible to potential readers.
+```latex
+@ARTICLE{Gewaltig:NEST,
+ author = {Marc-Oliver Gewaltig and Markus Diesmann},
+ title = {NEST (NEural Simulation Tool)},
+ journal = {Scholarpedia},
+ year = {2007},
+ volume = {2},
+ pages = {1430},
+ number = {4}
+}
+```
+
+Please get in touch with us about your publications that used NEST, we will
+add them to our [publication list](publications.md), thus making them visible
+to potential readers.
## Ubuntu 15.10 Live Media with NEST 2.8.0
diff --git a/extras/userdoc/md/documentation/index.md b/extras/userdoc/md/documentation/index.md
index f3398435144776e6980f6cd5643f2f93f1960d35..b8ed2a7c288b052c6e423a19d7b6db8f99d1dc6a 100644
--- a/extras/userdoc/md/documentation/index.md
+++ b/extras/userdoc/md/documentation/index.md
@@ -6,7 +6,7 @@
Use NEST for your research, modify and improve it
- Current Release [NEST 2.10.0 (Dec 31 2015)](download.md)
+ Current Release [NEST 2.12.0 (Feb 24 2017)](download.md)
- *Tools for modern computational neuroscience*
@@ -125,20 +125,24 @@ To learn more about the capabilities of NEST, see the [Feature summary](features
## Please cite NEST and tell us about your work
-If you have used NEST for your work either directly or via PyNN, please cite it
-in your publications as:
+Please cite NEST if you use it in your work.
-For NEST v2.10.0, please cite it as `Bos, Hannah et al. (2015). NEST 2.10.0.
-Zenodo. 10.5281/zenodo.44222`. The full citation is available in different
-formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
+If you use NEST 2.12.0, please cite it as `Kunkel, Susanne et al. (2017).
+NEST 2.12.0. Zenodo. 10.5281/zenodo.259534`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.259534).
-If you use NEST v2.8.0, please cite it as `Eppler, Jochen Martin et al. (2015).
-NEST 2.8.0. Zenodo. 10.5281/zenodo.32969`. The full citation is available in
-different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.32969).
+If you use NEST v2.10.0, please cite it as **Bos, Hannah et al. (2015).
+NEST 2.10.0. Zenodo. 10.5281/zenodo.44222**. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.44222).
-For all other versions below NEST v2.8.0 please use:
-Gewaltig M-O & Diesmann M (2007) [NEST (Neural Simulation Tool)](http://www.scholarpedia.org/article/NEST_(Neural_Simulation_Tool))
-*Scholarpedia* 2(4):1430.
+If you use NEST v2.8.0, please cite it as `Eppler, Jochen Martin et al. (2015).
+NEST 2.8.0. Zenodo. 10.5281/zenodo.32969`. The full citation is available
+in different formats on [Zenodo](http://dx.doi.org/10.5281/zenodo.32969).
+
+For all versions below NEST v2.8.0 and for citing NEST without referring to a
+specific version, please use: [Gewaltig M-O & Diesmann M (2007) NEST (Neural
+Simulation Tool) Scholarpedia
+2(4):1430](http://www.scholarpedia.org/article/NEST_(Neural_Simulation_Tool)).
Here is suitable BibTeX entry:
@@ -152,10 +156,9 @@ Here is suitable BibTeX entry:
number = {4}
}
-If you tell us about your publications that used [NEST](download.md),
-we will add it to our [publication list](publications.md),
-thus making it visible to potential readers. Send us your reference or even a
-reprint, using the mail address given on the [contact page](impressum.md).
+Please get in touch with us about your publications that used NEST, we will
+add them to our [publication list](publications.md), thus making them visible
+to potential readers.
## NEST logo for your poster or presentation