Merge branch 'master' into azure_pipelines

brian-team · Jan 7, 2021 · 27c91e3 · 27c91e3
2 parents 29fcdf9 + 046b0ba
commit 27c91e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -41,3 +41,4 @@ Denis Alevi (@denisalevi)
 Dominik Spicher (@dspicher)
 Felix B. Kern (@kernfel)
 Jan Marker (@jangmarker)
+Rohith Varma Buddaraju (@rohithvarma3000)
diff --git a/docs_sphinx/user/refractoriness.rst b/docs_sphinx/user/refractoriness.rst
@@ -22,7 +22,7 @@ valid for all neurons::
                     refractory=2*ms)
 
 Alternatively, it can be a string expression that evaluates to a time. This
-expression will be evaluated after every spike and allows for a changing
+expression will be evaluated after every spike and allows for a varying
 refractory period. For example, the following will set the refractory period
 to a random duration between 1ms and 3ms after every spike::
 
@@ -55,7 +55,7 @@ it relax back to a steady-state value between spikes::
 In some cases, the condition for leaving the refractory period is not easily
 expressed as a certain time span. For example, in a Hodgkin-Huxley type model the
 threshold is only used for *counting* spikes and the refractoriness is used to
-prevent to count multiple spikes for a single threshold crossing (the threshold
+prevent the count of multiple spikes for a single threshold crossing (the threshold
 condition would evaluate to ``True`` for several time points). When a neuron
 should leave the refractory period is not easily expressed as a time span but
 more naturally as a condition that the neuron should remain refractory for as