diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8cbe057..093bf8b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -98,7 +98,7 @@ Change Log 0.3.4 - 2019-03-26 ------------------ * Fix ``WindowsError`` not defined on POSIX systems (#90) -* Add support for blacklisting custom metatdata fields (#92, @casperdcl) +* Add support for blacklisting custom metadata fields (#92, @casperdcl) 0.3.3 - 2018-08-04 ------------------ @@ -205,7 +205,7 @@ Change Log 0.1.0 - not released -------------------- -* Based on Min RK's orginal but supports multiple versions of +* Based on Min RK's original but supports multiple versions of IPython/Jupyter and also strips the execution count. * Add install option that fails sensibly if not in a git repository, does not clobber an existing attributes file and checks for an diff --git a/README.rst b/README.rst index aa37b26..c2e249a 100644 --- a/README.rst +++ b/README.rst @@ -405,7 +405,7 @@ Using ``nbstripout`` as a pre-commit hook `pre-commit`_ is a framework for managing git `pre-commit hooks`_. -Once you have `pre-commit`_ installed, add the follwong to the +Once you have `pre-commit`_ installed, add the following to the ``.pre-commit-config.yaml`` in your repository: :: repos: @@ -438,7 +438,7 @@ Certain Git workflows are not well supported by `nbstripout`: `nbstripout` filter do still cause conflicts when attempting to sync upstream changes (`git pull`, `git merge` etc.). This is because Git has no way of resolving a conflict caused by a non-stripped local file being merged with a - stripped upstream file. Adressing this issue is out of scope for `nbstripout`. + stripped upstream file. Addressing this issue is out of scope for `nbstripout`. Read more and find workarounds in `#108`_. .. _#108: https://github.com/kynan/nbstripout/issues/108