Commit 40c693a0 authored by Robert Bradshaw's avatar Robert Bradshaw

merge

parents 33483b66 44358d3b
...@@ -7,9 +7,3 @@ syntax: glob ...@@ -7,9 +7,3 @@ syntax: glob
syntax: regexp syntax: regexp
^build/ ^build/
^_build/ ^_build/
...@@ -29,7 +29,7 @@ highlight_language = 'cython' ...@@ -29,7 +29,7 @@ highlight_language = 'cython'
# Add any Sphinx extension module names here, as strings. They can be extensions # Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['ipython_console_highlighting', 'sphinx.ext.pngmath', 'sphinx.ext.todo'] extensions = ['ipython_console_highlighting', 'cython_highlighting', 'sphinx.ext.pngmath', 'sphinx.ext.todo']
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ['_templates']
...@@ -42,15 +42,15 @@ master_doc = 'index' ...@@ -42,15 +42,15 @@ master_doc = 'index'
# General substitutions. # General substitutions.
project = 'Cython' project = 'Cython'
copyright = '2009, Stefan Behnel, Robert Bradshaw, Grew Ewing, Gabriel Gellner, Dag Seljebotn, William Stein, et al.' copyright = '2010, Stefan Behnel, Robert Bradshaw, Dag Sverre Seljebotn, Greg Ewing, William Stein, Gabriel Gellner, et al.'
# The default replacements for |version| and |release|, also used in various # The default replacements for |version| and |release|, also used in various
# other places throughout the built documents. # other places throughout the built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.12' version = '0.13'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.12' release = '0.13'
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.. _extension_types: .. _extension_types:
*************** ***************
Extention Types Extension Types
*************** ***************
* Normal Python as well as extension type classes can be defined. * Normal Python as well as extension type classes can be defined.
...@@ -165,7 +165,7 @@ Special Methods ...@@ -165,7 +165,7 @@ Special Methods
#. There are substantial differences in some behavior. #. There are substantial differences in some behavior.
#. Some Cython special methods have no Python counter-part. #. Some Cython special methods have no Python counter-part.
* See the :doc:`special_methods_table` for the many that are available. * See the :ref:`special_methods_table` for the many that are available.
Declaration Declaration
...@@ -338,7 +338,7 @@ Forward Declarations ...@@ -338,7 +338,7 @@ Forward Declarations
Extension Types and None Extension Types and None
======================== ========================
* Parameters and C-variables declared as an Extention type, may take the value of ``None``. * Parameters and C-variables declared as an Extension type, may take the value of ``None``.
* This is analogous to the way a C-pointer can take the value of ``NULL``. * This is analogous to the way a C-pointer can take the value of ``NULL``.
.. note:: .. note::
......
.. _special_methods_table:
Special Methods Table Special Methods Table
--------------------- ---------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment