Skip to content

Commit 4c05ecf

Browse files
authored
Merge pull request #1628 from choldgraf/myst
switching to myst markdown in docs
2 parents cc826ab + 90c9bde commit 4c05ecf

File tree

7 files changed

+38
-70
lines changed

7 files changed

+38
-70
lines changed

doc/doc-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pydata_sphinx_theme
22
pyyaml
3-
recommonmark
3+
myst_parser
44
sphinx-autobuild
55
sphinx-copybutton
6-
sphinx
6+
sphinx<3

doc/source/administrator/advanced.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,11 @@ In your `hub.extraConfig`,
169169
You need to have a `import z2jh` at the top of your `extraConfig` for
170170
`z2jh.get_config()` to work.
171171

172-
```eval_rst
173-
.. versionchanged:: 0.8
174-
175-
`hub.extraConfigMap` used to be required for specifying additional values
176-
to pass, which was more restrictive.
177-
`hub.extraConfigMap` is deprecated in favor of the new
178-
top-level `custom` field, which allows fully arbitrary yaml.
172+
```{versionchanged} 0.8
173+
`hub.extraConfigMap` used to be required for specifying additional values
174+
to pass, which was more restrictive.
175+
`hub.extraConfigMap` is deprecated in favor of the new
176+
top-level `custom` field, which allows fully arbitrary yaml.
179177
```
180178

181179
### `hub.extraEnv`

doc/source/administrator/optimization.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
```eval_rst
2-
.. _optimization:
3-
```
4-
1+
(optimization)=
52
# Optimizations
63

74
This page contains information and guidelines for improving the reliability,
@@ -74,7 +71,7 @@ situations:
7471
referring to how a [Helm
7572
hook](https://docs.helm.sh/developing_charts/#hooks) is used to accomplish
7673
this, a more informative name would have been *pre-upgrade-image-puller*.
77-
74+
7875
**NOTE**: With this enabled your `helm upgrade` will take a long time if you
7976
introduce a new image as it will wait for the pulling to complete. We
8077
recommend that you add `--timeout 600` or similar to your `helm upgrade`
@@ -165,10 +162,7 @@ prePuller:
165162
tag: 2343e33dec46
166163
```
167164

168-
```eval_rst
169-
.. _efficient-cluster-autoscaling:
170-
```
171-
165+
(efficient-cluster-autoscaling)=
172166
## Efficient Cluster Autoscaling
173167

174168
A [*Cluster
@@ -271,7 +265,7 @@ following:
271265
kubernetes labels, but this label must be a kubernetes label.
272266

273267
- The taint: `hub.jupyter.org/dedicated=user:NoSchedule`
274-
268+
275269
**NOTE**: You may need to replace `/` with `_` due cloud provider
276270
limitations. Both taints are tolerated by the user pods.
277271

doc/source/conf.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,14 @@
2020

2121
from datetime import date
2222

23-
from recommonmark.transform import AutoStructify
2423
import yaml
2524

2625

2726
# -- Sphinx setup function ---------------------------------------------------
2827
# ref: http://www.sphinx-doc.org/en/latest/extdev/tutorial.html#the-setup-function
2928

3029
def setup(app):
31-
app.add_config_value(
32-
'recommonmark_config',
33-
{ 'enable_eval_rst': True, },
34-
True,
35-
)
36-
app.add_stylesheet('custom.css')
37-
app.add_transform(AutoStructify)
30+
app.add_css_file('custom.css')
3831

3932

4033
# -- Project information -----------------------------------------------------
@@ -71,7 +64,7 @@ def setup(app):
7164
# ones.
7265
extensions = ['sphinx.ext.mathjax',
7366
'sphinx_copybutton',
74-
'recommonmark']
67+
'myst_parser']
7568

7669
# List of patterns, relative to source directory, that match files and
7770
# directories to ignore when looking for source files.

