Merge branch 'master' of github.com:nest/nest-simulator into fix_nc_s…

…licing
nest · May 23, 2024 · 4b63447 · 4b63447
2 parents 54c68ff + 0f4ae52
commit 4b63447
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -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.8069926.svg)](https://doi.org/10.5281/zenodo.8069926)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10834751.svg)](https://doi.org/10.5281/zenodo.10834751)
 
 [![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)

diff --git a/doc/htmldoc/hpc/parallel_computing.rst b/doc/htmldoc/hpc/parallel_computing.rst
@@ -161,7 +161,7 @@ Spikes between neurons and devices
 Synaptic plasticity models
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For synapse models supporting plasticity, synapse dynamics in the
+For synapse models supporting :hxt_ref:`plasticity`, synapse dynamics in the
 ``Connection`` object are always handled by the virtual process of the
 `target node`.
 

diff --git a/doc/htmldoc/tutorials/music_tutorial/music_tutorial_1.rst b/doc/htmldoc/tutorials/music_tutorial/music_tutorial_1.rst
@@ -56,7 +56,7 @@ A NEST network consists of three types of elements: neurons, devices,
 and connections between them.
 
 Neurons are the basic building blocks, and in NEST they are generally
-spiking point neuron models. Devices are supporting units that for
+spiking :hxt_ref:`point neuron` models. Devices are supporting units that for
 instance generate inputs to neurons or record data from them. The
 Poisson spike generator, the spike recorder recording device, and the
 MUSIC input and output proxies are all devices. Neurons and devices are

diff --git a/doc/htmldoc/tutorials/pynest_tutorial/part_3_connecting_networks_with_synapses.rst b/doc/htmldoc/tutorials/pynest_tutorial/part_3_connecting_networks_with_synapses.rst
@@ -64,10 +64,10 @@ STDP synapses
 
 For the majority of synapses, all of their parameters are accessible via
 :py:func:`.GetDefaults` and :py:func:`.SetDefaults`. Synapse models implementing
-spike-timing dependent plasticity are an exception to this, as their
+:hxt_ref:`spike-timing dependent plasticity` are an exception to this, as their
 dynamics are driven by the postsynaptic :hxt_ref:`spike train` as well as the
 pre-synaptic one. As a consequence, the time constant of the depressing
-window of :hxt_ref:`STDP` is a parameter of the postsynaptic neuron. It can be set
+window of STDP is a parameter of the postsynaptic neuron. It can be set
 as follows:
 
 ::