diff --git a/blogs/tests/psf_feed_example.xml b/blogs/tests/psf_feed_example.xml index 202f3df2b..b9d0db7ce 100644 --- a/blogs/tests/psf_feed_example.xml +++ b/blogs/tests/psf_feed_example.xml @@ -523,7 +523,7 @@ Along the way it was remarked that the <a class="reference external" href="ht <div class="section" id="virtualenv-inclusion"> <h4> <tt class="docutils literal">virtualenv</tt> Inclusion</h4> -In about two minutes, discussion on PEP <a class="reference external" href="http://www.python.org/dev/peps/pep-0405/">405</a> came and went. Carl Meyer mentioned that a reference implementation is available and is working pretty well. A look from the OSX maintainers would be beneficial, and both Ned Deily and Ronald Oussoren were in attendance. It seemed like one of the only things left in terms of the PEP was to find someone to make a declaration on it, and Thomas Wouters put his name out there if Nick Coghlan wasn't going to do t (update: Nick will be the PEP czar).</div> +In about two minutes, discussion on PEP <a class="reference external" href="http://www.python.org/dev/peps/pep-0405/">405</a> came and went. Carl Meyer mentioned that a reference implementation is available and is working pretty well. A look from the macOS maintainers would be beneficial, and both Ned Deily and Ronald Oussoren were in attendance. It seemed like one of the only things left in terms of the PEP was to find someone to make a declaration on it, and Thomas Wouters put his name out there if Nick Coghlan wasn't going to do t (update: Nick will be the PEP czar).</div> <br /> <div class="section" id="pep-397-inclusion"> <h4> diff --git a/docs/source/administration.rst b/docs/source/administration.rst index 6a7ee08bf..aa4f33718 100644 --- a/docs/source/administration.rst +++ b/docs/source/administration.rst @@ -22,7 +22,7 @@ Here is an example of what that looks like on the site. .. image:: _images/supernav-example.png :alt: Example Supernav image -The sub-nav items on the left are simply nested :ref:`navigation` links in SiteTree relative to the 'Download' item in the tree. The larger *Download for Mac OSX* box however is what we refer to as the *supernav*. +The sub-nav items on the left are simply nested :ref:`navigation` links in SiteTree relative to the 'Download' item in the tree. The larger *Download for macOS* box however is what we refer to as the *supernav*. Most supernavs are updated automatically based on the underlying Django application content using signals. By convention the application will have a template named ``supernav.html``. For example, upon saving any published :ref:`Release ` a Django signal is fired to update the ``supernav-python-downloads`` box with the most current Python2 and Python3 releases. In this case the markup is structured in a way to allow for the automatic OS detection Javascript to show the user the appropriate download links for the OS they are browsing with. diff --git a/downloads/tests/base.py b/downloads/tests/base.py index d32c92751..c7ed5d239 100644 --- a/downloads/tests/base.py +++ b/downloads/tests/base.py @@ -13,7 +13,7 @@ class DownloadMixin: def setUpClass(cls): super().setUpClass() cls.windows, _ = OS.objects.get_or_create(name='Windows') - cls.osx, _ = OS.objects.get_or_create(name='Mac OSX') + cls.osx, _ = OS.objects.get_or_create(name='macOS') cls.linux, _ = OS.objects.get_or_create(name='Linux') @@ -52,8 +52,8 @@ def setUp(self): self.release_275_osx = ReleaseFile.objects.create( os=self.osx, release=self.release_275, - name='Mac OSX 64-bit/32-bit', - description='Mac OS X 10.6 and later', + name='macOS 64-bit/32-bit', + description='macOS 10.6 and later', url='ftp/python/2.7.5/python-2.7.5-macosx10.6.dmg', ) diff --git a/downloads/tests/test_models.py b/downloads/tests/test_models.py index d9185b79f..c2d93d68b 100644 --- a/downloads/tests/test_models.py +++ b/downloads/tests/test_models.py @@ -5,7 +5,7 @@ class DownloadModelTests(BaseDownloadTests): def test_stringification(self): - self.assertEqual(str(self.osx), 'Mac OSX') + self.assertEqual(str(self.osx), 'macOS') self.assertEqual(str(self.release_275), 'Python 2.7.5') def test_published(self): diff --git a/fixtures/boxes.json b/fixtures/boxes.json index 72efffcda..5b71ea5ad 100644 --- a/fixtures/boxes.json +++ b/fixtures/boxes.json @@ -332,14 +332,14 @@ { "fields": { "label": "download-banner", - "content": "

Looking for Python with a different OS? Python for Windows, Linux/UNIX, Mac OS X, Other

\r\n

Want to help test development versions of Python? Pre-releases

\r\n

Looking for Python 2.7? See below for specific releases

", + "content": "

Looking for Python with a different OS? Python for Windows, Linux/UNIX, macOS, Other

\r\n

Want to help test development versions of Python? Pre-releases

\r\n

Looking for Python 2.7? See below for specific releases

", "content_markup_type": "html" } }, { "fields": { "label": "download-dev", - "content": "

Information about specific ports, and developer info

\r\n\r\n", + "content": "

Information about specific ports, and developer info

\r\n\r\n", "content_markup_type": "html" } }, @@ -374,7 +374,7 @@ { "fields": { "label": "supernav-python-downloads", - "content": "\n
  • \n \n
    \n \n

    Download for Mac OS X

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n \n

    Python Source

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n \n

    Download for Windows

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n

    Note that Python 3.5+ cannot be used on Windows XP or earlier.

    \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n

    Download Python for Any OS

    \n

    Python can be used on many operating systems and environments.

    \n

    \n View the full list of downloads\n

    \n
    \n
    • \n", + "content": "\n
  • \n \n
    \n \n

    Download for macOS

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n \n

    Python Source

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n \n

    Download for Windows

    \n \n

    \n Python 3.5.2\n Python 2.7.12\n

    \n

    Note that Python 3.5+ cannot be used on Windows XP or earlier.

    \n

    Not the OS you are looking for? Python can be used on many operating systems and environments. View the full list of downloads.

    \n
    \n \n
    \n

    Download Python for Any OS

    \n

    Python can be used on many operating systems and environments.

    \n

    \n View the full list of downloads\n

    \n
    \n
    • \n", "content_markup_type": "html" } }, diff --git a/fixtures/sitetree_menus.json b/fixtures/sitetree_menus.json index 693cb48c6..278b985e9 100644 --- a/fixtures/sitetree_menus.json +++ b/fixtures/sitetree_menus.json @@ -419,7 +419,7 @@ "model": "sitetree.treeitem", "pk": 20, "fields": { - "title": "Mac OS X", + "title": "macOS", "hint": "", "url": "/downloads/mac-osx/", "urlaspattern": false, diff --git a/static/sass/_layout.scss b/static/sass/_layout.scss index d97526979..6fb1de4a9 100644 --- a/static/sass/_layout.scss +++ b/static/sass/_layout.scss @@ -920,7 +920,7 @@