new docs links

davidism · davidism · commit 7818f30f6e9e · 2018-09-25T13:50:27.000-07:00
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -7,8 +7,8 @@ Thanks for considering contributing to Click.
 Support questions
 =================
 
-Please, don't use the issue tracker for this. Check whether the `Pocoo IRC
-channel <http://www.pocoo.org/irc/>`_ can help with your issue. If your problem
+Please, don't use the issue tracker for this. Check whether the
+``#pocoo`` IRC channel on Freenode can help with your issue. If your problem
 is not strictly Click-specific, ``#python`` on Freenode is generally more
 active.  `StackOverflow <https://stackoverflow.com/>`_ is also worth
 considering.
@@ -33,9 +33,9 @@ Submitting patches
   may ignore the line-length-limit if following it would make the code uglier.
 
 - For features: Consider whether your feature would be a better fit for an
-  `external package <http://click.pocoo.org/contrib/>`_
+  `external package <https://click.palletsprojects.com/en/7.x/contrib/>`_
 
-- For bugfixes: Submit against the latest maintenance branch instead of master!
+- For docs and bug fixes: Submit against the latest maintenance branch instead of master!
 
 Running the testsuite
 ---------------------
diff --git a/click/_unicodefun.py b/click/_unicodefun.py
@@ -43,7 +43,7 @@ def _check_for_unicode_literals():
                  'because it can introduce subtle bugs in your '
                  'code.  You should instead use explicit u"" literals '
                  'for your unicode strings.  For more information see '
-                 'http://click.pocoo.org/python3/'),
+                 'https://click.palletsprojects.com/python3/'),
          stacklevel=bad_frame)
 
 
@@ -117,7 +117,9 @@ def _verify_python3_env():
                 'is not supported'
             ) % bad_locale
 
-    raise RuntimeError('Click will abort further execution because Python 3 '
-                       'was configured to use ASCII as encoding for the '
-                       'environment.  Consult http://click.pocoo.org/python3/ '
-                       'for mitigation steps.' + extra)
+    raise RuntimeError(
+        'Click will abort further execution because Python 3 was'
+        ' configured to use ASCII as encoding for the environment.'
+        ' Consult https://click.palletsprojects.com/en/7.x/python3/ for'
+        ' mitigation steps.' + extra
+    )
diff --git a/click/termui.py b/click/termui.py
@@ -524,7 +524,7 @@ def launch(url, wait=False, locate=False):
 
     Examples::
 
-        click.launch('http://click.pocoo.org/')
+        click.launch('https://click.palletsprojects.com/')
         click.launch('/my/downloaded/file', locate=True)
 
     .. versionadded:: 2.0
diff --git a/docs/python3.rst b/docs/python3.rst
@@ -120,7 +120,7 @@ If you see something like this error in Python 3::
       ...
     RuntimeError: Click will abort further execution because Python 3 was
       configured to use ASCII as encoding for the environment. Either switch
-      to Python 2 or consult http://click.pocoo.org/python3/ for
+      to Python 2 or consult the Python 3 section of the docs for
       mitigation steps.
 
 You are dealing with an environment where Python 3 thinks you are
diff --git a/docs/utils.rst b/docs/utils.rst
@@ -245,8 +245,8 @@ select the provided file.
 
 Example usage::
 
-    click.launch('http://click.pocoo.org/')
-    click.launch('/my/downloaded/file.txt', locate=True)
+    click.launch("https://click.palletsprojects.com/")
+    click.launch("/my/downloaded/file.txt", locate=True)
 
 
 Printing Filenames
diff --git a/examples/README b/examples/README
@@ -9,4 +9,4 @@ Click Examples
   through the wrong interpreter.
 
   For more information about this see the documentation:
-    http://click.pocoo.org/setuptools/
+    https://click.palletsprojects.com/en/7.x/setuptools/
