Skip to content

Commit d279f97

Browse files
authored
Merge pull request #1 from lglattly/new-theme
Copy edited new tutorials website text
2 parents 31477df + e96a365 commit d279f97

File tree

6 files changed

+29
-35
lines changed

6 files changed

+29
-35
lines changed

CONTRIBUTING.rst

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ Contributing
44
Overview
55
--------
66

7-
Each tutorial is a `Jupyter notebook <http://jupyter.org/>`_ file. The notebooks
8-
are each saved in a separate directory within the ``tutorials/notebooks``
7+
Each tutorial is a `Jupyter notebook <http://jupyter.org/>`_ file. Each notebook is saved in a separate directory within the ``tutorials/notebooks``
98
subdirectory in this project. For an example, let's look at the source notebook
109
of the `FITS-header <https://github.com/astropy/astropy-tutorials/tree/master/tu
1110
torials/notebooks/FITS-header/>`_ tutorial. Within
@@ -27,23 +26,22 @@ Overview
2726

2827
* Each tutorial should have 3–5 explicit `Learning Goals
2928
<http://tll.mit.edu/help/intended-learning-outcomes>`_, demonstrate ~2–3
30-
pieces of functionality relevant to astronomy, and 2–3 demonstrations of
31-
generic but commonly used functionality (e.g., ``numpy``, ``matplotlib``)
32-
* Roughly follow this progression:
29+
pieces of functionality relevant to astronomy, and contain 2–3 demonstrations of generic but commonly used functionality (e.g., ``numpy``, ``matplotlib``)
30+
* Each tutorial should roughly follow this progression:
3331
* *Input/Output*: read in some data (use `astroquery
3432
<https://astroquery.readthedocs.io/en/latest/>`_ where possible to query
3533
real astronomical datasets)
3634
* *Analysis*: do something insightful / useful with the data
3735
* *Visualization*: make a pretty figure (use `astropy.visualization
3836
<http://docs.astropy.org/en/stable/visualization/>`_ where possible)
3937
* The tutorials must be compatible with the versions supported by the last major
40-
release of the Astropy core package (i.e. Python >= 3.5).
38+
release of the Astropy core package (i.e. Python >= 3.5)
4139

4240
Code
4341
^^^^
4442

4543
* Demonstrate good commenting practice
46-
* add comments to sections of code that use concepts not included in the
44+
* Add comments to sections of code that use concepts not included in the
4745
Learning Goals
4846
* Demonstrate best practices of variable names
4947
* Variables should be all lower case with words separated by underscores
@@ -52,7 +50,7 @@ Code
5250
* As much as possible, comply with `PEP8 <https://www.python.org/dev/peps/pep-0008/>`_.
5351
* Imports
5452
* Do not use ``from package import *``; import packages, classes, and
55-
functions explicitly.
53+
functions explicitly
5654
* Follow recommended package name abbreviations:
5755
* ``import numpy as np``
5856
* ``import matplotlib as mpl``
@@ -71,10 +69,10 @@ Narrative
7169
* Use `Markdown formatting <http://jupyter-notebook.readthedocs.io/en/latest/exa
7270
mples/Notebook/Working%20With%20Markdown%20Cells.html>`_ in text cells for
7371
formatting, links, latex, and code snippets.
74-
* Title should be short yet descriptive and emphasize the learning goals of the
72+
* Titles should be short yet descriptive and emphasize the learning goals of the
7573
tutorial. Try to make the title appeal to a broad audience and avoid
7674
referencing a specific instrument, catalog, or anything wavelength dependent.
77-
* List all author's full names (comma separated) and link to GitHub profile
75+
* List all authors' full names (comma separated) and link to GitHub profiles
7876
and/or `ORCID iD <https://orcid.org/>`_ when relevant.
7977
* Include `Learning Goals <http://tll.mit.edu/help/intended-learning-outcomes>`_
8078
at the top as a bulleted list.
@@ -83,12 +81,10 @@ Narrative
8381
* The first paragraph should give a brief overview of the entire tutorial
8482
including relevant astronomy concepts.
8583
* Use the first-person inclusive plural ("we"). For example, "We are going to
86-
make a plot which..", "Above, we did it the hard way, but here is the easier
87-
way..."
84+
make a plot which...", or "Above, we did it the hard way, but here is the easier way..."
8885
* Section headings should be in the imperative mood. For example, "Download the
8986
data."
90-
* Avoid words such as "obviously", "just", "simply", "easily". For example,
91-
avoid "we just have to do this one thing."
87+
* Avoid extraneous words such as "obviously", "just", "simply", or "easily." For example, avoid phrases like "we just have to do this one thing."
9288
* Use ``<div class="alert alert-info">Note</div>`` for Notes and ``<div
9389
class="alert alert-warning">Warning</div>`` for Warnings (Markdown supports
9490
raw HTML)
@@ -115,10 +111,10 @@ Template intro
115111
Carroll & Ostlie 10.3, Binney & Tremaine 1.5
116112
117113
## Summary
118-
In this tutorial, we download a data file, do something to it, and then
114+
In this tutorial, we will download a data file, do something to it, and then
119115
visualize it.
120116
121-
Procedure for Contributing
117+
Procedure for contributing
122118
--------------------------
123119

