Skip to content

Commit

Permalink
Merge pull request #870 from Carreau/typoes
Browse files Browse the repository at this point in the history
A couple of typos
  • Loading branch information
blink1073 authored Aug 31, 2018
2 parents 9896339 + e1e7e89 commit 81d6d1a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/source/architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A detailed pipeline exploration
Nbconvert takes in a notebook, which is a JSON object, and operates on that object.

This can include operations that take a notebook and return a notebook.
For example, that operation could be to execute the notebook as though it were a continuous script; if it were executed ``--in-place`` then it would overwite the current notebook.
For example, that operation could be to execute the notebook as though it were a continuous script; if it were executed ``--in-place`` then it would overwrite the current notebook.
Or it could be that we wish to systematically alter the notebook, for example by clearing all output cells.
Format agnostic operations on cell content that do not violate the nbformat spec can be interpreted as a notebook to notebook conversion step; such operations can be performed as part of the preprocessing step.

Expand Down
8 changes: 4 additions & 4 deletions docs/source/nbconvert_library.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"If you understand HTML, you'll notice that some common tags are ommited, like the `body` tag. Those tags are included in the default `HtmlExporter`, which is what would have been constructed if we had not modified the `template_file`.\n",
"If you understand HTML, you'll notice that some common tags are omitted, like the `body` tag. Those tags are included in the default `HtmlExporter`, which is what would have been constructed if we had not modified the `template_file`.\n",
"\n",
"The resource dict contains (among many things) the extracted `.png`, `.jpg`, etc. from the notebook when applicable. The basic HTML exporter leaves the figures as embedded base64, but you can configure it to extract the figures. So for now, the resource dict should be mostly empty, except for a key containing CSS and a few others whose content will be obvious:"
]
Expand Down Expand Up @@ -303,7 +303,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Notice that base64 images are not embeded, but instead there are filename-like strings, such as `output_3_0.png`. The strings actually are (configurable) keys that map to the binary data in the resources dict.\n",
"Notice that base64 images are not embedded, but instead there are filename-like strings, such as `output_3_0.png`. The strings actually are (configurable) keys that map to the binary data in the resources dict.\n",
"\n",
"Note, if you write an RST Plugin, you are responsible for writing all the files to the disk (or uploading, etc...) in the right location. Of course, the naming scheme is configurable.\n",
"\n",
Expand Down Expand Up @@ -599,7 +599,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"## Programatically creating templates"
"## Programmatically creating templates"
]
},
{
Expand Down Expand Up @@ -650,7 +650,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"@jakevdp uses Pelican and Jupyter Notebook to blog. Pelican [will use](https://github.com/getpelican/pelican-plugins/pull/21) nbconvert programatically to generate blog post. Have a look a [Pythonic Preambulations](http://jakevdp.github.io/) for Jake's blog post."
"@jakevdp uses Pelican and Jupyter Notebook to blog. Pelican [will use](https://github.com/getpelican/pelican-plugins/pull/21) nbconvert programmatically to generate blog post. Have a look a [Pythonic Preambulations](http://jakevdp.github.io/) for Jake's blog post."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion nbconvert/preprocessors/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Preprocessor(NbConvertBase):
you can overwrite :meth:`preprocess_cell` to apply a transformation
independently on each cell or :meth:`preprocess` if you prefer your own
logic. See corresponding docstring for informations.
logic. See corresponding docstring for information.
Disabled by default and can be enabled via the config by
'c.YourPreprocessorName.enabled = True'
Expand Down
2 changes: 1 addition & 1 deletion nbconvert/templates/latex/base.tplx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ This template does not define a docclass, the inheriting class must define this.
% Define a nice break command that doesn't care if a line doesn't already
% exist.
\def\br{\hspace*{\fill} \\* }
% Math Jax compatability definitions
% Math Jax compatibility definitions
\def\gt{>}
\def\lt{<}
\let\Oldtex\TeX
Expand Down
4 changes: 2 additions & 2 deletions nbconvert/tests/test_nbconvertapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def test_default_config(self):

def test_override_config(self):
"""
Can the default config be overriden?
Can the default config be overridden?
"""
with self.create_temp_cwd(['notebook*.ipynb',
'jupyter_nbconvert_config.py',
Expand Down Expand Up @@ -425,7 +425,7 @@ def test_embedded_jpeg(self):
@onlyif_cmds_exist('pandoc')
def test_markdown_display_priority(self):
"""
Check to see if markdown conversion embedds PNGs,
Check to see if markdown conversion embeds PNGs,
even if an (unsupported) PDF is present.
"""
with self.create_temp_cwd(['markdown_display_priority.ipynb']):
Expand Down
2 changes: 1 addition & 1 deletion nbconvert/writers/debug.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#-----------------------------------------------------------------------------

class DebugWriter(WriterBase):
"""Consumes output from nbconvert export...() methods and writes usefull
"""Consumes output from nbconvert export...() methods and writes useful
debugging information to the stdout. The information includes a list of
resources that were extracted from the notebook(s) during export."""

Expand Down

0 comments on commit 81d6d1a

Please sign in to comment.