Skip to content

Commit a586d8f

Browse files
Merge pull request nest#2416 from jessica-mitchell/add-intro-models
Add introductory text for models in documentation
2 parents 5474df3 + cd4a49f commit a586d8f

File tree

9 files changed

+644
-81
lines changed

9 files changed

+644
-81
lines changed

doc/extractor_userdocs.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def UserDocExtractor(
131131
try:
132132
doc = rewrite_see_also(doc, filename, tags)
133133
except ValueError as e:
134-
log.warning("Failed to rebuild 'See also' section: %s", e)
134+
log.info("Failed to rebuild 'See also' section: %s", e)
135135
write_rst_files(doc, tags, outdir, outname)
136136

137137
log.info("%4d tags found:\n%s", len(tagdict), pformat(list(tagdict.keys())))
@@ -239,7 +239,7 @@ def rightcase(text):
239239
secend = nexttitle.start()
240240
original = doc[secstart:secend].strip().replace('\n', ' ')
241241
if original:
242-
log.warning("dropping manual 'see also' list in %s user docs: '%s'", filename, original)
242+
log.info("dropping manual 'see also' list in %s user docs: '%s'", filename, original)
243243
return (
244244
doc[:secstart] +
245245
"\n" + ", ".join([":doc:`{taglabel} <index_{tag}>`".format(tag=tag, taglabel=rightcase(tag))
@@ -344,11 +344,17 @@ def mkitem(t):
344344

345345
output = list()
346346
if top:
347-
page_title = "Model Directory"
347+
page_title = "Model directory"
348+
description = """
349+
The model directory is organized and autogenerated by keywords (e.g., adaptive threshold,
350+
conductance-based etc.). Models that contain a specific keyword will be listed under that word.
351+
For more information on models, see our :ref:`intro to NEST models <modelsmain>`.
352+
"""
348353
if len(hierarchy.keys()) == 1:
349354
page_title += ": " + ", ".join(current_tags)
350355
output.append(page_title)
351356
output.append(underlines[0]*len(page_title)+"\n")
357+
output.append(description + "\n")
352358
if len(hierarchy.keys()) != 1:
353359
underlines = underlines[1:]
354360

doc/htmldoc/installation/index.rst

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Install NEST
1919

2020
.. grid:: 1 1 2 2
2121

22-
.. grid-item-card:: |admin| Install NEST for supercomputers and clusters
22+
.. grid-item-card:: |admin| Install NEST for supercomputers and clusters
2323
:class-title: sd-d-flex-row sd-align-minor-center
2424

2525
I'm an admin or user who wants to :ref:`run NEST on HPC <admin_install>`
@@ -29,8 +29,20 @@ Install NEST
2929

3030
I'm a developer who wants to :ref:`do development in NEST <dev_install>`
3131

32+
.. grid:: 1 1 2 2
33+
34+
.. grid-item-card:: |nestml| Install NEST with NESTML
35+
:class-title: sd-d-flex-row sd-align-minor-center
36+
37+
I'm a user who wants to :doc:`create or customize models <nestml:installation>`.
38+
39+
|
40+
41+
42+
3243
----
3344

45+
3446
If installation didn't work, see the :ref:`troubleshooting section <troubleshooting>`.
3547

3648

@@ -48,3 +60,5 @@ If installation didn't work, see the :ref:`troubleshooting section <troubleshoot
4860
.. |teacher| image:: ../static/img/014-teacher.svg
4961
.. |admin| image:: ../static/img/001-shuttle.svg
5062
.. |dev| image:: ../static/img/dev_orange.svg
63+
.. |nestml| image:: ../static/img/nestml-logo.png
64+
:scale: 15%

doc/htmldoc/installation/lecturer.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ There are several materials for Bachelor and Master's level already prepared.
1717
Docker install
1818
~~~~~~~~~~~~~~
1919

20-
We provide a docker container for NEST, with options to include NEST-Desktop, Jupyter notebooks or Jupyterlab.
20+
We provide a docker container for NEST that also includes NESTML. You can select from options
21+
to also include NEST-Desktop, Jupyter Notebooks, or JupyterLab.
22+
2123

2224
See :ref:`instructions for docker here <docker>`.
2325

0 commit comments

Comments
 (0)