Skip to content

Commit c7ec43d

Browse files
authored
Merge pull request #191 from HChughtai/review-docs-notes
Review docs notes - Added some clarifications including where to go to install Sphinx from, as well as updated a broken link to sphinx-quickstart documentation
2 parents 7b39f03 + fffaf9a commit c7ec43d

File tree

1 file changed

+37
-17
lines changed

1 file changed

+37
-17
lines changed

ch04packaging/04documentation.ipynb

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@
9090
"cell_type": "markdown",
9191
"metadata": {},
9292
"source": [
93-
"We're going to document our \"greeter\" example using docstrings with Sphinx.\n",
93+
"We're going to document our \"greeter\" example from the previous section using docstrings with Sphinx.\n",
9494
"\n",
95-
"There are various conventions for how to write docstrings, but the native sphinx one doesn't look nice when used with\n",
95+
"There are various conventions for how to write docstrings, but the native Sphinx one doesn't look nice when used with\n",
9696
"the built in `help` system.\n",
9797
"\n",
9898
"In writing Greeter, we used the docstring conventions from NumPy.\n",
9999
"So we use the [numpydoc](https://numpydoc.readthedocs.io/en/latest/) sphinx extension to \n",
100-
"support these."
100+
"support these (Note: you will need to install this extension for the later examples to work)."
101101
]
102102
},
103103
{
@@ -134,17 +134,25 @@
134134
"cell_type": "markdown",
135135
"metadata": {},
136136
"source": [
137-
"### Set up sphinx"
137+
"### Set up Sphinx"
138+
]
139+
},
140+
{
141+
"cell_type": "markdown",
142+
"metadata": {},
143+
"source": [
144+
"Install Sphinx using the [appropiate instructions](https://www.sphinx-doc.org/en/master/usage/installation.html) for your system following the documentation online.\n",
145+
"(Note that your output and the linked documentation may differ slightly depending on when you installed Sphinx and what version you're using.)"
138146
]
139147
},
140148
{
141149
"cell_type": "markdown",
142150
"metadata": {},
143151
"source": [
144152
"\n",
145-
"Invoke the [sphinx-quickstart](https://www.sphinx-doc.org/en/latest/usage/quickstart.html) command to build Sphinx's\n",
153+
"Invoke the [sphinx-quickstart](https://www.sphinx-doc.org/en/master/usage/quickstart.html) command to build Sphinx's\n",
146154
"configuration file automatically based on questions\n",
147-
"at the command line:\n"
155+
"at the command line:"
148156
]
149157
},
150158
{
@@ -168,13 +176,17 @@
168176
"metadata": {},
169177
"source": [
170178
"```\n",
171-
"Welcome to the Sphinx 1.8.0 quickstart utility.\n",
179+
"Welcome to the Sphinx 3.3.0 quickstart utility.\n",
172180
"\n",
173-
"Please enter avalues for the following settings (just press Enter to\n",
181+
"Please enter values for the following settings (just press Enter to\n",
174182
"accept a default value, if one is given in brackets).\n",
175183
"\n",
176-
"Enter the root path for documentation.\n",
177-
"> Root path for the documentation [.]:\n",
184+
"Selected root path: .\n",
185+
"\n",
186+
"You have two options for placing the build directory for Sphinx output.\n",
187+
"Either, you use a directory \"_build\" within the root path, or you separate\n",
188+
"\"source\" and \"build\" directories within the root path.\n",
189+
"> Separate source and build directories (y/n) [n]:\n",
178190
"```"
179191
]
180192
},
@@ -215,7 +227,10 @@
215227
"cell_type": "code",
216228
"execution_count": 1,
217229
"metadata": {
218-
"collapsed": false
230+
"collapsed": false,
231+
"jupyter": {
232+
"outputs_hidden": false
233+
}
219234
},
220235
"outputs": [
221236
{
@@ -295,7 +310,10 @@
295310
"cell_type": "code",
296311
"execution_count": 2,
297312
"metadata": {
298-
"collapsed": false
313+
"collapsed": false,
314+
"jupyter": {
315+
"outputs_hidden": false
316+
}
299317
},
300318
"outputs": [
301319
{
@@ -335,7 +353,10 @@
335353
"cell_type": "code",
336354
"execution_count": 3,
337355
"metadata": {
338-
"collapsed": false
356+
"collapsed": false,
357+
"jupyter": {
358+
"outputs_hidden": false
359+
}
339360
},
340361
"outputs": [
341362
{
@@ -348,8 +369,7 @@
348369
{
349370
"name": "stderr",
350371
"output_type": "stream",
351-
"text": [
352-
]
372+
"text": []
353373
}
354374
],
355375
"source": [
@@ -513,9 +533,9 @@
513533
"name": "python",
514534
"nbconvert_exporter": "python",
515535
"pygments_lexer": "ipython3",
516-
"version": "3.7.3"
536+
"version": "3.8.5"
517537
}
518538
},
519539
"nbformat": 4,
520-
"nbformat_minor": 0
540+
"nbformat_minor": 4
521541
}

0 commit comments

Comments
 (0)