diff --git a/docs/development/developer_faq.rst b/docs/development/developer_faq.rst index 829c6449470..58f25506632 100644 --- a/docs/development/developer_faq.rst +++ b/docs/development/developer_faq.rst @@ -3,5 +3,5 @@ Developer FAQ ************* -Constants in TARDIS are all taken from AstroPy. The module tardis.constants import all constants currently +Constants in TARDIS are all taken from Astropy. The module tardis.constants import all constants currently from astropy.constants.astropy13constants. diff --git a/docs/development/git_workflow.rst b/docs/development/git_workflow.rst index 9b1e81d2e62..2c7abb5d66a 100644 --- a/docs/development/git_workflow.rst +++ b/docs/development/git_workflow.rst @@ -54,7 +54,7 @@ the `Generating SSH keys Create your own fork of a repository ------------------------------------ -The following example shows how to fork the core ``AstroPy`` repository, but +The following example shows how to fork the core ``Astropy`` repository, but the same applies to other packages: #. Log into your GitHub_ account. @@ -279,7 +279,7 @@ In more detail #. Make some changes #. Once you are a bit further along, test your changes do not lead to - regressions, and add new tests (see the AstroPy :ref:`testing-guidelines` we follow).:: + regressions, and add new tests (see the Astropy :ref:`testing-guidelines` we follow).:: python setup.py test @@ -289,7 +289,7 @@ In more detail python setup.py build_sphinx The last line should just state ``build succeeded``, and should not mention - any warnings. (For more details, see the AstroPy + any warnings. (For more details, see the Astropy :ref:`documentation-guidelines` we follow.) #. See which files have changed with ``git status`` (see `git status`_). @@ -442,7 +442,7 @@ remote called ``origin``, you use this command to force-push:: Note that this will overwrite the branch on GitHub, i.e. this is one of the few ways you can actually lose commits with git. Also note that it is never allowed -to force push to the main AstroPy repo (typically called ``upstream``), because +to force push to the main Astropy repo (typically called ``upstream``), because this would re-write commit history and thus cause problems for all others. .. _recovering-from-mess-up: diff --git a/docs/development/index.rst b/docs/development/index.rst index a05026a220a..b55a2056f7f 100644 --- a/docs/development/index.rst +++ b/docs/development/index.rst @@ -4,9 +4,9 @@ Developer Workflow If you want to contribute to the development of TARDIS, please read through this page and follow the guidelines outlined here. Many of the Development -workflow is taken from `AstroPy `_, and credit belongs -to the AstroPy team for designing it. +to the Astropy team for designing it. .. toctree:: :maxdepth: 2 diff --git a/docs/development/release_workflow.rst b/docs/development/release_workflow.rst index 9b6c720d0b4..99d21ab64cb 100644 --- a/docs/development/release_workflow.rst +++ b/docs/development/release_workflow.rst @@ -26,5 +26,5 @@ Doing the actual release ======================== This is best done in a clean environment (so a fresh checkout from the master). -We again use the AstroPy instructions: +We again use the Astropy instructions: ``_ diff --git a/docs/installation.rst b/docs/installation.rst index e2a780a2957..0ab170dbae9 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -27,8 +27,8 @@ Requirements You can see a list of all the requirements of TARDIS in the `environment definition file `_. -TARDIS is using AstroPy's excellent installation helpers and thus uses similar -instructions to AstroPy. +TARDIS is using Astropy's excellent installation helpers and thus uses similar +instructions to Astropy. .. _anaconda_inst_label: diff --git a/docs/physics/physical_quantities.rst b/docs/physics/physical_quantities.rst index 3ca0f0f5c7b..f878eb54630 100644 --- a/docs/physics/physical_quantities.rst +++ b/docs/physics/physical_quantities.rst @@ -42,7 +42,7 @@ Examples of finding physical quantities For example, two of our important quantities are the parameters of the radiation field model, :math:`T_{\rm rad}` and :math:`W`. These exist -as AstroPy `Quantities `_. Thus +as Astropy `Quantities `_. Thus .. code-block:: python @@ -124,11 +124,11 @@ of Si II: .. note:: - If you prefer to work in SI units, all the AstroPy Quantities may + If you prefer to work in SI units, all the Astropy Quantities may instead be accessed with "xxx.si". .. note:: - Information that is not stored as AstroPy Quantities (e.g. the ion + Information that is not stored as Astropy Quantities (e.g. the ion an level populations used in the example above) are usually stored in cgs units (i.e. :math:`{\rm cm}^{-3}` for the populations). diff --git a/docs/team.rst b/docs/team.rst index f9971c93b87..41905923f2a 100644 --- a/docs/team.rst +++ b/docs/team.rst @@ -4,7 +4,7 @@ Team **** -TARDIS is developed by a multidisciplinary team. We adhere to the AstroPy +TARDIS is developed by a multidisciplinary team. We adhere to the Astropy `code of conduct `_. Principle Investigator