Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nest/nest-simulator into 3.0-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
terhorstd committed Jun 10, 2021
2 parents daae58b + cd172b6 commit a1d1c6a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Documentation](https://img.shields.io/readthedocs/nest-simulator?logo=readthedocs&logo=Read%20the%20Docs&label=Documentation)](https://nest-simulator.org/documentation)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2218/badge)](https://bestpractices.coreinfrastructure.org/projects/2218)
[![License](http://img.shields.io/:license-GPLv2+-green.svg)](http://www.gnu.org/licenses/gpl-2.0.html)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3605514.svg)](https://doi.org/10.5281/zenodo.3605514)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4739103.svg)](https://doi.org/10.5281/zenodo.4739103)

[![Latest release](https://img.shields.io/github/release/nest/nest-simulator.svg?color=brightgreen&label=latest%20release)](https://github.com/nest/nest-simulator/releases)
[![GitHub contributors](https://img.shields.io/github/contributors/nest/nest-simulator?logo=github)](https://github.com/nest/nest-simulator)
Expand Down Expand Up @@ -125,6 +125,14 @@ to find out how to install NEST.

Please cite NEST if you use it in your work.

If you use NEST 3.0, please cite it as **Hahne, Jan et al. (2021).
NEST 3.0. Zenodo. 10.5281/zenodo.4739103**. The full citation is available
in different formats on [Zenodo](https://doi.org/10.5281/zenodo.4739103).

If you use NEST 2.20.1, please cite it as **Fardet, Tanguy et al. (2020)
NEST 2.20.1. Zenodo. 10.5281/zenodo.4018718**. The full citation is available
in different formats on [Zenodo](https://doi.org/10.5281/zenodo.4018718).

If you use NEST 2.20.0, please cite it as **Fardet, Tanguy et al. (2020)
NEST 2.20.0. Zenodo. 10.5281/zenodo.3605514**. The full citation is available
in different formats on [Zenodo](https://doi.org/10.5281/zenodo.3605514).
Expand Down
10 changes: 6 additions & 4 deletions doc/userdoc/citing-nest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ For the full citation and additional formats follow the doi Zenodo link.

Cite the version you used in your work:

Hahne, Jan et al. (2021). **NEST 3.0** Zenodo. https://doi.org/10.5281/zenodo.4739103

Fardet, Tanguy et al. (2020). **NEST 2.20.1** Zenodo. https://doi.org/10.5281/zenodo.4018718

Fardet, Tanguy et al. (2020). **NEST 2.20.0** Zenodo. https://doi.org/10.5281/zenodo.3605514
Expand All @@ -19,13 +21,13 @@ Jordan, Jakob et al. (2019). **NEST 2.18.0** Zenodo. https://doi.org/10.5281/zen

Linssen, Charl et al. (2018). **NEST 2.16.0** Zenodo. https://doi.org/10.5281/zenodo.1400175

Peyser, Alexander et al. (2017). **NEST 2.14.0** Zenodo. https://dx.doi.org/10.5281/zenodo.882971
Peyser, Alexander et al. (2017). **NEST 2.14.0** Zenodo. https://doi.org/10.5281/zenodo.882971

Kunkel, Susanne et al. (2017). **NEST 2.12.0** Zenodo. https://dx.doi.org/10.5281/zenodo.259534
Kunkel, Susanne et al. (2017). **NEST 2.12.0** Zenodo. https://doi.org/10.5281/zenodo.259534

Bos, Hannah et al. (2015). **NEST 2.10.0** Zenodo. https://dx.doi.org/10.5281/zenodo.44222
Bos, Hannah et al. (2015). **NEST 2.10.0** Zenodo. https://doi.org/10.5281/zenodo.44222

Eppler, Jochen Martin et al. (2015). **NEST 2.8.0** Zenodo. https://dx.doi.org/10.5281/zenodo.32969
Eppler, Jochen Martin et al. (2015). **NEST 2.8.0** Zenodo. https://doi.org/10.5281/zenodo.32969

For all versions below NEST 2.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
Expand Down

0 comments on commit a1d1c6a

Please sign in to comment.