Skip to content

Commit 2e73acc

Browse files
authored
Merge pull request #6 from gassmoeller/fix_readthedocs
Fix cig bottom sidebar logo and improve documentation installation instructions
2 parents 58b9378 + 1c794a2 commit 2e73acc

File tree

4 files changed

+37
-23
lines changed

4 files changed

+37
-23
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<img src="/en/latest/_static/images/cig_logo_dots.png" alt="CIG Logo" height="80px" style="padding: 5px;"/>
1+
<img src="/en/latest/_static/cig_logo_dots.png" alt="CIG Logo" height="80px" style="padding: 5px;"/>

doc/sphinx_template/index.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,37 @@
1212

1313
Files here are in markdown (md) but you can use and mix in reStructuredText (rst) as well.
1414

15-
### License
15+
## About this documentation
16+
17+
This template uses the latest versions of the following python packages:
18+
19+
* sphinx 4.2.0
20+
* sphinx-book-theme 1.0.1
21+
* python 3.9.7
22+
* myst-parser 0.18.1 &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; *if using rst*
23+
* nbsphinx 0.9.2
24+
* sphinxcontrib-bibtex 2.5.0
25+
26+
If you want to build this documentation locally
27+
use `conda install` or `pip install` to install the packages. Alternatively,
28+
you can also use the file [environment.yml](https://github.com/geodynamics/software_template/blob/main/doc/sphinx_template/environment.yml) to create a new conda environment
29+
with all packages as `conda env create -f environment.yml`.
30+
31+
## Building
32+
33+
To build this html documentation locally, execute in the main directory `sphinx_template`:
34+
35+
```
36+
make html
37+
```
38+
39+
This creates the `_build/html` directory.
40+
41+
Open `index.html` to display your manual in a browser window.
42+
43+
See [https://readthedocs.org/](https://readthedocs.org/) for online hosting of your manual.
44+
45+
## License
1646

1747
*My Project* is published under the GNU GPL v3 or newer license.
1848

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
(cha:installation)=
22
# Installation
33

4-
This template uses the latest versions of the following:
5-
6-
* sphinx 4.2.0
7-
* sphinx-book-theme 1.0.1
8-
* python 3.9.7
9-
* myst-parser 0.18.1 &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; *if using rst*
10-
* nbsphinx 0.9.2
11-
* sphinxcontrib-bibtex 2.5.0
12-
13-
Use `conda install` or `pip install`.
4+
Include instructions for how to install your software. This page can also reference
5+
your [INSTALL](https://github.com/geodynamics/software_template/blob/main/INSTALL)
6+
or [README.md](https://github.com/geodynamics/software_template/blob/main/README.md#installation-instructions)
7+
file.

doc/sphinx_template/user/run.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
(cha:run-aspect)=
22
# Running *My Project*
33

4-
5-
To create html documentation, from the main directory `docs`:
6-
```
7-
make html
8-
```
9-
10-
This creates the `_build` directory.
11-
12-
Select `index.html` to display your manual in a browser window.
13-
14-
See [https://readthedocs.org/](https://readthedocs.org/) for online hosting of your manual.
4+
Instructions for how to run *My Project*.

0 commit comments

Comments
 (0)