[tor-commits] [stem/master] Rename OSX to Mac OS

[atagar at torproject.org]

commit fdc9fce733eb89192974565a7d82c8ca47c6999a
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Sep 5 14:06:46 2020 -0700

    Rename OSX to Mac OS
    
    So... what's their name this week? :P
    
    Apple keeps renaming their OS. Updating us to their latest...
    
      https://en.wikipedia.org/wiki/MacOS
---
 docs/_static/label/mac_os.png                      | Bin 0 -> 1496 bytes
 docs/_static/label/osx.png                         | Bin 1767 -> 0 bytes
 docs/_static/label/resources/mac_os.xcf            | Bin 0 -> 3221 bytes
 docs/_static/label/resources/osx.xcf               | Bin 3820 -> 0 bytes
 docs/_static/section/download/{osx.png => mac.png} | Bin
 docs/download.rst                                  |  22 ++++++++-------------
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/docs/_static/label/mac_os.png b/docs/_static/label/mac_os.png
new file mode 100644
index 00000000..4142eef8
Binary files /dev/null and b/docs/_static/label/mac_os.png differ
diff --git a/docs/_static/label/osx.png b/docs/_static/label/osx.png
deleted file mode 100644
index 10e41805..00000000
Binary files a/docs/_static/label/osx.png and /dev/null differ
diff --git a/docs/_static/label/resources/mac_os.xcf b/docs/_static/label/resources/mac_os.xcf
new file mode 100644
index 00000000..5e73cd39
Binary files /dev/null and b/docs/_static/label/resources/mac_os.xcf differ
diff --git a/docs/_static/label/resources/osx.xcf b/docs/_static/label/resources/osx.xcf
deleted file mode 100644
index 5eab9428..00000000
Binary files a/docs/_static/label/resources/osx.xcf and /dev/null differ
diff --git a/docs/_static/section/download/osx.png b/docs/_static/section/download/mac.png
similarity index 100%
rename from docs/_static/section/download/osx.png
rename to docs/_static/section/download/mac.png
diff --git a/docs/download.rst b/docs/download.rst
index 3cd3c8c5..a6a35870 100644
--- a/docs/download.rst
+++ b/docs/download.rst
@@ -7,7 +7,7 @@ Download
      Source: http://www.python.org/community/logos/
      License: http://www.python.org/psf/trademarks
    
-   * OSX
+   * Mac OS
      Source: IconArchive (http://www.iconarchive.com/show/papercut-social-icons-by-graphicloads/Apple-icon.html)
      Author: GraphicLoads, Papercut Social Icons
      License: Freeware
@@ -80,29 +80,23 @@ Download
        .. image:: /_static/label/python_package_index.png
           :target: https://pypi.org/project/stem/
 
-       Signed releases and instructions for both Python 2.x and 3.x. You can
-       easily install from its `tarball
-       <https://files.pythonhosted.org/packages/7f/71/d82f4204e88be00220cc54eedb2972fd05081cb0e5ebdc537d8940b064ea/stem-1.7.1.tar.gz>`_
-       (`sig
-       <https://files.pythonhosted.org/packages/7f/71/d82f4204e88be00220cc54eedb2972fd05081cb0e5ebdc537d8940b064ea/stem-1.7.1.tar.gz.asc>`_),
-       or with **pip**...
+       You can install our latest release from the Python Package Index (PyPI)
+       with **pip**...
 
        ::
 
-         % sudo easy_install pip
          % sudo pip install stem
 
-   * - .. image:: /_static/section/download/osx.png
+   * - .. image:: /_static/section/download/mac.png
 
      - .. _osx:
-       .. image:: /_static/label/osx.png
+       .. image:: /_static/label/mac_os.png
 
-       As of OSX 10.8 the platform bundles Python 2.7 by default. This makes
+       Mac OS 10.8 and above bundle Python by default. This makes
        installation easy...
 
        ::
 
-         % sudo easy_install pip
          % sudo pip install stem
 
    * - .. image:: /_static/section/download/debian.png
@@ -231,8 +225,8 @@ Download
        .. image:: /_static/label/source_repository.png
           :target: https://gitweb.torproject.org/stem.git
 
-       For those wanting to live on the bleeding edge or contribute to Stem,
-       Stem's git repository can be fetched with...
+       For those who want to live on the bleeding edge or contribute, you can
+       download Stem's git repository with...
 
        ::