Skip to content

Commit 58ad6de

Browse files
author
InessaPawson
authored
Minor text edits on multiple pages (numpy#207)
1 parent 86d24b3 commit 58ad6de

File tree

7 files changed

+43
-45
lines changed

7 files changed

+43
-45
lines changed

content/en/about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The NumPy project is growing, we have separate teams for:
4343
- Funding & grants
4444
- Admin
4545

46-
See the [Team](/team) page for individual team members.
46+
See the [Team](/team) page for the individual team members.
4747

4848

4949
## Sponsors

content/en/arraycomputing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pack newer algorithms and features geared towards machine learning and artificia
2929
title="Array Computing Landscape">
3030

3131
**Array computing** is based on **arrays** data structures. *Arrays* are used
32-
to organize vast amounts of data such that related set of values can be easily
32+
to organize vast amounts of data such that a related set of values can be easily
3333
sorted, searched, mathematically manipulated and transformed easily and quickly.
3434

3535
Array computing is *unique* as it involves operating on the data array *at

content/en/contribute.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Our community aspires to treat everyone equally, and to value all contributions.
2424

2525
## How to get started
2626

27-
For the process of contributing to the NumPy code base we have an extensive [developer guide](https://numpy.org/devdocs/dev/index.html). We don't work with assigning issues - if you see something of interest, please dive in!
27+
For the process of contributing to the NumPy code base, we have an extensive [developer guide](https://numpy.org/devdocs/dev/index.html). We don't work with assigning issues - if you see something of interest, please dive in!
2828

29-
For other activities we will attempt to give some guidance on this page. If you're unsure of where to get started or how your skills matter to the project, _please reach out to us_! You can ask on the [mailing list](https://mail.python.org/mailman/listinfo/numpy-discussion) or on [GitHub](http://github.com/numpy/numpy) (open an issue or comment on a relevant issue). These are our preferred communication channels (open source is open by nature!), however if you prefer to discuss in private first, please reach out to our community coordinators at `[email protected]` or on [Slack](https://numpy-team.slack.com) (send an email to `[email protected]` for an invite the first time).
29+
For other activities, we will attempt to give some guidance on this page. If you're unsure of where to get started or how your skills matter to the project, _please reach out to us_! You can ask on the [mailing list](https://mail.python.org/mailman/listinfo/numpy-discussion) or [GitHub](http://github.com/numpy/numpy) (open an issue or comment on a relevant issue). These are our preferred communication channels (open source is open by nature!), however, if you prefer to discuss in private first, please reach out to our community coordinators at `[email protected]` or on [Slack](https://numpy-team.slack.com) (send an email to `[email protected]` for an invite the first time).
3030

3131
We also have a bi-weekly _community call_, the details of which are announced on the mailing list. You are very welcome to join this call!
3232

@@ -68,7 +68,7 @@ We aim to translate this [numpy.org](https://numpy.org) website into multiple la
6868

6969
### Fundraising
7070

71-
NumPy has been an all-volunteer project for most of its history, however with the continuous growth of our user base we feel the need for funding to keep the project healthy. [This SciPy'19 talk](https://www.youtube.com/watch?v=dBTJD_FDVjU) attempts to quantify the impact of recently received funding and the needs of the project. We have a number of ideas about how to obtain funding (and of course welcome more good ideas!), however these all take time to execute. Fundraising is also a skill that not many current team members have - we'd love your help!
71+
NumPy has been an all-volunteer project for most of its history, however, with the continuous growth of our user base we feel the need for funding to keep the project healthy. [This SciPy'19 talk](https://www.youtube.com/watch?v=dBTJD_FDVjU) attempts to quantify the impact of recently received funding and the needs of the project. We have a number of ideas about how to obtain funding (and of course welcome more good ideas!), these all take time to execute though. Fundraising is also a skill that not many current team members have - we'd love your help!
7272

7373

7474
### Community coordination and outreach

content/en/learn.md

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ title: Learn
33
sidebar: false
44
---
55

6-
***Welcome to learning about NumPy!***
6+
To learn how to use NumPy, you could begin with the resources listed under the **'Beginners'** section. Once you gain a broad view, you could try the more involved tutorials and resources listed under the **'Advanced'** section.
77

8-
To learn how to use NumPy, you could begin with the resources listed under the 'beginners' section. Once you have a broad view into how to get started with using NumPy, you could try the more involved tutorials and resources listed under 'advanced' section.
9-
10-
This is a curated collection of NumPy related educational resources. Some are very specific to NumPy, while others offer a broader view on numerical computing. It is a continuously evolving list. In case you would like to contribute, please refer to the section 'Contributing to NumPy Learning Resources' below.
8+
This is a curated collection of NumPy related educational resources. Some are very specific to NumPy, while others offer a broader view on numerical computing. It is a continuously evolving list. In case you would like to contribute, please refer to the information at the bottom of this page.
119
***
1210

1311
## Beginners
@@ -17,62 +15,62 @@ There is tons of information about NumPy out there. If you are new to NumPy, we'
1715
<i class="fad fa-chalkboard"></i> **Tutorials**
1816

1917
* [NumPy Quickstart Tutorial](https://numpy.org/devdocs/user/quickstart.html)
20-
* [SciPy Lectures](https://www.scipy-lectures.org/) *Besides covering NumPy, these lectures offer a broader introduction to the scientific Python ecosystem.*
21-
* [Towards Data Science, an introduction to NumPy by *Anne Bonner*](https://towardsdatascience.com/the-ultimate-beginners-guide-to-numpy-f5a2f99aef54)
18+
* [SciPy Lectures](https://www.scipy-lectures.org/) Besides covering NumPy, these lectures offer a broader introduction to the scientific Python ecosystem.
19+
* [Towards Data Science, an introduction to NumPy *by Anne Bonner*](https://towardsdatascience.com/the-ultimate-beginners-guide-to-numpy-f5a2f99aef54)
2220
* [Machine Learning Plus - Introduction to ndarray](https://www.machinelearningplus.com/python/numpy-tutorial-part1-array-python-examples/)
2321
* [Edureka - Learn NumPy Arrays with Examples ](https://www.edureka.co/blog/python-numpy-tutorial/)
2422
* [Dataquest - NumPy Tutorial: Data Analysis with Python](https://www.dataquest.io/blog/numpy-tutorial-python/)
25-
* [NumPy tutorial by *Nicolas Rougier*](https://github.com/rougier/numpy-tutorial)
26-
* [Stanford CS231 by *Justin Johnson*](http://cs231n.github.io/python-numpy-tutorial/)
23+
* [NumPy tutorial *by Nicolas Rougier*](https://github.com/rougier/numpy-tutorial)
24+
* [Stanford CS231 *by Justin Johnson*](http://cs231n.github.io/python-numpy-tutorial/)
2725
* [NumPy User Guide](https://numpy.org/devdocs/user/index.html)
2826

2927
<i class="fas fa-books"></i> **Books**
3028

31-
* [Guide to NumPy by *Travis E. Oliphant*](http://web.mit.edu/dvp/Public/numpybook.pdf) *This is a free version 1 from 2006. For a latest copy (2015) see [here](https://www.barnesandnoble.com/w/guide-to-numpy-travis-e-oliphant-phd/1122853007).*
32-
* [From Python to NumPy by *Nicolas P. Rougier*](https://www.labri.fr/perso/nrougier/from-python-to-numpy/)
33-
* [Elegant SciPy](https://www.amazon.com/Elegant-SciPy-Art-Scientific-Python/dp/1491922877) by Juan Nunez-Iglesias, Stefan van der Walt and Harriet Dashnow
29+
* [Guide to NumPy *by Travis E. Oliphant*](http://web.mit.edu/dvp/Public/numpybook.pdf) This is a free version 1 from 2006. For the latest copy (2015) see [here](https://www.barnesandnoble.com/w/guide-to-numpy-travis-e-oliphant-phd/1122853007).
30+
* [From Python to NumPy *by Nicolas P. Rougier*](https://www.labri.fr/perso/nrougier/from-python-to-numpy/)
31+
* [Elegant SciPy](https://www.amazon.com/Elegant-SciPy-Art-Scientific-Python/dp/1491922877) *by Juan Nunez-Iglesias, Stefan van der Walt and Harriet Dashnow*
3432

35-
Besides the ones listed above, you may want to check out the [Goodreads list](https://www.goodreads.com/shelf/show/python-scipy) of books on the subject of "Python+SciPy". Most of the books on this list are about the "SciPy ecosystem", which has NumPy at its core.
33+
Besides the ones listed above, you may want to check out the [Goodreads list](https://www.goodreads.com/shelf/show/python-scipy) on the subject of "Python+SciPy". Most of the books on this list are about the "SciPy ecosystem", which has NumPy at its core.
3634

3735
<i class="far fa-file-video"></i> **Videos**
3836

39-
* [Introduction to Numerical Computing with NumPy](http://youtu.be/ZB7BZMhfPgk), Alex Chabot-Leclerc, presented at SciPy 2019.`
37+
* [Introduction to Numerical Computing with NumPy](http://youtu.be/ZB7BZMhfPgk) *by Alex Chabot-Leclerc*
4038

4139
***
4240

43-
## Advanced
41+
## Advanced
4442

45-
If you have the basic know-how of NumPy and how to use it, you can try these advanced tutorials, books and videos for a better understanding of specific NumPy concepts such as advanced indexing, splitting, stacking, linear algebra and more.
43+
If you have the basic know-how of NumPy and how to use it, you can try these advanced tutorials, books and videos for a better understanding of the specific NumPy concepts such as advanced indexing, splitting, stacking, linear algebra and more.
4644

4745
<i class="fad fa-chalkboard"></i> **Tutorials**
4846

49-
* [100 NumPy Exercises](http://www.labri.fr/perso/nrougier/teaching/numpy.100/index.html), Nicolas P. Rougier, 2016.
50-
* [An Introduction to NumPy and Scipy](https://engineering.ucsb.edu/~shell/che210d/numpy.pdf), M. Scott Shell, 2014.
51-
* [Numpy Medkits](http://mentat.za.net/numpy/numpy_advanced_slides/), Stéfan van der Walt, 2008.
47+
* [100 NumPy Exercises](http://www.labri.fr/perso/nrougier/teaching/numpy.100/index.html) *by Nicolas P. Rougier*
48+
* [An Introduction to NumPy and Scipy](https://engineering.ucsb.edu/~shell/che210d/numpy.pdf) *by M. Scott Shell*
49+
* [Numpy Medkits](http://mentat.za.net/numpy/numpy_advanced_slides/) *by Stéfan van der Walt*
5250
* [NumPy in Python (Advanced)](https://www.geeksforgeeks.org/numpy-python-set-2-advanced/)
5351
* [Advanced Indexing](https://www.tutorialspoint.com/numpy/numpy_advanced_indexing.htm)
5452
* [Machine Learning and Data Analytics with NumPy](https://www.machinelearningplus.com/python/numpy-tutorial-python-part2/)
5553

5654
<i class="fas fa-books"></i> **Books**
5755

58-
* [Python Data Science Handbook](https://www.amazon.com/Python-Data-Science-Handbook-Essential/dp/1491912057) by Jake Vanderplas
59-
* [Python for Data Analysis](https://www.amazon.com/Python-Data-Analysis-Wrangling-IPython/dp/1491957662) by Wes McKinney
60-
* [Numerical Python: Scientific Computing and Data Science Applications with Numpy, SciPy and Matplotlib](https://www.amazon.com/Numerical-Python-Scientific-Applications-Matplotlib/dp/1484242459) by Robert Johansson
56+
* [Python Data Science Handbook](https://www.amazon.com/Python-Data-Science-Handbook-Essential/dp/1491912057) *by Jake Vanderplas*
57+
* [Python for Data Analysis](https://www.amazon.com/Python-Data-Analysis-Wrangling-IPython/dp/1491957662) *by Wes McKinney*
58+
* [Numerical Python: Scientific Computing and Data Science Applications with Numpy, SciPy and Matplotlib](https://www.amazon.com/Numerical-Python-Scientific-Applications-Matplotlib/dp/1484242459) *by Robert Johansson*
6159

6260
<i class="far fa-file-video"></i> **Videos**
6361

64-
* [Scientific Computing with Python - SciPy Japan, 2019](https://www.youtube.com/watch?v=cYugp9IN1-Q)
65-
* [Advanced Indexing operations in NumPy arrays](https://www.youtube.com/watch?v=2WTDrSkQBng)
62+
* [Advanced NumPy - broadcasting rules, strides and advanced indexing](https://www.youtube.com/watch?v=cYugp9IN1-Q) *by Juan Nunuz-Iglesias*
63+
* [Advanced Indexing Operations in NumPy Arrays](https://www.youtube.com/watch?v=2WTDrSkQBng) *by Amuls Academy*
6664

6765
***
6866

6967
## NumPy Talks
7068

71-
* [The Future of NumPy Indexing](https://www.youtube.com/watch?v=o0EacbIbf58) by Jaime Fernández (2016)
72-
* [Evolution of Array Computing in Python](https://www.youtube.com/watch?v=HVLPJnvInzM&t=10s) by Ralf Gommers (2019)
73-
* [NumPy latest updates](https://www.youtube.com/watch?v=YFLVQFjRmPY) by Matti Picus, PyCon Israel (2019)
74-
* [Inside NumPy](https://www.youtube.com/watch?v=dBTJD_FDVjU) by Ralf Gommers, Sebastian Berg, Matti Picus, Tyler Reddy, Stefan van der Walt, Charles Harris (2019)
75-
* [Brief Review of Array Computing in Python](https://www.youtube.com/watch?v=f176j2g2eNc) by Travis Oliphant (2019)
69+
* [The Future of NumPy Indexing](https://www.youtube.com/watch?v=o0EacbIbf58) *by Jaime Fernández* (2016)
70+
* [Evolution of Array Computing in Python](https://www.youtube.com/watch?v=HVLPJnvInzM&t=10s) *by Ralf Gommers* (2019)
71+
* [NumPy: what has changed and what is going to change?](https://www.youtube.com/watch?v=YFLVQFjRmPY) *by Matti Picus* (2019)
72+
* [Inside NumPy](https://www.youtube.com/watch?v=dBTJD_FDVjU) *by Ralf Gommers, Sebastian Berg, Matti Picus, Tyler Reddy, Stefan van der Walt, Charles Harris* (2019)
73+
* [Brief Review of Array Computing in Python](https://www.youtube.com/watch?v=f176j2g2eNc) *by Travis Oliphant* (2019)
7674

7775
***
7876

content/en/report-handling-manual.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ This is the manual followed by NumPy’s Code of Conduct Committee. It’s used
77

88
Enforcing the [Code of Conduct](/code-of-conduct) impacts our community today and for the future. It’s an action that we do not take lightly. When reviewing enforcement measures, the Code of Conduct Committee will keep the following values and guidelines in mind:
99

10-
* Act in a personal manner rather than impersonal. The Committee can engage the parties to understand the situation, while respecting the privacy and any necessary confidentiality of reporters. However, sometimes it is necessary to communicate with one or more individuals directly: the Committee’s goal is to improve the health of our community rather than only produce a formal decision.
11-
* Emphasize empathy for individuals rather than judging behavior, avoiding binary labels of “good” and “bad/evil”. Overt, clear-cut aggression and harassment exists and we will be address that firmly. But many scenarios that can prove challenging to resolve are those where normal disagreements devolve into unhelpful or harmful behavior from multiple parties. Understanding the full context and finding a path that re-engages all is hard, but ultimately the most productive for our community.
12-
* We understand that email is a difficult medium and can be isolating. Receiving criticism over email, without personal contact, can be particularly painful. This makes it especially important to keep an atmosphere of open-minded respect of the views of others. It also means that we must be transparent in our actions, and that we will do everything in our power to make sure that all our members are treated fairly and with sympathy.
10+
* Act in a personal manner rather than impersonal. The Committee can engage the parties to understand the situation while respecting the privacy and any necessary confidentiality of reporters. However, sometimes it is necessary to communicate with one or more individuals directly: the Committee’s goal is to improve the health of our community rather than only produce a formal decision.
11+
* Emphasize empathy for individuals rather than judging behavior, avoiding binary labels of “good” and “bad/evil”. Overt, clear-cut aggression and harassment exist, and we will address them firmly. But many scenarios that can prove challenging to resolve are those where normal disagreements devolve into unhelpful or harmful behavior from multiple parties. Understanding the full context and finding a path that re-engages all is hard, but ultimately the most productive for our community.
12+
* We understand that email is a difficult medium and can be isolating. Receiving criticism over email, without personal contact, can be particularly painful. This makes it especially important to keep an atmosphere of open-minded respect for the views of others. It also means that we must be transparent in our actions, and that we will do everything in our power to make sure that all our members are treated fairly and with sympathy.
1313
* Discrimination can be subtle and it can be unconscious. It can show itself as unfairness and hostility in otherwise ordinary interactions. We know that this does occur, and we will take care to look out for it. We would very much like to hear from you if you feel you have been treated unfairly, and we will use these procedures to make sure that your complaint is heard and addressed.
14-
* Help increase engagement in good discussion practice: try to identify where discussion may have broken down and provide actionable information, pointers and resources that can lead to positive change on these points.
14+
* Help increase engagement in good discussion practice: try to identify where discussion may have broken down, and provide actionable information, pointers, and resources that can lead to positive change on these points.
1515
* Be mindful of the needs of new members: provide them with explicit support and consideration, with the aim of increasing participation from underrepresented groups in particular.
1616
* Individuals come from different cultural backgrounds and native languages. Try to identify any honest misunderstandings caused by a non-native speaker and help them understand the issue and what they can change to avoid causing offence. Complex discussion in a foreign language can be very intimidating, and we want to grow our diversity also across nationalities and cultures.
1717

1818

1919
## Mediation
2020

21-
Voluntary, informal mediation is a tool at our disposal. In contexts such as when two or more parties have all escalated to the point of inappropriate behavior (something sadly common in human conflict), it may be useful to facilitate a mediation process. This is only an example: the Committee can consider mediation in any case, mindful that the process is meant to be strictly voluntary and no party can be pressured to participate. If the Committee suggests mediation, it should:
21+
Voluntary informal mediation is a tool at our disposal. In contexts such as when two or more parties have all escalated to the point of inappropriate behavior (something sadly common in human conflict), it may be useful to facilitate a mediation process. This is only an example: the Committee can consider mediation in any case, mindful that the process is meant to be strictly voluntary and no party can be pressured to participate. If the Committee suggests mediation, it should:
2222

2323
* Find a candidate who can serve as a mediator.
24-
* Obtain the agreement of the reporter(s). The reporter(s) have complete freedom to decline the mediation idea, or to propose an alternate mediator.
24+
* Obtain the agreement of the reporter(s). The reporter(s) have complete freedom to decline the mediation idea or to propose an alternate mediator.
2525
* Obtain the agreement of the reported person(s).
26-
* Settle on the mediator: while parties can propose a different mediator than the suggested candidate, only if common agreement is reached on all terms can the process move forward.
26+
* Settle on the mediator: while parties can propose a different mediator than the suggested candidate, only if a common agreement is reached on all terms can the process move forward.
2727
* Establish a timeline for mediation to complete, ideally within two weeks.
2828

29-
The mediator will engage with all the parties and seek a resolution that is satisfactory to all. Upon completion, the mediator will provide a report (vetted by all parties to the process) to the Committee, with recommendations on further steps. The Committee will then evaluate these results (whether satisfactory resolution was achieved or not) and decide on any additional action deemed necessary.
29+
The mediator will engage with all the parties and seek a resolution that is satisfactory to all. Upon completion, the mediator will provide a report (vetted by all parties to the process) to the Committee, with recommendations on further steps. The Committee will then evaluate these results (whether a satisfactory resolution was achieved or not) and decide on any additional action deemed necessary.
3030

3131

3232
## How the Committee will respond to reports

0 commit comments

Comments
 (0)