summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorslepton <slepton@posteo.de>2021-07-07 21:25:53 +0200
committerslepton <slepton@posteo.de>2021-07-07 21:25:53 +0200
commitd19584547a7934bfce9dee445e65a2c1994cecdc (patch)
tree2013779442bff7d9f47464fd3a1b6ba755b0070d /doc/source
parent5ac75798362cea6ecbd602a46b80c297b0f6712a (diff)
parentde245cd133699f8c23f97ec07ec29703e37a5923 (diff)
downloadnumpy-d19584547a7934bfce9dee445e65a2c1994cecdc.tar.gz
Merge remote-tracking branch 'origin/main' into main
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/dev/governance/governance.rst6
-rw-r--r--doc/source/dev/governance/index.rst1
-rw-r--r--doc/source/dev/governance/people.rst49
3 files changed, 3 insertions, 53 deletions
diff --git a/doc/source/dev/governance/governance.rst b/doc/source/dev/governance/governance.rst
index 8c9cc0825..3ed39c4c1 100644
--- a/doc/source/dev/governance/governance.rst
+++ b/doc/source/dev/governance/governance.rst
@@ -203,7 +203,7 @@ Council membership
~~~~~~~~~~~~~~~~~~
A list of current Steering Council Members is maintained at the
-page :ref:`governance-people`.
+page `About Us <https://numpy.org/about/>`_.
To become eligible to join the Steering Council, an individual must be
a Project Contributor who has produced contributions that are
@@ -307,7 +307,7 @@ its interactions with NumFOCUS.
resting on one person.
The current membership of the NumFOCUS Subcommittee is listed at the
-page :ref:`governance-people`.
+page `About Us <https://numpy.org/about/>`_.
Institutional Partners and Funding
@@ -375,7 +375,7 @@ Institutional Partner benefits are:
- Council Members invited to NumPy Developer Meetings.
A list of current Institutional Partners is maintained at the page
-:ref:`governance-people`.
+`About Us <https://numpy.org/about/>`_.
Document history
diff --git a/doc/source/dev/governance/index.rst b/doc/source/dev/governance/index.rst
index 3919e5e66..4dcc3002b 100644
--- a/doc/source/dev/governance/index.rst
+++ b/doc/source/dev/governance/index.rst
@@ -6,4 +6,3 @@ NumPy governance
:maxdepth: 3
governance
- people
diff --git a/doc/source/dev/governance/people.rst b/doc/source/dev/governance/people.rst
deleted file mode 100644
index c48b801ab..000000000
--- a/doc/source/dev/governance/people.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _governance-people:
-
-Current steering council and institutional partners
-===================================================
-
-Steering council
-----------------
-
-* Sebastian Berg
-* Ralf Gommers
-* Charles Harris
-* Stephan Hoyer
-* Melissa Weber Mendonça
-* Inessa Pawson
-* Matti Picus
-* Stéfan van der Walt
-* Eric Wieser
-
-
-Emeritus members
-----------------
-
-* Travis Oliphant -- project founder / emeritus leader (2005-2012)
-* Alex Griffing (2015-2017)
-* Marten van Kerkwijk (2017-2019)
-* Allan Haldane (2015-2021)
-* Nathaniel Smith (2012-2021)
-* Julian Taylor (2013-2021)
-* Pauli Virtanen (2008-2021)
-* Jaime Fernández del Río (2014-2021)
-
-
-NumFOCUS Subcommittee
----------------------
-
-* Charles Harris
-* Ralf Gommers
-* Melissa Weber Mendonça
-* Sebastian Berg
-* External member: Thomas Caswell
-
-
-Institutional Partners
-----------------------
-
-* UC Berkeley (Stéfan van der Walt, Sebastian Berg, Ross Barnowski)
-
-* Quansight (Ralf Gommers, Melissa Weber Mendonça, Mars Lee, Matti Picus, Pearu Peterson)
-