Merge branch 'master' of https://github.com/numpy/numpy.org into sfork-issu-164

Author: shaloo

config.yaml

@@ -25,7 +25,7 @@ params:
     # Button text
     buttontext: Get started
     # Where the main hero button links to
-    buttonlink: "#"
+    buttonlink: "/learn"
     # Hero image (from static/images/___)
     image: logos/numpy.svg
   # Customizable navbar. For a dropdown, add a "sublinks" list.
@@ -53,14 +53,17 @@ params:
     title: KEY FEATURES
     features:
     - title: Powerful N-dimensional arrays
-      subtitle: Fast, versatile and easy to use
-      text:  Fast, versatile and easy to use, the NumPy vectorization, indexing and broadcasting concepts are the de-facto standards of array computing today.
+      text:  Fast and versatile, the NumPy vectorization, indexing and broadcasting concepts are the de-facto standards of array computing today.
     - title: Numerical computing tools
-      text: Fundamental package for scientific computing, NumPy offers comprehensive mathematical functions, random number generators, linear algebra routines, Fourier transforms and more.
+      text: NumPy offers comprehensive mathematical functions, random number generators, linear algebra routines, Fourier transforms and more.
     - title: Interoperable
-      text: Works on your choice of computing platform, whether your code fits in memory and runs on a CPU or requires a GPU. NumPy supports a wide range of computing platforms and works well with all major distributed arrays and sparse arrays libraries. 
+      text: NumPy supports a wide range of hardware and computing platforms, and plays well with distributed, GPU and sparse array libraries.
+    - title: Performant
+      text: The core of NumPy is well-optimized C code. Enjoy the flexibility of Python with the speed of compiled code.
+    - title: Easy to use
+      text: NumPy's high level syntax makes it accessible to and productive for programmers from any background or experience level.
     - title: Open source
