From 2c0fbf0acb3f5b938b09be87010bc8bae5eeda0c Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" Date: Wed, 13 Dec 2017 15:42:16 -0500 Subject: [PATCH 1/3] Remove outdated refs to Mac DMG installers to fix #5978 --- doc/installation.rst | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 3ab9ae3aad4..104b7304586 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -60,18 +60,8 @@ Installing on MacOS X The easy way ~~~~~~~~~~~~ -Thanks to the Spyder team and `Continuum `_, you have -two alternatives: - -#. Use the `Anaconda `_ Python distribution. - -#. Use our DMG installers, which can be found - `here `_. - - .. note:: - - The minimal version to run our DMG's is Mavericks (10.9) since - Spyder 2.3.5. Previous versions work on Lion (10.7) or higher. ++Thanks to the Spyder team and `Continuum `_, Spyder is included ++in the `Anaconda `_ Python distribution. The hard way From aa61560d462fcde0578c54f75c46e10bc2f6c179 Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" Date: Thu, 14 Dec 2017 15:24:25 -0500 Subject: [PATCH 2/3] Update Continuum name and URLs to Anaconda --- doc/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 104b7304586..f500ab0345d 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -12,7 +12,7 @@ The easy way Spyder is already included in these *Python Scientific Distributions*: -#. `Anaconda `_ +#. `Anaconda `_ #. `WinPython `_ #. `Python(x,y) `_ @@ -60,8 +60,8 @@ Installing on MacOS X The easy way ~~~~~~~~~~~~ -+Thanks to the Spyder team and `Continuum `_, Spyder is included -+in the `Anaconda `_ Python distribution. ++Thanks to the Spyder team and `Anaconda `_, Spyder is included ++in the `Anaconda `_ Python distribution. The hard way From ca007f7d9278b9ac459b6902aa244ca962683eb3 Mon Sep 17 00:00:00 2001 From: "C.A.M. Gerlach" Date: Thu, 14 Dec 2017 15:37:55 -0500 Subject: [PATCH 3/3] Update Mac OS X to macOS --- doc/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index f500ab0345d..18c1a0b5c97 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -1,7 +1,7 @@ Installation ============ -Spyder is quite easy to install on Windows, Linux and MacOS X. Just the read the +Spyder is quite easy to install on Windows, Linux and macOS. Just the read the following instructions with care. Installing on Windows Vista/7/8/10 @@ -54,8 +54,8 @@ You can update Spyder by: | -Installing on MacOS X ----------------------- +Installing on macOS +------------------- The easy way ~~~~~~~~~~~~