From c92275eeb39ba184dbc6d526ca658dfcc49ba03d Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Thu, 19 Jan 2023 15:43:17 +0200
Subject: [PATCH 1/2] scicomp/glossary: Scientific Computing terms

- Suggestion, can decide later if this should be continued.
---
 scicomp/glossary.rst | 51 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 scicomp/glossary.rst

diff --git a/scicomp/glossary.rst b/scicomp/glossary.rst
new file mode 100644
index 000000000..5996d79c0
--- /dev/null
+++ b/scicomp/glossary.rst
@@ -0,0 +1,51 @@
+Glossary of scientific computing
+================================
+
+.. glossary::
+   :sorted:
+
+   Automated testing
+       See testing
+
+   Command line
+
+   Computational complexity
+
+   Documentation
+
+   git
+
+   Linux
+
+   Matlab
+
+   Partition
+      A group of nodes in Slurm, used for scheduling and configuration.
+      For example, the "debug" partition, the "long" partition, etc.
+
+   Python
+
+   R
+
+   Research software engineering
+
+   Scientific Computing
+
+   Shell
+
+   Slurm
+      A commonly-used batch queuing system - a system that distributes
+      work to nodes on a high-performance computing cluster.
+
+   Software
+
+   Testing
+
+   Version control
+
+   X11, X-server
+      X11 is the UNIX graphics protocol.
+
+   X11 forwarding
+      When we talk of "X forwarding", we mean "allowing a program on some
+      remote computer to display graphics on your local computer"

From 0dcdd88bf88a19dde22515ff99b22d89f19ffba3 Mon Sep 17 00:00:00 2001
From: Richard Darst <rkd@zgib.net>
Date: Wed, 26 Apr 2023 00:02:17 +0300
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: Thomas Pfau <github@thomaspfau.de>
---
 scicomp/glossary.rst | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scicomp/glossary.rst b/scicomp/glossary.rst
index 5996d79c0..95665054b 100644
--- a/scicomp/glossary.rst
+++ b/scicomp/glossary.rst
@@ -8,27 +8,28 @@ Glossary of scientific computing
        See testing
 
    Command line
-
+      The non graphical interface to the operating system, that allows to run system commands and other commands without needing graphical interaction. 
    Computational complexity
-
+      Amount of resources (e.g. cpu-time, memory) required for an algorithm, often based on the number of input values. 
    Documentation
 
    git
-
+      Versioning system that allows you to keep track of changes and return to earlier versions of your code/documents. 
    Linux
-
+      A type computer operating system that comes in many flavors.
    Matlab
-
+      A programming language and graphical development environment created by Mathworks
    Partition
       A group of nodes in Slurm, used for scheduling and configuration.
       For example, the "debug" partition, the "long" partition, etc.
 
    Python
 
+```      A programming language popular with scientific computing.
    R
-
+      A programming language popular in scientific programming
    Research software engineering
-
+       A field of work which aims at improving and organizing code produced by researchers making it more sustainable and long lived.
    Scientific Computing
 
    Shell