Skip to content

Commit

Permalink
Switch docs to MKDocs (#602)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
waylan authored Dec 7, 2017
1 parent de5c696 commit b62dded
Show file tree
Hide file tree
Showing 83 changed files with 2,438 additions and 3,274 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ test-output.html
build/*
dist/*
tmp/*
site/*
MANIFEST
.venv
*~
Expand Down
1 change: 0 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.


This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ As an Admin/Root user on your system do:

pip install markdown

Or for more specific instructions, view the documentation in `docs/install.txt`
or on the website at <https://pythonhosted.org/Markdown/install.html>.
Or for more specific instructions, view the documentation in `docs/install.md`
or on the website at <https://Python-Markdown.github.io/install/>.
25 changes: 12 additions & 13 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
Copyright 2004 Manfred Stienstra (the original version)
Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
Copyright 2004 Manfred Stienstra (the original version)

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Python Markdown Project nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

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

55 changes: 33 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,56 @@
[Python-Markdown][]
===================

[![Build Status](http://img.shields.io/travis/Python-Markdown/markdown.svg)](https://travis-ci.org/Python-Markdown/markdown)
[![Coverage Status](https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg)](https://codecov.io/gh/Python-Markdown/markdown)
[![Latest Version](http://img.shields.io/pypi/v/Markdown.svg)](http://pypi.python.org/pypi/Markdown)
[![Python Versions](http://img.shields.io/pypi/pyversions/Markdown.svg)](http://pypi.python.org/pypi/Markdown)
[![BSD License](http://img.shields.io/badge/license-BSD-yellow.svg)](http://opensource.org/licenses/BSD-3-Clause)
[![Code of Conduct](https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square)][Code of Conduct]

This is a Python implementation of John Gruber's [Markdown][].
[![Build Status][travis-button]][travis]
[![Coverage Status][codecov-button]][codecov]
[![Latest Version][mdversion-button]][md-pypi]
[![Python Versions][pyversion-button]][md-pypi]
[![BSD License][bsdlicense-button]][bsdlicense]
[![Code of Conduct][codeofconduct-button]][Code of Conduct]

[travis-button]: http://img.shields.io/travis/Python-Markdown/markdown.svg
[travis]: https://travis-ci.org/Python-Markdown/markdown
[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg
[codecov]: https://codecov.io/gh/Python-Markdown/markdown
[mdversion-button]: http://img.shields.io/pypi/v/Markdown.svg
[md-pypi]: http://pypi.python.org/pypi/Markdown
[pyversion-button]: http://img.shields.io/pypi/pyversions/Markdown.svg
[bsdlicense-button]: http://img.shields.io/badge/license-BSD-yellow.svg
[bsdlicense]: http://opensource.org/licenses/BSD-3-Clause
[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square
[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md

This is a Python implementation of John Gruber's [Markdown][].
It is almost completely compliant with the reference implementation,
though there are a few known issues. See [Features][] for information
on what exactly is supported and what is not. Additional features are
though there are a few known issues. See [Features][] for information
on what exactly is supported and what is not. Additional features are
supported by the [Available Extensions][].

[Python-Markdown]: https://pythonhosted.org/Markdown/
[Python-Markdown]: https://Python-Markdown.github.io/
[Markdown]: http://daringfireball.net/projects/markdown/
[Features]: https://pythonhosted.org/Markdown/index.html#Features
[Available Extensions]: https://pythonhosted.org/Markdown/extensions/index.html

[Features]: https://Python-Markdown.github.io#Features
[Available Extensions]: https://Python-Markdown.github.io/extensions

Documentation
-------------

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

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

Support
-------

You may ask for help and discuss various other issues on the [mailing list][] and report bugs on the [bug tracker][].
You may ask for help and discuss various other issues on the [mailing list][]
and report bugs on the [bug tracker][].

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

Code of Conduct
---------------

Everyone interacting in the Python-Markdown project's codebases, issue trackers, and mailing lists is expected to follow the [Code of Conduct].

[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md
Everyone interacting in the Python-Markdown project's codebases, issue trackers,
and mailing lists is expected to follow the [Code of Conduct].
8 changes: 4 additions & 4 deletions checkspelling.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash

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

let "fails=0"

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

if [ $fails -gt 0 ]; then
echo "$fails files with misspelled words."
Expand Down
81 changes: 0 additions & 81 deletions docs/_template.html

This file was deleted.

58 changes: 58 additions & 0 deletions docs/authors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
title: Authors

Primary Authors
===============

* __[Waylan Limberg](http://achinghead.com/)__

Waylan is the current maintainer of the code and has written much of the
current code base, included a complete refactor of the core. He started out
by authoring many of the available extensions and later was asked to join
Yuri, where he began fixing numerous bugs, adding documentation and making
general improvements to the existing code base.

* __[Yuri Takteyev](http://freewisdom.org/)__

Yuri wrote most of the code found in version 1.x while procrastinating his
Ph.D. Various pieces of his code still exist, most notably the basic
structure.

* __[Manfed Stienstra](http://www.dwerg.net/)__

Manfed wrote the original version of the script and is responsible for
various parts of the existing code base.

* __Artem Yunusov__

Artem, who as part of a 2008 GSoC project, refactored inline patterns,
replaced the NanoDOM with ElementTree support and made various other
improvements.

* __David Wolever__

David refactored the extension API and made other improvements
as he helped to integrate Markdown into Dr.Project.

Other Contributors
==================

The incomplete list of individuals below have provided patches or otherwise
contributed to the project in various ways. We would like to thank everyone
who has contributed to the project in any way.

* Eric Abrahamsen
* Jeff Balogh
* Sergej Chodarev
* Chris Clark
* Tiago Cogumbreiro
* Kjell Magne Fauske
* G. Clark Haynes
* Daniel Krech
* Steward Midwinter
* Jack Miller
* Neale Pickett
* Paul Stansifer
* John Szakmeister
* Malcolm Tredinnick
* Ben Wilson
* and many others who helped by reporting bugs
60 changes: 0 additions & 60 deletions docs/authors.txt

This file was deleted.

Loading

0 comments on commit b62dded

Please sign in to comment.