Merge from 3.x: PR #7007

Fixes #5986

CONTRIBUTING.md

@@ -187,6 +187,8 @@ To run the Spyder test suite, please use (from the `spyder` root directory):
 
 [Download Spyder (with Anaconda)](https://www.anaconda.com/download/)
 
+[Online Documentation](https://docs.spyder-ide.org/)
+
 [Spyder Github](https://github.com/spyder-ide/spyder)
 
 [Troubleshooting Guide and FAQ](

README.md

@@ -101,14 +101,14 @@ https://www.spyder-ide.org/).
 
 ## Documentation
 
-You can read the Spyder documentation online at [PythonHosted](
-http://pythonhosted.org/spyder/).
+You can read the Spyder documentation online on [the Spyder Docs website](
+https://docs.spyder-ide.org/).
 
 
 ## Installation
 
 For a detailed guide to installing Spyder, please refer to our
-[installation instructions](http://pythonhosted.org/spyder/installation.html).
+[installation instructions](https://docs.spyder-ide.org/installation.html).
 
 The easiest way to install Spyder on any of our supported platforms
 is to download it as part of the [Anaconda](https://www.anaconda.com/download/)
@@ -173,7 +173,7 @@ Alternatively, you can use `pip` to install PyQt5 separately and
 the other *runtime dependencies* listed below. However, beware:
 this method is recommended for experts only, and you'll need to solve any
 problems on your own. See the
-[installation instructions](http://pythonhosted.org/spyder/installation.html)
+[installation instructions](https://docs.spyder-ide.org/installation.html)
 for more details.
 
 
@@ -241,6 +241,8 @@ Become a sponsor to get your logo on our README on Github.
 
 [Download Spyder (with Anaconda)](https://www.anaconda.com/download/)
 
+[Online Documentation](https://docs.spyder-ide.org/)
+
 [Spyder Github](https://github.com/spyder-ide/spyder)
 
 [Troubleshooting Guide and FAQ](

TROUBLESHOOTING.md

@@ -3,7 +3,7 @@ Spyder Troubleshooting Guide
 
 For an up to date, more comprehensive version of this guide, covering
 solutions to specific commonly reported issues along with these more general
-troubleshooting strategies, please refer to:
+troubleshooting strategies, please refer to
 <https://github.com/spyder-ide/spyder/wiki/Troubleshooting-Guide-and-FAQ>
 Thanks, and best of luck!
 
@@ -184,7 +184,7 @@ Common solutions
 *   Check and repair/reset permissions, your disk, and OS if all else fails
 
 
-Advanced tricks
+Trickier tricks
 ---------------
 
 If none of the above solves the problem, you can try starting Spyder directly
@@ -255,17 +255,17 @@ patch issues yourself. You can explore the error messages
 you're receiving and Spyder's inner workings with the ``Internal Console`` under
 the menu item ``View`` > ``Panes`` > ``Internal Console``. If you want more
 detailed debug output, open an Anaconda Prompt/Terminal/command line
-(on Windows/Mac/Linux), set the enviroment variable SPYDER_DEBUG to the value
+(on Windows/Mac/Linux), set the environment variable SPYDER_DEBUG to the value
 "3" (on ``cmd``, use ``set SPYDER_DEBUG=3``; with ``bash``, execute
-``SPYDER_DEBUG="3"``, and for ``tcsh``, run ``setenv SPYDER_DEBUG 3``.
+``export SPYDER_DEBUG="3"``, and for ``tcsh``, run ``setenv SPYDER_DEBUG 3``.
 Then, launch Spyder from that same shell with ``spyder``, and observe the
 results. Even if you don't manage to fix the problem yourself, this output
 can be immensely helpful in aiding us to quickly narrow down and solve your
 issue for you.
 
 However, if you do feel up to it and think you know where to look and what to
 change, you are welcome to take a stab at patching the bug. Just ``clone``
-the relevant development version of Spyder (``3.x`` for bug fixes) from our
+the relevant development branch of Spyder (e.g. ``3.x`` for bug fixes) from our
 Github repo: <https://github.com/spyder-ide/spyder/>, edit the relevant Python
 code in your favorite editor or IDE (or Spyder itself!), and test your changes
 by running it from the cloned repo with ``python bootstrap.py`` from the repo's
@@ -294,7 +294,7 @@ these places might.
 Spyder-related platforms
 ------------------------
 
-*   **Spyder documentation**: <https://pythonhosted.org/spyder/>
+*   **Spyder documentation**: <https://docs.spyder-ide.org/>
     It explains how to use Spyder's basic features and addresses a number of
     common "How can I?" questions that arise. Its still a work in progress,
     so if you discover something missing from the docs, please submit an
@@ -304,7 +304,7 @@ Spyder-related platforms
     our wiki has information about how to develop and test Spyder, our
     development roadmap and the features planned in the next release, other
     common questions, the changelog, and much more.
-*   **Spyder website**: <https://spyder-ide.github.io/>
+*   **Spyder website**: <https://www.spyder-ide.org/>
     While it is still under very early alpha development and isn't polished for
     public consumption, it does contain basic information about Spyder and
     links to many other helpful resources.
@@ -322,6 +322,9 @@ Spyder-related platforms
     active Spyder community as well, with new Spyder-related questions posted
     every day, and the developers, especially the lead maintainer, are active
     in answering them.
+*   **Spyder OpenCollective**: <https://opencollective.com/spyder/>
+    If you enjoy Spyder and want to help fund us fixing bugs and adding your
+    most requested new features, please support our work on OpenCollective!
 
 
 Python help and problems
@@ -428,13 +431,6 @@ The key items, in rough order of priority:
         Anaconda Prompt/Terminal/command line (Windows/Mac/Linux) with
         ``spyder`` and copy the output printed there.
 
-    It is a common problem that tracebacks, whether automatic or copy/pasted,
-    are incomplete/cut off, which tends to omit the information (the last
-    few lines) most critical to diagnosing or solving the issue. Accordingly,
-    carefully check the included traceback to be sure this isn't the case,
-    and try one of the other sources in the list above if so, as otherwise
-    we'll probably have to close your issue as we can't solve it without that.
-
     *If you are reporting a specific behavior* rather than an error, or the
     message does not fully explain what occurs, please *describe in detail
     what actually happened, and what you expected Spyder to do*.
@@ -467,7 +463,9 @@ The key items, in rough order of priority:
     standalone Qtconsole, IPython, and/or the plain Python** interpreter.
 
 *   **Whether the problem occurred consistently before** in similar situations,
-    only some of the time, or is this the first time you observed it?
+    only some of the time, or this is the first time you've observed it, and
+    whether it occurred the first time you tried the behavior that triggered it
+    in a new Spyder install.
 
 *   **Anything else special or unusual** about your system, environment,
     packages, or specific usage that might have anything to do with the problem

spyder/app/mainwindow.py

@@ -2443,7 +2443,7 @@ def trouble_guide(self):
 
     @Slot()
     def google_group(self):
-        """Open Spyder troubleshooting guide in a web browser."""
+        """Open Spyder Google Group in a web browser."""
         url = QUrl(__forum_url__)
         QDesktopServices.openUrl(url)
 
@@ -2871,7 +2871,7 @@ def _check_updates_ready(self):
         error_msg = self.worker_updates.error
 
         url_r = __project_url__ + '/releases'
-        url_i = 'http://pythonhosted.org/spyder/installation.html'
+        url_i = 'https://docs.spyder-ide.org/installation.html'
 
         # Define the custom QMessageBox
         box = MessageCheckBox(icon=QMessageBox.Information,