Patchwork [1,of,5] help: remove references to "Python 2.6 or later"

login
register
mail settings
Submitter Gregory Szorc
Date April 10, 2016, 6:04 p.m.
Message ID <3d1025ea55a026cd46f7.1460311473@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/14487/
State Accepted
Headers show

Comments

Gregory Szorc - April 10, 2016, 6:04 p.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1460311127 25200
#      Sun Apr 10 10:58:47 2016 -0700
# Node ID 3d1025ea55a026cd46f78102ce4f58da80f2c590
# Parent  c5565fc8848dd084d104ca40c33d1acdfcff8bc6
help: remove references to "Python 2.6 or later"

We require Python 2.6. So there is no value to these docs.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -981,19 +981,16 @@  to a new certificate.
 The CA chain and web.cacerts is not used for servers with a fingerprint.
 
 For example::
 
     [hostfingerprints]
     hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
     hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33
 
-This feature is only supported when using Python 2.6 or later.
-
-
 ``http_proxy``
 --------------
 
 Used to access web-based Mercurial repositories through a HTTP
 proxy.
 
 ``host``
     Host name and (optional) port of the proxy server, for example
@@ -1844,21 +1841,16 @@  The full set of options is:
 
 ``cacerts``
     Path to file containing a list of PEM encoded certificate
     authority certificates. Environment variables and ``~user``
     constructs are expanded in the filename. If specified on the
     client, then it will verify the identity of remote HTTPS servers
     with these certificates.
 
-    This feature is only supported when using Python 2.6 or later. If you wish
-    to use it with earlier versions of Python, install the backported
-    version of the ssl library that is available from
-    ``http://pypi.python.org``.
-
     To disable SSL verification temporarily, specify ``--insecure`` from
     command line.
 
     You can use OpenSSL's CA certificate file if your platform has
     one. On most Linux systems this will be
     ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to
     generate this file manually. The form must be as follows::