1.2.5dev: Merge r17021 from 1.0-stable

Refs #13088.


git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.2-stable@17022 af82e41b-90c4-0310-8c96-b1721e28e2e2

ChangeLog

@@ -1,4 +1,4 @@
 The ChangeLog can be viewed:
-* On the web at http://trac.edgewall.org/wiki/TracChangeLog
+* On the web at https://trac.edgewall.org/wiki/TracChangeLog
 * In the source at trac/wiki/default-pages/TracChangeLog 
 * By navigating to the TracChangeLog page after installing or upgrading Trac. You must upgrade the wiki to get the latest TracChangeLog.

README.rst

@@ -21,7 +21,7 @@ for more information about this release.
 
 Otherwise, the primary source of information is the main Trac web site:
 
- <http://trac.edgewall.org/>
+ <https://trac.edgewall.org/>
 
 We hope you enjoy it,
 

contrib/appveyor.ps1

@@ -6,11 +6,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.com/license.html.
+# are also available at https://trac.edgewall.com/license.html.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/.
+# history and logs, available at https://trac.edgewall.org/.
 
 # ------------------------------------------------------------------
 #  This is a PowerShell script implementing the build steps used by
@@ -34,10 +34,10 @@
 # environment on AppVeyor.
 #
 # See in particular:
-#  - http://www.appveyor.com/docs/installed-software#python
-#  - http://www.appveyor.com/docs/installed-software#mingw-msys-cygwin
-#  - http://www.appveyor.com/docs/services-databases#mysql
-#  - http://www.appveyor.com/docs/services-databases#postgresql
+#  - https://www.appveyor.com/docs/installed-software#python
+#  - https://www.appveyor.com/docs/installed-software#mingw-msys-cygwin
+#  - https://www.appveyor.com/docs/services-databases#mysql
+#  - https://www.appveyor.com/docs/services-databases#postgresql
 
 $msysHome = 'C:\msys64\usr\bin'
 $deps     = 'C:\projects\dependencies'
@@ -117,7 +117,7 @@ $svnBranch = $env:SVN_BRANCH
 # ------------------------------------------------------------------
 
 # Documentation for AppVeyor API (Add-AppveyorMessage, etc.) can be
-# found at: http://www.appveyor.com/docs/build-worker-api
+# found at: https://www.appveyor.com/docs/build-worker-api
 
 function Write-Step([string]$name, [bool]$skip) {
     if ($skip) {
@@ -144,7 +144,7 @@ $name
 #
 #   . .\contrib\appveyor.ps1
 #
-# See http://trac.edgewall.org/wiki/AppVeyor for additional info.
+# See https://trac.edgewall.org/wiki/AppVeyor for additional info.
 
 if (-not $env:APPVEYOR) {
     function Debug-Caller {

contrib/trac-pre-commit-hook

@@ -7,11 +7,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.com/license.html.
+# are also available at https://trac.edgewall.com/license.html.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/.
+# history and logs, available at https://trac.edgewall.org/.
 #
 # This script will enforce the following policy:
 #

contrib/trac-svn-hook

@@ -7,18 +7,18 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.com/license.html.
+# are also available at https://trac.edgewall.com/license.html.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/.
+# history and logs, available at https://trac.edgewall.org/.
 #
 # = trac-svn-hook =
 #
 #  Purpose:: this script is meant to be called from the Subversion hooks
 #            for notifying Trac when changesets are added or modified.
 #
-#  Scope:: The http://trac.edgewall.org/wiki/TracRepositoryAdmin page
+#  Scope:: The https://trac.edgewall.org/wiki/TracRepositoryAdmin page
 #          describes how to directly call the relevant trac-admin commands
 #          from the Subversion hooks. In most cases this should be enough,
 #          however this script should make troubleshooting easier and
@@ -139,7 +139,7 @@
 # === Virtualenv setup example ===
 #
 # Here we're using a Trac installation set up using virtualenv
-# (http://pypi.python.org/pypi/virtualenv).
+# (https://pypi.org/project/virtualenv).
 #
 # In this example, the virtualenv is located in
 # /packages/trac/branches/trac-multirepos

contrib/trac-svn-post-commit-hook.cmd

@@ -7,11 +7,11 @@
 ::
 :: This software is licensed as described in the file COPYING, which
 :: you should have received as part of this distribution. The terms
-:: are also available at http://trac.edgewall.com/license.html.
+:: are also available at https://trac.edgewall.com/license.html.
 ::
 :: This software consists of voluntary contributions made by many
 :: individuals. For the exact contribution history, see the revision
-:: history and logs, available at http://trac.edgewall.org/.
+:: history and logs, available at https://trac.edgewall.org/.
 :: Trac post-commit-hook script for Windows
 ::
 :: Modified for the multirepos branch to use the `changeset` command.

contrib/workflow/showworkflow

@@ -7,11 +7,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.com/license.html.
+# are also available at https://trac.edgewall.com/license.html.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/.
+# history and logs, available at https://trac.edgewall.org/.
 
 basedir=`dirname $0`
 options=""

trac/web/templates/deploy_trac.cgi

@@ -7,11 +7,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.org/wiki/TracLicense.
+# are also available at https://trac.edgewall.org/wiki/TracLicense.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/log/.
+# history and logs, available at https://trac.edgewall.org/log/.
 #
 # Author: Jonas Borgström <jonas@edgewall.com>
 

trac/web/templates/deploy_trac.fcgi

@@ -7,11 +7,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.org/wiki/TracLicense.
+# are also available at https://trac.edgewall.org/wiki/TracLicense.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/log/.
+# history and logs, available at https://trac.edgewall.org/log/.
 #
 # Author: Jonas Borgström <jonas@edgewall.com>
 

trac/web/templates/deploy_trac.wsgi

@@ -7,11 +7,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://trac.edgewall.org/wiki/TracLicense.
+# are also available at https://trac.edgewall.org/wiki/TracLicense.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://trac.edgewall.org/log/.
+# history and logs, available at https://trac.edgewall.org/log/.
 #
 # Author: Noah Kantrowitz <noah@coderanger.net>
 import os