diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/dev/governance/governance.rst | 11 | ||||
| -rw-r--r-- | doc/source/f2py/signature-file.rst | 21 | ||||
| -rw-r--r-- | doc/source/reference/routines.indexing.rst | 1 | ||||
| -rw-r--r-- | doc/source/release.rst | 1 |
4 files changed, 23 insertions, 11 deletions
diff --git a/doc/source/dev/governance/governance.rst b/doc/source/dev/governance/governance.rst index 2e3937900..54e52363c 100644 --- a/doc/source/dev/governance/governance.rst +++ b/doc/source/dev/governance/governance.rst @@ -26,7 +26,7 @@ The Project =========== The NumPy Project (The Project) is an open source software project -affiliated with the 501(c)3 NumFocus Foundation. The goal of The Project +affiliated with the 501(c)3 NumFOCUS Foundation. The goal of The Project is to develop open source software for array-based computing in Python, and in particular the ``numpy`` package, along with related software such as ``f2py`` and the NumPy Sphinx extensions. The Software developed @@ -389,3 +389,12 @@ Acknowledgements Substantial portions of this document were adapted from the `Jupyter/IPython project's governance document <https://github.com/jupyter/governance/blob/master/governance.md>`_. + +License +======= + +To the extent possible under law, the authors have waived all +copyright and related or neighboring rights to the NumPy project +governance and decision-making document, as per the `CC-0 public +domain dedication / license +<https://creativecommons.org/publicdomain/zero/1.0/>`_. diff --git a/doc/source/f2py/signature-file.rst b/doc/source/f2py/signature-file.rst index cfc35ebda..a8924712f 100644 --- a/doc/source/f2py/signature-file.rst +++ b/doc/source/f2py/signature-file.rst @@ -21,7 +21,7 @@ scanning Fortran codes and writing a signature file, F2PY lowers all cases automatically except in multiline blocks or when ``--no-lower`` option is used. -The syntax of signature files is overvied below. +The syntax of signature files is presented below. Python module block ===================== @@ -178,12 +178,13 @@ Common block statements: <shortentitydecl> := <name> [ ( <arrayspec> ) ] [ , <shortentitydecl> ] - One ``python module`` block should not contain two or more - ``common`` blocks with the same name. Otherwise, the latter ones are - ignored. The types of variables in ``<shortentitydecl>`` are defined - using ``<argument type declarations>``. Note that the corresponding - ``<argument type declarations>`` may contain array specifications; - then you don't need to specify these in ``<shortentitydecl>``. + If a ``python module`` block contains two or more ``common`` blocks + with the same name, the variables from the additional declarations + are appended. The types of variables in ``<shortentitydecl>`` are + defined using ``<argument type declarations>``. Note that the + corresponding ``<argument type declarations>`` may contain array + specifications; then you don't need to specify these in + ``<shortentitydecl>``. Other statements: The ``<other statement>`` part refers to any other Fortran language @@ -400,8 +401,8 @@ The following attributes are used by F2PY: a C function. This is because the concepts of Fortran- and C contiguity overlap in one-dimensional cases. - If ``intent(c)`` is used as an statement but without entity - declaration list, then F2PY adds ``intent(c)`` attibute to all + If ``intent(c)`` is used as a statement but without an entity + declaration list, then F2PY adds the ``intent(c)`` attribute to all arguments. Also, when wrapping C functions, one must use ``intent(c)`` @@ -596,7 +597,7 @@ A C expression may contain: ``shape(<name>,<n>)`` Returns the ``<n>``-th dimension of an array ``<name>``. ``len(<name>)`` - Returns the lenght of an array ``<name>``. + Returns the length of an array ``<name>``. ``size(<name>)`` Returns the size of an array ``<name>``. ``slen(<name>)`` diff --git a/doc/source/reference/routines.indexing.rst b/doc/source/reference/routines.indexing.rst index 853d24126..8c3729f21 100644 --- a/doc/source/reference/routines.indexing.rst +++ b/doc/source/reference/routines.indexing.rst @@ -61,3 +61,4 @@ Iterating over arrays ndenumerate ndindex flatiter + lib.Arrayterator diff --git a/doc/source/release.rst b/doc/source/release.rst index 5ec9eb342..201d3e77f 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -3,6 +3,7 @@ Release Notes ************* .. include:: ../release/1.11.0-notes.rst +.. include:: ../release/1.10.1-notes.rst .. include:: ../release/1.10.0-notes.rst .. include:: ../release/1.9.2-notes.rst .. include:: ../release/1.9.1-notes.rst |