Skip to content

Commit

Permalink
Merge branch 'master' of github.com:squidfunk/mkdocs-material
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Dec 2, 2019
2 parents 51cf935 + 90f7a10 commit a98b932
Show file tree
Hide file tree
Showing 7 changed files with 1,316 additions and 1,022 deletions.
2 changes: 1 addition & 1 deletion docs/customization.md
Expand Up @@ -174,7 +174,7 @@ the Material theme and recompile it. This is fairly easy.

[5]: https://webpack.js.org/
[6]: https://babeljs.io
[7]: http://sass-lang.com
[7]: https://sass-lang.com

### Environment setup

Expand Down
2 changes: 1 addition & 1 deletion docs/extensions/codehilite.md
Expand Up @@ -11,7 +11,7 @@ executed during compilation of the Markdown file.
[Docker image][3] with all dependencies pre-installed.

[1]: https://python-markdown.github.io/extensions/code_hilite/
[2]: http://pygments.org
[2]: https://pygments.org
[3]: https://hub.docker.com/r/squidfunk/mkdocs-material/

## Installation
Expand Down
4 changes: 2 additions & 2 deletions docs/extensions/pymdown.md
Expand Up @@ -5,7 +5,7 @@ great features to the standard Markdown library. For this reason, the
**installation of this package is highly recommended** as it's well-integrated
with the Material theme.

[1]: http://facelessuser.github.io/pymdown-extensions/
[1]: https://facelessuser.github.io/pymdown-extensions/

## Installation

Expand Down Expand Up @@ -95,7 +95,7 @@ extra_javascript:

[2]: https://facelessuser.github.io/pymdown-extensions/extensions/arithmatex/
[3]: https://www.mathjax.org/
[4]: http://meta.math.stackexchange.com/questions/5020/
[4]: https://math.meta.stackexchange.com/questions/5020/mathjax-basic-tutorial-and-quick-reference
[5]: ../customization.md#additional-javascript

#### Blocks
Expand Down
8 changes: 4 additions & 4 deletions docs/getting-started.md
Expand Up @@ -10,19 +10,19 @@ good to go with the following commands:

``` sh
python --version
# Python 2.7.13
# Python 3.8.0
pip --version
# pip 9.0.1
# pip 19.3.1
```

Installing and verifying MkDocs is as simple as:

``` sh
pip install mkdocs && mkdocs --version
# mkdocs, version 0.17.1
# mkdocs, version 1.0.4
```

Material requires MkDocs >= 0.17.1.
Material requires MkDocs >= 1.0.0.

[1]: https://www.mkdocs.org

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Expand Up @@ -75,7 +75,7 @@ extra:
- type: twitter
link: https://twitter.com/squidfunk
- type: linkedin
link: https://linkedin.com/in/squidfunk
link: https://www.linkedin.com/in/squidfunk/

# Extensions
markdown_extensions:
Expand Down

0 comments on commit a98b932

Please sign in to comment.