Build the actual Sphinx documentation, plus a number of typo fixes.

docs/Makefile

@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/mwparserfromhell.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/mwparserfromhell.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/mwparserfromhell"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/mwparserfromhell"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."

docs/api/modules.rst

@@ -0,0 +1,7 @@
+mwparserfromhell
+================
+
+.. toctree::
+   :maxdepth: 6
+
+   mwparserfromhell

docs/api/mwparserfromhell.nodes.extras.rst

@@ -0,0 +1,25 @@
+extras Package
+==============
+
+:mod:`extras` Package
+---------------------
+
+.. automodule:: mwparserfromhell.nodes.extras
+    :members:
+    :undoc-members:
+
+:mod:`attribute` Module
+-----------------------
+
+.. automodule:: mwparserfromhell.nodes.extras.attribute
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`parameter` Module
+-----------------------
+
+.. automodule:: mwparserfromhell.nodes.extras.parameter
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/api/mwparserfromhell.nodes.rst

@@ -0,0 +1,56 @@
+nodes Package
+=============
+
+:mod:`nodes` Package
+--------------------
+
+.. automodule:: mwparserfromhell.nodes
+
+.. autoclass:: mwparserfromhell.nodes.Node
+
+:mod:`heading` Module
+---------------------
+
+.. automodule:: mwparserfromhell.nodes.heading
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`html_entity` Module
+-------------------------
+
+.. automodule:: mwparserfromhell.nodes.html_entity
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`tag` Module
+-----------------
+
+.. automodule:: mwparserfromhell.nodes.tag
+    :members:
+    :show-inheritance:
+
+:mod:`template` Module
+----------------------
+
+.. automodule:: mwparserfromhell.nodes.template
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`text` Module
+------------------
+
+.. automodule:: mwparserfromhell.nodes.text
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    mwparserfromhell.nodes.extras
+

docs/api/mwparserfromhell.parser.rst

@@ -0,0 +1,41 @@
+parser Package
+==============
+
+:mod:`parser` Package
+---------------------
+
+.. automodule:: mwparserfromhell.parser
+    :members:
+    :undoc-members:
+
+:mod:`builder` Module
+---------------------
+
+.. automodule:: mwparserfromhell.parser.builder
+    :members:
+    :undoc-members:
+    :private-members:
+
+:mod:`contexts` Module
+----------------------
+
+.. automodule:: mwparserfromhell.parser.contexts
+    :members:
+    :undoc-members:
+
+:mod:`tokenizer` Module
+-----------------------
+
+.. automodule:: mwparserfromhell.parser.tokenizer
+    :members:
+    :undoc-members:
+    :private-members:
+
+.. autoexception:: mwparserfromhell.parser.tokenizer.BadRoute
+
+:mod:`tokens` Module
+--------------------
+
+.. automodule:: mwparserfromhell.parser.tokens
+    :members:
+    :undoc-members:

docs/api/mwparserfromhell.rst

@@ -0,0 +1,54 @@
+mwparserfromhell Package
+========================
+
+:mod:`mwparserfromhell` Package
+-------------------------------
+
+.. automodule:: mwparserfromhell.__init__
+    :members:
+    :undoc-members:
+
+:mod:`compat` Module
+--------------------
+
+.. automodule:: mwparserfromhell.compat
+    :members:
+    :undoc-members:
+
+:mod:`smart_list` Module
+------------------------
+
+.. automodule:: mwparserfromhell.smart_list
+    :members: SmartList, _ListProxy
+    :undoc-members:
+    :show-inheritance:
+
+:mod:`string_mixin` Module
+--------------------------
+
+.. automodule:: mwparserfromhell.string_mixin
+    :members:
+    :undoc-members:
+
+:mod:`utils` Module
+-------------------
+
+.. automodule:: mwparserfromhell.utils
+    :members:
+    :undoc-members:
+
+:mod:`wikicode` Module
+----------------------
+
+.. automodule:: mwparserfromhell.wikicode
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+Subpackages
+-----------
+
+.. toctree::
+
+    mwparserfromhell.nodes
+    mwparserfromhell.parser

docs/conf.py

@@ -0,0 +1,246 @@
+# -*- coding: utf-8 -*-
+#
+# mwparserfromhell documentation build configuration file, created by
+# sphinx-quickstart on Tue Aug 21 20:47:26 2012.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'mwparserfromhell'
+copyright = u'2012 Ben Kurtovic'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.1'
+# The full version, including alpha/beta/rc tags.
+release = '0.1.dev'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'nature'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'mwparserfromhelldoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'mwparserfromhell.tex', u'mwparserfromhell Documentation',
+   u'Ben Kurtovic', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'mwparserfromhell', u'mwparserfromhell Documentation',
+     [u'Ben Kurtovic'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'mwparserfromhell', u'mwparserfromhell Documentation',
+   u'Ben Kurtovic', 'mwparserfromhell', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'http://docs.python.org/': None}