-      text: Distributed under a liberal [BSD license](https://github.com/numpy/numpy/blob/master/LICENSE.txt), NumPy is developed and maintained publicly on GitHub by a vibrant, responsive and diverse community.
+      text: Distributed under a liberal [BSD license](https://github.com/numpy/numpy/blob/master/LICENSE.txt), NumPy is developed and maintained [publicly on GitHub](https://github.com/numpy/numpy) by a vibrant, responsive and diverse [community](/community).
   tabs:
     title: ECOSYSTEM
   section5: false
@@ -75,7 +78,7 @@ languages:
       - title: Install
         url: /install
       - title: Documentation
-        url: /doc
+        url: https://numpy.org/doc/
       - title: Learn
         url: /learn
       - title: Array computing
@@ -101,33 +104,29 @@ languages:
             - text: Install
               link: /install
             - text: Documentation
-              link: /docs
+              link: https://numpy.org/doc/
             - text: Learn
               link: /learn
             - text: Roadmap
               link: https://numpy.org/neps/roadmap.html
         column2:
-          title: ""
           links:
             - text: About us
               link: /about
             - text: Community
               link: /community
-            - text: Code of conduct
-              link: /code-of-conduct
-            - text: Get help
-              link: /gethelp
             - text: Contribute
               link: /contribute
+            - text: Code of conduct
+              link: /code-of-conduct
         column3:
-          title: ""
           links:
+            - text: Get help
+              link: /gethelp
             - text: Terms of use
               link: /terms
             - text: Privacy
               link: /privacy
-            - text: Trademarks
-              link: /trademarks
             - text: Press kit
               link: /press-kit
   nl:
@@ -139,7 +138,7 @@ languages:
       - title: Install
         url: /nl/install
       - title: Documentation
-        url: /nl/doc
+        url: https://numpy.org/doc/
       - title: Array computing
         url: /nl/arraycomputing
       - title: Case Studies
@@ -167,7 +166,7 @@ languages:
             - text: Install
               link: /nl/install
             - text: Documentation
-              link: /nl/docs
+              link: https://numpy.org/doc/
             - text: Release notes
               link: /nl/release-notes
             - text: Roadmap
@@ -177,20 +176,20 @@ languages:
           links:
             - text: About us
               link: /nl/about
-            - text: Code of conduct
-              link: /nl/code-of-conduct
-            - text: Get help
-              link: /nl/gethelp
+            - text: Community
+              link: /community
             - text: Contribute
               link: /nl/contribute
+            - text: Code of conduct
+              link:  /nl/code-of-conduct
         column3:
           title: ""
           links:
+            - text: Get help
+              link: /nl/gethelp
             - text: Terms of use
               link: /nl/terms
             - text: Privacy
               link: /nl/privacy
-            - text: Trademarks
-              link: /nl/trademarks
             - text: Press kit
               link: /nl/press-kit

content/en/about.md

@@ -62,9 +62,9 @@ Institutional Partners are organizations that support the project by employing p
 
 If you have found NumPy to be useful in your work, research or company, please consider making a donation to the project commensurate with your resources. Any amount helps! All donations will be used strictly to fund the development of NumPy’s open source software, documentation and community.
 
-NumPy is a Sponsored Project of NumFOCUS, a 501(c)(3) nonprofit charity in the United States. NumFOCUS provides NumPy with fiscal, legal, and administrative support to help ensure the health and sustainability of the project. Visit numfocus.org for more information.
+NumPy is a Sponsored Project of NumFOCUS, a 501(c)(3) nonprofit charity in the United States. NumFOCUS provides NumPy with fiscal, legal, and administrative support to help ensure the health and sustainability of the project. Visit [numfocus.org](https://numfocus.org) for more information.
 
 Donations to NumPy are managed by [NumFOCUS](https://numfocus.org). For donors in the United States, your gift is tax-deductible to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation.
 
 NumPy's Steering Council will make the decisions on how to best use any funds received. Technical and infrastructure priorities are documented on the [NumPy Roadmap](https://www.numpy.org/neps/index.html#roadmap).
-{{< numfocus >}}
+{{< numfocus >}}

content/en/community.md

@@ -22,7 +22,7 @@ Announcements about NumPy, such as for releases, developer meetings, sprints or
 conference talks are also made on this list.
 
 On this list please use bottom posting, reply to the list (rather than to
-another sender), and don't reply to digests. A searchable archive of this lists
+another sender), and don't reply to digests. A searchable archive of this list
 is available [here](http://numpy-discussion.10968.n7.nabble.com/).
 
 ***
@@ -41,7 +41,7 @@ _Please note that GitHub is not the right place to report a security vulnerabili
 
 A real-time chat room to ask questions about _contributing_ to NumPy.
 This is a private space, specifically meant for people who are hesitant to
-bring up their questions or ideas on a large public mailing list or on GitHub.
+bring up their questions or ideas on a large public mailing list or GitHub.
 Please see
 [here](https://numpy.org/devdocs/dev/index.html#contributing-to-numpy) for more
 details and how to get an invite.
@@ -51,7 +51,7 @@ details and how to get an invite.
 
 If you would like to find a local meetup or study group to learn more about NumPy and the wider ecosystem of Python packages for data science and scientific computing, we recommend exploring the [PyData meetups](https://www.meetup.com/pro/pydata/) (150+ meetups, 100,000+ members).
 
-NumPy also organizes in-person sprints for its team and interested contributors occasionally. These are typically planned several months in advance, and will be announced on the [mailing list](https://mail.python.org/mailman/listinfo/numpy-discussion) and on [Twitter](https://twitter.com/numpy_team).
+NumPy also organizes in-person sprints for its team and interested contributors occasionally. These are typically planned several months in advance and will be announced on the [mailing list](https://mail.python.org/mailman/listinfo/numpy-discussion) and [Twitter](https://twitter.com/numpy_team).
 
 
 ## Conferences
@@ -65,7 +65,7 @@ The NumPy project doesn't organize its own conferences. The conferences that hav
 - [SciPy Japan](https://conference.scipy.org)
 - [PyData conferences](https://pydata.org/event-schedule/) (15-20 events a year spread over many countries)
 
-Many of these conferences include tutorial days that cover NumPy and/or sprints where you can learn to contribute to NumPy or related open source projects.
+Many of these conferences include tutorial days that cover NumPy and/or sprints where you can learn how to contribute to NumPy or related open source projects.
 
 
 ## Join the NumPy community

content/en/press-kit.md

@@ -6,4 +6,4 @@ sidebar: false
 We would like to make it easy for you to include the NumPy brand identity in your next academic paper, course materials or presentation. 
 
 You will find a high resolution logo of NumPy [here](https://github.com/numpy/numpy/tree/master/branding/icons).
-Note that by using the numpy.org resources, you accept the [NumPy Code of Conduct](https://numpy.org/code-of-conduct).
+Note that by using the numpy.org resources, you accept the [NumPy Code of Conduct](/code-of-conduct).

layouts/partials/footer.html

@@ -12,7 +12,6 @@
         <div class="link-column">
           <div class="footer-column">
             <div class="footer-header">
-                <h3>{{ .title }}</h3>
             </div>
             <ul class="link-list">
               {{- range .links }}
@@ -27,11 +26,11 @@ <h3>{{ .title }}</h3>
         </div>
       {{- end }}
         <div class="footer-actions">
-            <p>Sign up for the latest NumPy news, resources, and more!</p>
+            <p>Sign up for the latest NumPy news, resources, <br> and more</p>
             <!-- Begin Mailchimp -->
             <form action="https://numpy.us4.list-manage.com/subscribe/post?u=5ddd0d1d6e807900a8212481a&amp;id=287fa4253c" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate sign-up-container" target="_blank" novalidate>
                 <i class="fal fa-envelope sign-up-image"></i>
-                <input type="email" value="" name="EMAIL" class="required email sign-up-input" id="mce-EMAIL" aria-label="Input for email" onkeypress="if (event.which === 13 || event.keyCode === 13 || event.key === 'Enter') sendThankYou()" />
+                <input type="email" value="" name="EMAIL" class="required email sign-up-input" id="mce-EMAIL" aria-label="Input for email, press enter to submit" onkeypress="if (event.which === 13 || event.keyCode === 13 || event.key === 'Enter') sendThankYou()" />
                 <div class="submission-instructions">Press Enter</div>
                 <button class="signup-button" onclick="sendThankYou()" aria-label="Submit">
                     <i class="fal fa-paper-plane"></i>
@@ -50,7 +49,7 @@ <h3>{{ .title }}</h3>
             <nav class="level is-mobile">
                 <div class="social-media-icons">
                     {{- range $socialMedia }}
-                    <a class="level-item" href="{{ .link }}">
+                    <a class="level-item" href="{{ .link }}" aria-label="{{ .link }}">
                     <span class="icon"><i class="fa fa-{{ .icon }}"></i></span>
                     </a>
                     {{- end }}

layouts/partials/hero-body.html

@@ -18,7 +18,7 @@
                 </div>
                 {{ end }}
                 <div class="hero-cta">
-                    <button class="cta-button">{{ $buttonText }}</button>
+                    <a href="{{ $buttonLink }}"><button class="cta-button">{{ $buttonText }}</button></a>
                 </div>
             </div>
         </div>
@@ -43,4 +43,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

layouts/partials/shell-content.html

@@ -9,5 +9,5 @@
 </div>
 
 <div class="shell-lesson shell-content" style="display: none;">
-    Here we should include a lesson about numpy!
-</div>
+    {{partial "shell-lesson.html" | print | markdownify}}
+</div>

layouts/partials/shell-lesson.html

@@ -0,0 +1,26 @@
+
+The standard way to import NumPy:
+
+```python
+>>> import numpy as np
+```
+
+Create a 2-D array, set every second element in some rows, and find max per
+row:
+
+```python
+>>> x = np.arange(15, dtype=np.int64).reshape(3, 5)
+>>> x[1:, ::2] = -99
+>>> x
+array([[  0,   1,   2,   3,   4],
+       [-99,   6, -99,   8, -99],
+       [-99,  11, -99,  13, -99]])
+>>> x.max(axis=1)
+array([ 4,  8, 13])
+```
+
+Generate some random numbers with an exponential distribution:
+```python
+>>> rng = np.random.default_rng()
+>>> samples = rng.exponential(size=2500)
+```

static/css/section2.css

@@ -70,9 +70,9 @@ transform: translateX(4px);
 }
 
 .section2-box-content {
-    height: 250px;
+    height: 175px;
     min-width: 275px;
-    width: 300px;
+    width: 325px;
     margin: 30px 30px 30px 0;
     border-radius: 3px;
 }
@@ -83,6 +83,10 @@ transform: translateX(4px);
     text-transform: uppercase;
 }
 
+.section2-box-text > a {
+    color: #0E73D8;
+}
+
 .section2-box-text {
     margin: 30px 15px;
     font-size: 14px;
@@ -157,4 +161,4 @@ transform: translateX(4px);
 
 .section2-underline:hover:before, .section2-underline:focus:before, .section2-underline:active:before {
     right: 0;
-}
+}

static/css/shell.css

@@ -84,10 +84,18 @@
 
 .shell-lesson {
     display: none;
-    align-items: center;
-    justify-content: center;
-    height: 30%;
-    width: 100%;
+    text-align: left;
+    padding: 15px;
+    height: 100%;
+    width: 60%;
+}
+
+.shell-lesson > p {
+    margin: 2px 0 2px 0;
+}
+
+.highlight:not(:last-child) {
+    margin-bottom: 1px !important;
 }
 
 .demo-caret {

static/css/tabs.css

@@ -36,6 +36,7 @@
     text-transform: uppercase;
     letter-spacing: 1.5px;
     font-weight: 500;
+    color: #757575;
 }
 
 #tabs-content > li {