doc/source/customizing/user-management.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,11 @@ have to start their server again, and the state of their previous session
1212
(variables they've created, any in-memory data, etc)
1313
will be lost. This is known as *culling*.
1414

15-
```eval_rst
16-
17-
.. note::
18-
19-
In JupyterHub, "inactivity" is defined as no response from the user's
20-
browser. JupyterHub constantly pings the user's JupyterHub browser session
21-
to check whether it is open. This means that leaving the computer running
22-
with the JupyterHub window open will **not** be treated as inactivity.
15+
```{note}
16+
In JupyterHub, "inactivity" is defined as no response from the user's
17+
browser. JupyterHub constantly pings the user's JupyterHub browser session
18+
to check whether it is open. This means that leaving the computer running
19+
with the JupyterHub window open will **not** be treated as inactivity.
2320
```
2421

2522
To disable culling, put the following into `config.yaml`:
@@ -40,13 +37,10 @@ cull:
4037
every: <number-of-seconds-this-check-is-done>
4138
```
4239
43-
```eval_rst
44-
45-
.. note::
46-
47-
While JupyterHub automatically runs the culling process, it is not a
48-
replacement for keeping an eye on your cluster to make sure resources
49-
are being used as expected.
40+
```{note}
41+
While JupyterHub automatically runs the culling process, it is not a
42+
replacement for keeping an eye on your cluster to make sure resources
43+
are being used as expected.
5044
```
5145

5246
## Admin Users

doc/source/customizing/user-storage.md

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
```eval_rst
2-
.. _user-storage:
3-
```
4-
1+
(user-storage)=
52
# Customizing User Storage
63

74
For the purposes of this guide, we'll describe "storage" as
@@ -48,7 +45,7 @@ In the future, when the user logs back in, JupyterHub will
4845
detect that the user has a pre-existing `PVC` and will simply
4946
attach it to their new pod, rather than creating a new `PVC`.
5047

51-
### How can this process break down?
48+
## How can this process break down?
5249

5350
When Kubernetes uses the `PVC` to create a new user `PV`, it
5451
is sending a command to the underlying API of whatever cloud
@@ -61,17 +58,15 @@ may be simultaneously attached to a node in your cluster. Check
6158
your cloud provider for details on the limits of storage
6259
resources you request.
6360

64-
```eval_rst
65-
.. note::
66-
67-
Some cloud providers have a limited number of disks that can be attached to
68-
each node. Since JupyterHub allocates one disk per user for
69-
persistent storage, this limits the number of users that can be running in
70-
a node at any point of time. If you need users to have
71-
persistent storage, and you end up hitting this limit, you must use
72-
*more* nodes in order to accommodate the disk for each user. In this
73-
case, we recommend allocating *fewer* resources per node (e.g. RAM) since
74-
you'll have fewer users packed onto a single node.
61+
```{note}
62+
Some cloud providers have a limited number of disks that can be attached to
63+
each node. Since JupyterHub allocates one disk per user for
64+
persistent storage, this limits the number of users that can be running in
65+
a node at any point of time. If you need users to have
66+
persistent storage, and you end up hitting this limit, you must use
67+
*more* nodes in order to accommodate the disk for each user. In this
68+
case, we recommend allocating *fewer* resources per node (e.g. RAM) since
69+
you'll have fewer users packed onto a single node.
7570
```
7671

7772
## Configuration
@@ -199,9 +194,8 @@ singleuser:
199194
type: none
200195
```
201196

202-
```eval_rst
203-
Next :ref:`apply the changes <apply-config-changes>`.
204-
```
197+
Next {ref}`apply the changes <apply-config-changes>`.
198+
205199

206200
After the changes are applied, new users will no longer be allocated a
207201
persistent `$HOME` directory. Any currently running users will still have

doc/source/reference/reference.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
DO NOT EDIT THIS LINE. This file is used in `conf.py to generate schema.md`. Edit below and changes will propagate to the build.
2-
```eval_rst
3-
.. _helm-chart-configuration-reference:
4-
```
5-
6-
# Configuration Reference
2+
(helm-chart-configuration-reference)=
3+
# Configuration Reference
74

85
The [JupyterHub Helm
96
chart](https://github.com/jupyterhub/zero-to-jupyterhub-k8s) is configurable by
@@ -14,7 +11,5 @@ Below is a description of many *but not all* of the configurable values for the
1411
Helm chart. To see *all* configurable options, inspect their default values
1512
defined [here](https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/master/jupyterhub/values.yaml).
1613

17-
```eval_rst
1814
For more guided information about some specific things you can do with
19-
modifications to the helm chart, see the :ref:`customization-guide`.
20-
```
15+
modifications to the helm chart, see the {ref}`customization-guide`.

0 commit comments

Comments
 (0)