docs/index.rst

@@ -0,0 +1,28 @@
+MWParserFromHell v0.1 Documentation
+===================================
+
+**mwparserfromhell** (the *MediaWiki Parser from Hell*) is a Python package
+that provides an easy-to-use and outrageously powerful parser for MediaWiki_
+wikicode. It supports Python 2 and Python 3.
+
+Developed by Earwig_ with help from `Σ`_.
+
+.. _MediaWiki:            http://mediawiki.org
+.. _Earwig:               http://en.wikipedia.org/wiki/User:The_Earwig
+.. _Σ:                    http://en.wikipedia.org/wiki/User:Σ
+
+Contents
+--------
+
+.. toctree::
+   :maxdepth: 2
+
+   API Reference <api/modules>
+
+
+Indices and tables
+------------------
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

mwparserfromhell/__init__.py

@@ -37,4 +37,4 @@ __email__ = "ben.kurtovic@verizon.net"
 from . import nodes, parser, smart_list, string_mixin, wikicode
 
 parse = lambda text: parser.Parser(text).parse()
-parse.__doc__ = """Short for mwparserfromhell.parser.Parser(text).parse()."""
+parse.__doc__ = "Short for ``mwparserfromhell.parser.Parser(text).parse()``."

mwparserfromhell/compat.py

@@ -4,7 +4,7 @@
 Implements support for both Python 2 and Python 3 by defining common types in
 terms of their Python 2/3 variants. For example, :py:class:`str` is set to
 :py:class:`unicode` on Python 2 but :py:class:`str` on Python 3; likewise,
-:py;class:`bytes` is :py:class:`str` on 2 but :py:class:`bytes` on 3. These
+:py:class:`bytes` is :py:class:`str` on 2 but :py:class:`bytes` on 3. These
 types are meant to be imported directly from within the parser's modules.
 """
 

mwparserfromhell/nodes/tag.py

@@ -185,7 +185,7 @@ class Tag(Node):
         """The list of attributes affecting the tag.
 
         Each attribute is an instance of
-        :py:class:`~mwparserfromhell.nodes.extas.attribute.Attribute`.
+        :py:class:`~mwparserfromhell.nodes.extras.attribute.Attribute`.
         """
         return self._attrs
 

mwparserfromhell/nodes/template.py

@@ -197,7 +197,7 @@ class Template(Node):
         raise ValueError(name)
 
     def add(self, name, value, showkey=None, force_nonconformity=False):
-        """Add a parameter to the template with a given *name* and *value.
+        """Add a parameter to the template with a given *name* and *value*.
 
         *name* and *value* can be anything parasable by
         :py:func:`mwparserfromhell.utils.parse_anything`; pipes (and equal

mwparserfromhell/parser/__init__.py

@@ -43,8 +43,8 @@ class Parser(object):
     series of tokens by the
     :py:class:`~mwparserfromhell.parser.tokenizer.Tokenizer`, and then the
     tokens are converted into trees of
-    :py:class`~mwparserfromhell.wikicode.Wikicode` objects and
-    :py:class:`~mwparserfromhell.nodes.Node`\ nodes by the
+    :py:class:`~mwparserfromhell.wikicode.Wikicode` objects and
+    :py:class:`~mwparserfromhell.nodes.Node`\ s by the
     :py:class:`~mwparserfromhell.parser.builder.Builder`.
     """
 

mwparserfromhell/parser/contexts.py

@@ -25,31 +25,34 @@ This module contains various "context" definitions, which are essentially flags
 set during the tokenization process, either on the current parse stack (local
 contexts) or affecting all stacks (global contexts). They represent the context
 the tokenizer is in, such as inside a template's name definition, or inside a
-heading of level two. This is used to determine what tokens are valid at the
+level-two heading. This is used to determine what tokens are valid at the
 current point and also if the current parsing route is invalid.
 
 The tokenizer stores context as an integer, with these definitions bitwise OR'd
