Skip to content

Commit b62dded

Browse files
authored
Switch docs to MKDocs (#602)
Fixes #601. Merged in 6f87b32 from the md3 branch and did a lot of cleanup. Changes include: * Removed old docs build tool, templates, etc. * Added MkDocs config file, etc. * filename.txt => filename.md * pythonhost.org/Markdown => Python-Markdown.github.io * Markdown lint and other cleanup. * Automate pages deployment in makefile with `mkdocs gh-deploy` Assumes a git remote is set up named "pages". Do git remote add pages https://github.com/Python-Markdown/Python-Markdown.github.io.git ... before running `make deploy` the first time.
1 parent de5c696 commit b62dded

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2438
-3274
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ test-output.html
66
build/*
77
dist/*
88
tmp/*
9+
site/*
910
MANIFEST
1011
.venv
1112
*~

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
4141
obligated to maintain confidentiality with regard to the reporter of an
4242
incident.
4343

44-
4544
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
4645
version 1.3.0, available at
4746
[http://contributor-covenant.org/version/1/3/0/][version]

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ As an Admin/Root user on your system do:
55

66
pip install markdown
77

8-
Or for more specific instructions, view the documentation in `docs/install.txt`
9-
or on the website at <https://pythonhosted.org/Markdown/install.html>.
8+
Or for more specific instructions, view the documentation in `docs/install.md`
9+
or on the website at <https://Python-Markdown.github.io/install/>.

LICENSE.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
2-
Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
3-
Copyright 2004 Manfred Stienstra (the original version)
1+
Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
2+
Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
3+
Copyright 2004 Manfred Stienstra (the original version)
44

55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without
88
modification, are permitted provided that the following conditions are met:
9-
10-
* Redistributions of source code must retain the above copyright
11-
notice, this list of conditions and the following disclaimer.
12-
* Redistributions in binary form must reproduce the above copyright
13-
notice, this list of conditions and the following disclaimer in the
14-
documentation and/or other materials provided with the distribution.
15-
* Neither the name of the <organization> nor the
16-
names of its contributors may be used to endorse or promote products
17-
derived from this software without specific prior written permission.
9+
10+
* Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in the
14+
documentation and/or other materials provided with the distribution.
15+
* Neither the name of the Python Markdown Project nor the
16+
names of its contributors may be used to endorse or promote products
17+
derived from this software without specific prior written permission.
1818

1919
THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''AS IS'' AND ANY
2020
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -27,4 +27,3 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
2727
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE.
30-

README.md

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,56 @@
11
[Python-Markdown][]
22
===================
33

4-
[![Build Status](http://img.shields.io/travis/Python-Markdown/markdown.svg)](https://travis-ci.org/Python-Markdown/markdown)
5-
[![Coverage Status](https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg)](https://codecov.io/gh/Python-Markdown/markdown)
6-
[![Latest Version](http://img.shields.io/pypi/v/Markdown.svg)](http://pypi.python.org/pypi/Markdown)
7-
[![Python Versions](http://img.shields.io/pypi/pyversions/Markdown.svg)](http://pypi.python.org/pypi/Markdown)
8-
[![BSD License](http://img.shields.io/badge/license-BSD-yellow.svg)](http://opensource.org/licenses/BSD-3-Clause)
9-
[![Code of Conduct](https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square)][Code of Conduct]
10-
11-
This is a Python implementation of John Gruber's [Markdown][].
4+
[![Build Status][travis-button]][travis]
5+
[![Coverage Status][codecov-button]][codecov]
6+
[![Latest Version][mdversion-button]][md-pypi]
7+
[![Python Versions][pyversion-button]][md-pypi]
8+
[![BSD License][bsdlicense-button]][bsdlicense]
9+
[![Code of Conduct][codeofconduct-button]][Code of Conduct]
10+
11+
[travis-button]: http://img.shields.io/travis/Python-Markdown/markdown.svg
12+
[travis]: https://travis-ci.org/Python-Markdown/markdown
13+
[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg
14+
[codecov]: https://codecov.io/gh/Python-Markdown/markdown
15+
[mdversion-button]: http://img.shields.io/pypi/v/Markdown.svg
16+
[md-pypi]: http://pypi.python.org/pypi/Markdown
17+
[pyversion-button]: http://img.shields.io/pypi/pyversions/Markdown.svg
18+
[bsdlicense-button]: http://img.shields.io/badge/license-BSD-yellow.svg
19+
[bsdlicense]: http://opensource.org/licenses/BSD-3-Clause
20+
[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square
21+
[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md
22+
23+
This is a Python implementation of John Gruber's [Markdown][].
1224
It is almost completely compliant with the reference implementation,
13-
though there are a few known issues. See [Features][] for information
14-
on what exactly is supported and what is not. Additional features are
25+
though there are a few known issues. See [Features][] for information
26+
on what exactly is supported and what is not. Additional features are
1527
supported by the [Available Extensions][].
1628

17-
[Python-Markdown]: https://pythonhosted.org/Markdown/
29+
[Python-Markdown]: https://Python-Markdown.github.io/
1830
[Markdown]: http://daringfireball.net/projects/markdown/
19-
[Features]: https://pythonhosted.org/Markdown/index.html#Features
20-
[Available Extensions]: https://pythonhosted.org/Markdown/extensions/index.html
21-
31+
[Features]: https://Python-Markdown.github.io#Features
32+
[Available Extensions]: https://Python-Markdown.github.io/extensions
2233

2334
Documentation
2435
-------------
2536

2637
Installation and usage documentation is available in the `docs/` directory
27-
of the distribution and on the project website at
28-
<https://pythonhosted.org/Markdown/>.
38+
of the distribution and on the project website at
39+
<https://Python-Markdown.github.io/>.
2940

30-
See the change log at <https://pythonhosted.org/Markdown/change_log.html>.
41+
See the change log at <https://Python-Markdown.github.io/change_log>.
3142

3243
Support
3344
-------
3445

35-
You may ask for help and discuss various other issues on the [mailing list][] and report bugs on the [bug tracker][].
46+
You may ask for help and discuss various other issues on the [mailing list][]
47+
and report bugs on the [bug tracker][].
3648

3749
[mailing list]: http://lists.sourceforge.net/lists/listinfo/python-markdown-discuss
38-
[bug tracker]: http://github.com/Python-Markdown/markdown/issues
50+
[bug tracker]: http://github.com/Python-Markdown/markdown/issues
3951

4052
Code of Conduct
4153
---------------
4254

43-
Everyone interacting in the Python-Markdown project's codebases, issue trackers, and mailing lists is expected to follow the [Code of Conduct].
44-
45-
[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md
55+
Everyone interacting in the Python-Markdown project's codebases, issue trackers,
56+
and mailing lists is expected to follow the [Code of Conduct].

checkspelling.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/bash
22

33
echo "Building docs..."
4-
python setup.py --quiet build_docs --force
4+
mkdocs build --clean
55
echo "Compiling Dictionary..."
66
aspell --lang=en create master ./tmp <.spell-dict
7-
echo "Checking spelling...\n"
7+
echo "Checking spelling..."
88

99
let "fails=0"
1010

11-
for file in $(find build/docs/ -type f -name "*.html"); do
11+
for file in $(find site/ -type f -name "*.html"); do
1212
words=$(aspell list --lang=en --mode=html --add-html-skip=code --extra-dicts=./tmp <$file)
1313
if [ "$words" ]; then
1414
uniquewords=$(tr ' ' '\n' <<< "${words[@]}" | sort -u | tr '\n' ' ')
@@ -22,7 +22,7 @@ for file in $(find build/docs/ -type f -name "*.html"); do
2222
fi
2323
done
2424
rm -f ./tmp
25-
rm -rf build
25+
rm -rf site
2626

2727
if [ $fails -gt 0 ]; then
2828
echo "$fails files with misspelled words."

docs/_template.html

Lines changed: 0 additions & 81 deletions
This file was deleted.

docs/authors.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
title: Authors
2+
3+
Primary Authors
4+
===============
5+
6+
* __[Waylan Limberg](http://achinghead.com/)__
7+
8+
Waylan is the current maintainer of the code and has written much of the
9+
current code base, included a complete refactor of the core. He started out
10+
by authoring many of the available extensions and later was asked to join
11+
Yuri, where he began fixing numerous bugs, adding documentation and making
12+
general improvements to the existing code base.
13+
14+
* __[Yuri Takteyev](http://freewisdom.org/)__
15+
16+
Yuri wrote most of the code found in version 1.x while procrastinating his
17+
Ph.D. Various pieces of his code still exist, most notably the basic
18+
structure.
19+
20+
* __[Manfed Stienstra](http://www.dwerg.net/)__
21+
22+
Manfed wrote the original version of the script and is responsible for
23+
various parts of the existing code base.
24+
25+
* __Artem Yunusov__
26+
27+
Artem, who as part of a 2008 GSoC project, refactored inline patterns,
28+
replaced the NanoDOM with ElementTree support and made various other
29+
improvements.
30+
31+
* __David Wolever__
32+
33+
David refactored the extension API and made other improvements
34+
as he helped to integrate Markdown into Dr.Project.
35+
36+
Other Contributors
37+
==================
38+
39+
The incomplete list of individuals below have provided patches or otherwise
40+
contributed to the project in various ways. We would like to thank everyone
41+
who has contributed to the project in any way.
42+
43+
* Eric Abrahamsen
44+
* Jeff Balogh
45+
* Sergej Chodarev
46+
* Chris Clark
47+
* Tiago Cogumbreiro
48+
* Kjell Magne Fauske
49+
* G. Clark Haynes
50+
* Daniel Krech
51+
* Steward Midwinter
52+
* Jack Miller
53+
* Neale Pickett
54+
* Paul Stansifer
55+
* John Szakmeister
56+
* Malcolm Tredinnick
57+
* Ben Wilson
58+
* and many others who helped by reporting bugs

docs/authors.txt

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)