124120
The process for contributing a tutorial involves the `GitHub fork
@@ -148,7 +144,7 @@ be the same as the subdirectory name. We'll create a new directory in
148144
All files used by the tutorial -- e.g., example data files, the Jupyter
149145
notebook file itself -- should go in this directory.
150146

151-
Specify the python packages the tutorial depends on by creating a text file
147+
Specify the Python packages the tutorial depends on by creating a text file
152148
called ``requirements.txt`` in the same notebook directory. For example, if your
153149
tutorial requires ``scipy`` version 1.0 and ``numpy`` version 1.13 or greater,
154150
your ``requirements.txt`` file would look like:
@@ -210,9 +206,7 @@ procedure:
210206
with open(mydatafilename2) as f:
211207
...
212208

213-
If you do this, the only change necessary on merging your notebook will be to
214-
set ``tutorialpath`` to
215-
``'http://data.astropy.org/tutorials/My-tutorial-name/'``.
209+
If you do this, the only change necessary when merging your notebook will be to set ``tutorialpath`` to ``'http://data.astropy.org/tutorials/My-tutorial-name/'``.
216210

217211
If you need information or help with:
218212

@@ -225,9 +219,9 @@ please see the :ref:`dev-page`.
225219
For repository maintainers
226220
^^^^^^^^^^^^^^^^^^^^^^^^^^
227221

228-
If this above procedure is followed, you only need to do these steps when
222+
If this above procedure is followed, you only need to do these three steps when
229223
merging your pull request:
230224

231225
1. Do ``git rebase -i`` and delete the commits that include the data files
232226
2. Upload the data files to ``http://data.astropy.org/tutorials/My-tutorial-name/``
233-
3. Update the ``tutorialpath`` variable.
227+
3. Update the ``tutorialpath`` variable

tutorials/documentation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Documentation
22
=============
33

4-
Documentation has the complete description of a Astropy package with all requisite details, including usage, dependencies, and examples.
5-
Documentation is comprehensive reference material, possibly a little dry but both basic and high level.
4+
Documentation has the complete description of an Astropy package with all requisite details including usage, dependencies, and examples.
5+
Documentation is comprehensive reference material—it's possibly a little dry, but is both basic and high level.
66

7-
See the `Astropy documentation <http://docs.astropy.org/en/stable/>`_ for a structured view of the functionality within the Astropy project.
7+
See the `Astropy documentation <http://docs.astropy.org/en/stable/>`_ for a structured view of the functionality within the Astropy project.

tutorials/examples.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Examples
22
========
33

4-
Examples are stand-alone code snippets that live in the astropy documentation that demonstrate a specific functionality within a package.
4+
Examples are stand-alone code snippets that live in the Astropy documentation which demonstrate a specific functionality within a package.
55
Examples don't provide conceptual background/context or exhaustive explanation of the functionality being demonstrated.
6-
Examples have less explanation, they may prompt questions which can be answered by scrolling up and down into the documentation.
6+
Examples have less explanationthey may prompt questions which can be answered by scrolling up and down into the documentation.
77

88
See the `Astropy Examples <http://docs.astropy.org/en/stable/generated/examples/index.html>`_ for a structured view of the examples within the Astropy project.

tutorials/guides.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Guides
22
======
33

44
The guides are long-form narrative, comprehensive, conceptually-focused documents (chapter-ish) providing stand-alone introductions to core packages in addition to the underlying astronomical concepts (e.g., CCDproc with observing-lite/image reduction).
5-
These Guides will be a series of tutorials joined with conceptual/explanatory "glue".
5+
These guides will be a series of tutorials joined with conceptual/explanatory "glue."
66

77
Coming soon!
8-
8+
99
Example: `Astronomical Spectroscopy by Massey & Hanson <https://arxiv.org/abs/1010.5270>`_
1010

11-
**This is dummy text and will be replaces in the final build.**
11+
**This is dummy text and will be replaced in the final build.**

tutorials/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Learn Astropy
22
=============
33
Astropy is a Python library for use in astronomy.
44
Learn Astropy provides a portal to all of the Astropy educational material through a single dynamically searchable web page.
5-
It allows you to filter tutorials by keywords, search for filters, make search queries in tutorials and documentation simultaneously.
5+
It allows you to filter tutorials by keywords, search for filters, and make search queries in tutorials and documentation simultaneously.
66

77
Installing Astropy
88
------------------
@@ -13,7 +13,7 @@ The `Anaconda Python Distribution <https://www.anaconda.com/download/>`_ include
1313
1414
conda update astropy
1515
16-
To install Astropy from source into an existing Python installation, see the more detailed `installation instructions <http://astropy.readthedocs.io/en/stable/install.html>`_ in the main Astropy documentation.
16+
To install Astropy from the source into an existing Python installation, see the more detailed `installation instructions <http://astropy.readthedocs.io/en/stable/install.html>`_ in the main Astropy documentation.
1717

1818
Get help
1919
--------
@@ -25,7 +25,7 @@ For contributors
2525
----------------
2626

2727
We welcome feedback, improvements, and new tutorial content via the `Astropy
28-
Tutorials repository <https://github.com/astropy/astropy-tutorials>`_ on
28+
Tutorials Repository <https://github.com/astropy/astropy-tutorials>`_ on
2929
GitHub. If you find a typo or would like to clarify some text, please either
3030
`create an issue <https://github.com/astropy/astropy-tutorials/issues/new>`_ or
3131
make the change yourself and then submit a pull request directly to the

tutorials/tutorials.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Tutorials
22
=========
33

4-
The tutorials on this site walk through some typical software tasks and
4+
The tutorials on this site walk you through some typical software tasks and
55
demonstrate the features in Astropy sub-packages in the context of a story or
66
standard workflow. See the `Astropy documentation <http://docs.astropy.org/>`_
77
for a structured view of the functionality within the Astropy project.
88

9-
Check the relevant keywords in the sidebox.
9+
Check the relevant keywords in the sidebox.

0 commit comments

Comments
 (0)