-to add them, AND'd to check if they're set, and XOR'd to remove them. The
-advantage of this is that contexts can have sub-contexts (as FOO == 0b11 will
-cover BAR == 0b10 and BAZ == 0b01).
+to set them, AND'd to check if they're set, and XOR'd to unset them. The
+advantage of this is that contexts can have sub-contexts (as ``FOO == 0b11``
+will cover ``BAR == 0b10`` and ``BAZ == 0b01``).
 
 Local (stack-specific) contexts:
 
-* TEMPLATE
-** TEMPLATE_NAME
-** TEMPLATE_PARAM_KEY
-** TEMPLATE_PARAM_VALUE
-* HEADING
-** HEADING_LEVEL_1
-** HEADING_LEVEL_2
-** HEADING_LEVEL_3
-** HEADING_LEVEL_4
-** HEADING_LEVEL_5
-** HEADING_LEVEL_6
+* :py:const:`TEMPLATE` (``0b000000111``)
+
+    * :py:const:`TEMPLATE_NAME` (``0b000000001``)
+    * :py:const:`TEMPLATE_PARAM_KEY` (``0b000000010``)
+    * :py:const:`TEMPLATE_PARAM_VALUE` (``0b000000100``)
+
+* :py:const:`HEADING` (``0b111111000``)
+
+    * :py:const:`HEADING_LEVEL_1` (``0b000001000``)
+    * :py:const:`HEADING_LEVEL_2` (``0b000010000``)
+    * :py:const:`HEADING_LEVEL_3` (``0b000100000``)
+    * :py:const:`HEADING_LEVEL_4` (``0b001000000``)
+    * :py:const:`HEADING_LEVEL_5` (``0b010000000``)
+    * :py:const:`HEADING_LEVEL_6` (``0b100000000``)
 
 Global contexts:
 
-* GL_HEADING
+* :py:const:`GL_HEADING` (``0b1``)
 """
 
 # Local contexts:

mwparserfromhell/parser/tokenizer.py

@@ -32,7 +32,7 @@ from ..compat import htmlentities
 __all__ = ["Tokenizer"]
 
 class BadRoute(Exception):
-    """Raised internally when the current tokenization route ss invalid."""
+    """Raised internally when the current tokenization route is invalid."""
     pass
 
 
@@ -120,7 +120,7 @@ class Tokenizer(object):
         *delta* (which can be negative). If *wrap* is ``False``, we will not
         allow attempts to read from the end of the string if ``self._head +
         delta`` is negative. If *strict* is ``True``, the route will be failed
-        (with ``:py:meth:`_fail_route`) if we try to read from past the end of
+        (with :py:meth:`_fail_route`) if we try to read from past the end of
         the string; otherwise, :py:attr:`self.END <END>` is returned. If we try
         to read from before the start of the string, :py:attr:`self.START
         <START>` is returned.

mwparserfromhell/parser/tokens.py

@@ -28,32 +28,6 @@ a syntactically valid form by the
 :py:class:`~mwparserfromhell.parser.tokenizer.Tokenizer`, and then converted
 into the :py:class`~mwparserfromhell.wikicode.Wikicode` tree by the
 :py:class:`~mwparserfromhell.parser.builder.Builder`.
-
-Tokens:
-
-* Text = make("Text")
-* *Templates*
-** TemplateOpen
-** TemplateParamSeparator
-** TemplateParamEquals
-** TemplateClose
-** HTMLEntityStart
-** HTMLEntityNumeric
-** HTMLEntityHex
-** HTMLEntityEnd
-* *Headings*
-** HeadingStart
-** HeadingEnd
-* *Tags*
-** TagOpenOpen
-** TagAttrStart
-** TagAttrEquals
-** TagAttrQuote
-** TagCloseOpen
-** TagCloseSelfclose
-** TagOpenClose
-** TagCloseClose
-
 """
 
 from __future__ import unicode_literals
@@ -63,7 +37,7 @@ from ..compat import basestring, py3k
 __all__ = ["Token"]
 
 class Token(object):
-    """A token represents the semantic meaning of a unit of wikicode."""
+    """A token stores the semantic meaning of a unit of wikicode."""
 
     def __init__(self, **kwargs):
         super(Token, self).__setattr__("_kwargs", kwargs)

mwparserfromhell/smart_list.py

@@ -47,7 +47,7 @@ def inheritdoc(method):
 class SmartList(list):
     """Implements the ``list`` interface with special handling of sublists.
 
-    When a sublist is created (through list[i:j]), any changes made to this
+    When a sublist is created (by ``list[i:j]``), any changes made to this
     list (such as the addition, removal, or replacement of elements) will be
     reflected in the sublist, or vice-versa, to the greatest degree possible.
     This is implemented by having sublists - instances of the