Modified: tomcat/trunk/res/welcome.bin.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.bin.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.bin.html (original)
+++ tomcat/trunk/res/welcome.bin.html Thu Jun 21 09:16:08 2018
@@ -31,7 +31,7 @@ dd { margin-top: 0.2em; margin-bottom: 0
 <ul>
 <li><a href="../RELEASE-NOTES">Release notes</a>, with important information
 about known issues</li>
-<li><a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
+<li><a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
 </ul>
 
 <p><b>NOTE: The tar files in this distribution use GNU tar extensions,
@@ -66,7 +66,7 @@ RELEASE-NOTES and the RUNNING.txt file i
     x64 Windows platforms.</dd>
   <dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
     <dd>The standalone
-    <a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html";>
+    <a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html";>
     Tomcat Web Application Deployer</a>.</dd>
   <dt>apache-tomcat-[version]-fulldocs.tar.gz</dt>
     <dd>The Tomcat documentation bundle, including complete javadocs.</dd>
@@ -75,23 +75,23 @@ RELEASE-NOTES and the RUNNING.txt file i
 <dd><dl>
   <dt>catalina-ws.jar</dt>
     <dd>Web Services support (JSR 109). See the <a
-    
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>
+    
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>
     extras documentation</a> for more information.</dd>
   <dt>catalina-jmx-remote.jar</dt>
     <dd>JMX Remote Lifecycle Listener. See the <a
-    
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
+    
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
     listeners documentation</a> for details.</dd>
 </dl></dd>
 <dt><b>src/</b></dt>
 <dd><dl>
   <dt>apache-tomcat-[version].zip or .tar.gz</dt>
     <dd>The source code. See
-    <a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/building.html";>building
 instructions</a>.</dd>
+    <a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/building.html";>building
 instructions</a>.</dd>
 </dl></dd>
 </dl>
 
-<p>Thank you for using <a href="http://tomcat.apache.org/";>Tomcat</a>!.
+<p>Thank you for using <a href="https://tomcat.apache.org/";>Tomcat</a>!.
 </p>
 <p><b>The Apache Tomcat Project</b> <br /><a
-href="http://tomcat.apache.org/";>http://tomcat.apache.org/</a></p>
+href="https://tomcat.apache.org/";>https://tomcat.apache.org/</a></p>
 </body></html>

Modified: tomcat/trunk/res/welcome.main.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/welcome.main.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/res/welcome.main.html (original)
+++ tomcat/trunk/res/welcome.main.html Thu Jun 21 09:16:08 2018
@@ -31,7 +31,7 @@ dd { margin-top: 0.2em; margin-bottom: 0
 <ul>
 <li><a href="RELEASE-NOTES">Release notes</a>, with important information
 about known issues</li>
-<li><a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
+<li><a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/changelog.html";>Changelog</a></li>
 </ul>
 
 <p><b>NOTE: The tar files in this distribution use GNU tar extensions,
@@ -66,7 +66,7 @@ RELEASE-NOTES and the RUNNING.txt file i
     x64 Windows platforms.</dd>
   <dt>apache-tomcat-[version]-deployer.zip or .tar.gz</dt>
     <dd>The standalone
-    <a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html";>
+    <a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/deployer-howto.html";>
     Tomcat Web Application Deployer</a>.</dd>
   <dt>apache-tomcat-[version]-fulldocs.tar.gz</dt>
     <dd>The Tomcat documentation bundle, including complete javadocs.</dd>
@@ -75,23 +75,23 @@ RELEASE-NOTES and the RUNNING.txt file i
 <dd><dl>
   <dt>catalina-ws.jar</dt>
     <dd>Web Services support (JSR 109). See the <a
-    
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>
+    
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>
     extras documentation</a> for more information.</dd>
   <dt>catalina-jmx-remote.jar</dt>
     <dd>JMX Remote Lifecycle Listener. See the <a
-    
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
+    
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html";>
     listeners documentation</a> for details.</dd>
 </dl></dd>
 <dt><b>src/</b></dt>
 <dd><dl>
   <dt>apache-tomcat-[version].zip or .tar.gz</dt>
     <dd>The source code. See
-    <a 
href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/building.html";>building
 instructions</a>.</dd>
+    <a 
href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/building.html";>building
 instructions</a>.</dd>
 </dl></dd>
 </dl>
 
-<p>Thank you for using <a href="http://tomcat.apache.org/";>Tomcat</a>!.
+<p>Thank you for using <a href="https://tomcat.apache.org/";>Tomcat</a>!.
 </p>
 <p><b>The Apache Tomcat Project</b> <br /><a
-href="http://tomcat.apache.org/";>http://tomcat.apache.org/</a></p>
+href="https://tomcat.apache.org/";>https://tomcat.apache.org/</a></p>
 </body></html>

Modified: tomcat/trunk/webapps/ROOT/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.jsp?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/trunk/webapps/ROOT/index.jsp Thu Jun 21 09:16:08 2018
@@ -18,7 +18,7 @@ limitations under the License.
 <%
 java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
 request.setAttribute("year", sdf.format(new java.util.Date()));
-request.setAttribute("tomcatUrl", "http://tomcat.apache.org/";);
+request.setAttribute("tomcatUrl", "https://tomcat.apache.org/";);
 request.setAttribute("tomcatDocUrl", "/docs/");
 request.setAttribute("tomcatExamplesUrl", "/examples/");
 %>
@@ -39,7 +39,7 @@ request.setAttribute("tomcatExamplesUrl"
                 <span id="nav-hosts"><a 
href="${tomcatDocUrl}">Documentation</a></span>
                 <span id="nav-config"><a 
href="${tomcatDocUrl}config/">Configuration</a></span>
                 <span id="nav-examples"><a 
href="${tomcatExamplesUrl}">Examples</a></span>
-                <span id="nav-wiki"><a 
href="http://wiki.apache.org/tomcat/FrontPage";>Wiki</a></span>
+                <span id="nav-wiki"><a 
href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a></span>
                 <span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing 
Lists</a></span>
                 <span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find 
Help</a></span>
                 <br class="separator" />
@@ -97,8 +97,8 @@ request.setAttribute("tomcatExamplesUrl"
                 </div>
                 <div class="col25">
                     <div class="container">
-                        <p><a 
href="http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specifications</a></p>
-                        <p><a 
href="http://wiki.apache.org/tomcat/TomcatVersions";>Tomcat Versions</a></p>
+                        <p><a 
href="https://wiki.apache.org/tomcat/Specifications";>Servlet 
Specifications</a></p>
+                        <p><a 
href="https://wiki.apache.org/tomcat/TomcatVersions";>Tomcat Versions</a></p>
                     </div>
                 </div>
                 <br class="separator" />
@@ -124,14 +124,14 @@ request.setAttribute("tomcatExamplesUrl"
                         <h3>Documentation</h3>
                         <h4><a href="${tomcatDocUrl}">Tomcat 
@VERSION_MAJOR_MINOR@ Documentation</a></h4>
                         <h4><a href="${tomcatDocUrl}config/">Tomcat 
@VERSION_MAJOR_MINOR@ Configuration</a></h4>
-                        <h4><a 
href="http://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a></h4>
+                        <h4><a 
href="https://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a></h4>
                         <p>Find additional important configuration information 
in:</p>
                         <pre>$CATALINA_HOME/RUNNING.txt</pre>
                         <p>Developers may be interested in:</p>
                         <ul>
-                            <li><a 
href="http://tomcat.apache.org/bugreport.html";>Tomcat @VERSION_MAJOR_MINOR@ Bug 
Database</a></li>
+                            <li><a 
href="https://tomcat.apache.org/bugreport.html";>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database</a></li>
                             <li><a href="${tomcatDocUrl}api/index.html">Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs</a></li>
-                            <li><a 
href="http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/";>Tomcat 
@VERSION_MAJOR_MINOR@ SVN Repository</a></li>
+                            <li><a 
href="https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/";>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository</a></li>
                         </ul>
                     </div>
                 </div>
@@ -188,7 +188,7 @@ request.setAttribute("tomcatExamplesUrl"
                             <li><a 
href="${tomcatUrl}getinvolved.html">Overview</a></li>
                             <li><a href="${tomcatUrl}svn.html">SVN 
Repositories</a></li>
                             <li><a href="${tomcatUrl}lists.html">Mailing 
Lists</a></li>
-                            <li><a 
href="http://wiki.apache.org/tomcat/FrontPage";>Wiki</a></li>
+                            <li><a 
href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a></li>
                         </ul>
                     </div>
                 </div>
@@ -198,8 +198,8 @@ request.setAttribute("tomcatExamplesUrl"
                         <ul>
                             <li><a 
href="${tomcatUrl}contact.html">Contact</a></li>
                             <li><a href="${tomcatUrl}legal.html">Legal</a></li>
-                            <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
-                            <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                            <li><a 
href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                            <li><a 
href="https://www.apache.org/foundation/thanks.html";>Thanks</a></li>
                         </ul>
                     </div>
                 </div>
@@ -209,7 +209,7 @@ request.setAttribute("tomcatExamplesUrl"
                         <ul>
                             <li><a href="${tomcatUrl}whoweare.html">Who We 
Are</a></li>
                             <li><a 
href="${tomcatUrl}heritage.html">Heritage</a></li>
-                            <li><a href="http://www.apache.org";>Apache 
Home</a></li>
+                            <li><a href="https://www.apache.org";>Apache 
Home</a></li>
                             <li><a 
href="${tomcatUrl}resources.html">Resources</a></li>
                         </ul>
                     </div>

Modified: tomcat/trunk/webapps/docs/api/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/api/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/api/index.html (original)
+++ tomcat/trunk/webapps/docs/api/index.html Thu Jun 21 09:16:08 2018
@@ -27,7 +27,7 @@ Tomcat's internal javadoc is not install
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
 documentation bundle</a>.
 
 </body>

Modified: tomcat/trunk/webapps/docs/appdev/installation.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/installation.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/installation.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/installation.xml Thu Jun 21 09:16:08 2018
@@ -51,7 +51,7 @@ are available at
 <subsection name="Tomcat">
 
 <p>Binary downloads of the <strong>Tomcat</strong> server are available from
-<a href="http://tomcat.apache.org/";>http://tomcat.apache.org/</a>.
+<a href="https://tomcat.apache.org/";>https://tomcat.apache.org/</a>.
 This manual assumes you are using the most recent release
 of Tomcat <version-major/>.  Detailed instructions for downloading and 
installing
 Tomcat are available <a href="../setup.html">here</a>.</p>
@@ -68,7 +68,7 @@ own <code>CATALINA_BASE</code> configure
 <subsection name="Ant">
 
 <p>Binary downloads of the <strong>Ant</strong> build tool are available from
-<a href="http://ant.apache.org/";>http://ant.apache.org/</a>.
+<a href="https://ant.apache.org/";>https://ant.apache.org/</a>.
 This manual assumes you are using Ant 1.8 or later.  The instructions may
 also be compatible with other versions, but this has not been tested.</p>
 

Modified: tomcat/trunk/webapps/docs/appdev/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/introduction.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/introduction.xml Thu Jun 21 09:16:08 2018
@@ -62,7 +62,7 @@ the details of your particular environme
 information, documentation, and software that is useful in developing
 web applications with Tomcat.</p>
 <ul>
-<li><p><a 
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html</a>
 -
+<li><p><a 
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html</a>
 -
     <i>JavaServer Pages (JSP) Specification, Version 2.3</i>.  Describes
     the programming environment provided by standard implementations
     of the JavaServer Pages (JSP) technology.  In conjunction with

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Thu Jun 21 09:16:08 2018
@@ -151,7 +151,7 @@ cvs commit]]></source>
 
 Note that this is only an example web.xml file.  The full definition
 of the deployment descriptor file is in the
-<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification.</a>
+<a href="https://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification.</a>
 
 </subsection>
 

Modified: tomcat/trunk/webapps/docs/appdev/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/project.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Application Developer's Guide"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
     <title>Application Developer's Guide</title>
 
@@ -30,7 +30,7 @@
     <menu name="Links">
         <item name="Docs Home"             href="../index.html"/>
         <item name="App Dev Guide Home"    href="index.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 

Modified: tomcat/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/source.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/source.xml Thu Jun 21 09:16:08 2018
@@ -85,7 +85,7 @@ is discussed below.  All of these compon
 <li><strong>web/WEB-INF/</strong> - The special configuration files required
     for your application, including the web application deployment descriptor
     (<code>web.xml</code>, defined in the
-    <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification</a>),
+    <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification</a>),
     tag library descriptors for custom tag libraries
     you have created, and other resource files you wish to include within
     your web application.  Even though this directory appears to be a

Modified: tomcat/trunk/webapps/docs/apr.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/apr.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/apr.xml (original)
+++ tomcat/trunk/webapps/docs/apr.xml Thu Jun 21 09:16:08 2018
@@ -36,7 +36,7 @@
   <section name="Introduction">
 
   <p>
-      Tomcat can use the <a href="http://apr.apache.org/";>Apache Portable 
Runtime</a> to
+      Tomcat can use the <a href="https://apr.apache.org/";>Apache Portable 
Runtime</a> to
       provide superior scalability, performance, and better integration with 
native server
       technologies. The Apache Portable Runtime is a highly portable library 
that is at
       the heart of Apache HTTP Server 2.x. APR has many uses, including access 
to advanced IO
@@ -68,11 +68,11 @@
 
     <p>
       Windows binaries are provided for tcnative-1, which is a statically 
compiled .dll which includes
-      OpenSSL and APR. It can be downloaded from <a 
href="http://tomcat.apache.org/download-native.cgi";>here</a>
+      OpenSSL and APR. It can be downloaded from <a 
href="https://tomcat.apache.org/download-native.cgi";>here</a>
       as 32bit or AMD x86-64 binaries.
       In security conscious production environments, it is recommended to use 
separate shared dlls
       for OpenSSL, APR, and libtcnative-1, and update them as needed according 
to security bulletins.
-      Windows OpenSSL binaries are linked from the <a 
href="http://www.openssl.org";>Official OpenSSL
+      Windows OpenSSL binaries are linked from the <a 
href="https://www.openssl.org";>Official OpenSSL
       website</a> (see related/binaries).
     </p>
 

Modified: tomcat/trunk/webapps/docs/architecture/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/trunk/webapps/docs/architecture/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat 9 Architecture"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
     <title>Apache Tomcat 9 Architecture</title>
 
@@ -30,7 +30,7 @@
     <menu name="Links">
         <item name="Docs Home"             href="../index.html" />
         <item name="Architecture Home"     href="index.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 

Modified: tomcat/trunk/webapps/docs/building.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Thu Jun 21 09:16:08 2018
@@ -63,7 +63,7 @@ directory into which you installed the J
 
 <p>
 Download a binary distribution of Ant 1.9.5 or later from
-<a href="http://ant.apache.org/bindownload.cgi";>here</a>.
+<a href="https://ant.apache.org/bindownload.cgi";>here</a>.
 </p>
 
 <p>
@@ -87,11 +87,11 @@ available, which will be used to actuall
 
   <p>
   Tomcat SVN repository URL:
-  <a 
href="http://svn.apache.org/repos/asf/tomcat/trunk/";>http://svn.apache.org/repos/asf/tomcat/trunk/</a>
+  <a 
href="https://svn.apache.org/repos/asf/tomcat/trunk/";>https://svn.apache.org/repos/asf/tomcat/trunk/</a>
   </p>
   <p>
   Tomcat source packages:
-  <download>http://tomcat.apache.org/download-<version-major/>0.cgi</download>.
+  
<download>https://tomcat.apache.org/download-<version-major/>0.cgi</download>.
   </p>
 
   <p>

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Thu Jun 21 09:16:08 2018
@@ -107,7 +107,7 @@ loaders as it is initialized:</p>
         <em>$CATALINA_HOME/bin</em>. It is useful in certain logging
         configurations</p></li>
     <li><p><em>$CATALINA_HOME/bin/commons-daemon.jar</em> &#8212; The classes
-        from <a href="http://commons.apache.org/daemon/";>Apache Commons
+        from <a href="https://commons.apache.org/daemon/";>Apache Commons
         Daemon</a> project.
         This JAR file is not present in the <code>CLASSPATH</code> built by
         <code>catalina.bat</code>|<code>.sh</code> scripts, but is referenced

Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Thu Jun 21 09:16:08 2018
@@ -686,7 +686,7 @@ should be completed:</p>
 </section>
 
 <section name="FAQ">
-<p>Please see <a href="http://wiki.apache.org/tomcat/FAQ/Clustering";>the 
clustering section of the FAQ</a>.</p>
+<p>Please see <a href="https://wiki.apache.org/tomcat/FAQ/Clustering";>the 
clustering section of the FAQ</a>.</p>
 </section>
 
 </body>

Modified: tomcat/trunk/webapps/docs/comments.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/comments.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/comments.xml (original)
+++ tomcat/trunk/webapps/docs/comments.xml Thu Jun 21 09:16:08 2018
@@ -45,7 +45,7 @@ this service to the community as long as
 <p>The comments are not for general Q&amp;A.
 Comments should be pointed towards suggestions on improving the documentation
 or server. Questions on how to use Apache Tomcat should be directed
-to our <a href="http://tomcat.apache.org/lists.html";>mailing lists</a>.</p>
+to our <a href="https://tomcat.apache.org/lists.html";>mailing lists</a>.</p>
 
 <p>Comments may be removed by moderators if they are either
 implemented or considered invalid/off-topic.</p>
@@ -59,7 +59,7 @@ need approval by a moderator before the
 <section name="License">
 
 <p>Any submitted comments must be contributed under the terms of the
-<a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0</a>.</p>
+<a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0</a>.</p>
 
 </section>
 
@@ -70,7 +70,7 @@ and may post comments with links in them
 by a moderator before the comments are shown. Being a verified user
 in itself does not give you moderating rights. If you are interested
 in becoming a verified user, please contact us on the
-<a href="http://tomcat.apache.org/lists.html#tomcat-users";>users mailing 
list</a>.</p>
+<a href="https://tomcat.apache.org/lists.html#tomcat-users";>users mailing 
list</a>.</p>
 
 <p>All ASF committers are automatically verified users.</p>
 
@@ -92,7 +92,7 @@ options attached to each comment.</p>
 
 <p>If you are a long time follower of the Apache Tomcat projects
 and you are interested in becoming a moderator, please contact us on the
-<a href="http://tomcat.apache.org/lists.html#tomcat-users";>users mailing 
list</a>.</p>
+<a href="https://tomcat.apache.org/lists.html#tomcat-users";>users mailing 
list</a>.</p>
 
 </section>
 

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Jun 21 09:16:08 2018
@@ -51,11 +51,11 @@
   <p>The native connectors supported with this Tomcat release are:</p>
     <ul>
       <li>JK 1.2.x with any of the supported servers. See
-      <a href="http://tomcat.apache.org/connectors-doc/";>the JK docs</a>
+      <a href="https://tomcat.apache.org/connectors-doc/";>the JK docs</a>
       for details.</li>
       <li>mod_proxy on Apache httpd 2.x (included by default in Apache HTTP
       Server 2.2), with AJP enabled: see
-      <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy_ajp.html";>the
+      <a href="https://httpd.apache.org/docs/2.2/mod/mod_proxy_ajp.html";>the
       httpd docs</a> for details.</li>
     </ul>
 

Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Thu Jun 21 09:16:08 2018
@@ -50,7 +50,7 @@
   unpacked contents, as described in the Servlet Specification (version
   2.2 or later).  For more information about web application archives,
   you can download the
-  <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+  <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
   Specification</a>, and review the Tomcat
   <a href="../appdev/index.html">Application Developer's Guide</a>.</p>
 
@@ -707,7 +707,7 @@
 
         <p>Please note that setting this to <code>true</code> has some side
         effects, including the disabling of JSP reloading in a running server:
-        see <a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=37668";>
+        see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=37668";>
         Bugzilla 37668</a>.</p>
 
         <p>Please note that setting this flag to true in applications that are
@@ -1315,7 +1315,7 @@
     <p>Shared Data Source Example:</p>
     <p><strong>Warning:</strong> This feature works only if the global 
DataSource
 supports <code>getConnection(username, password)</code> method.
-<a href="http://commons.apache.org/dbcp/";>Apache Commons DBCP</a> pool that
+<a href="https://commons.apache.org/dbcp/";>Apache Commons DBCP</a> pool that
 Tomcat uses by default does not support it. See its Javadoc for
 <code>BasicDataSource</code> class.
 <a href="../jdbc-pool.html">Apache Tomcat JDBC pool</a> does support it,

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Thu Jun 21 09:16:08 2018
@@ -99,7 +99,7 @@
 <section name="CORS Filter">
   <subsection name="Introduction">
     <p>This filter is an implementation of W3C's CORS (Cross-Origin Resource
-    Sharing) <a href="http://www.w3.org/TR/cors/";>specification</a>, which is a
+    Sharing) <a href="https://www.w3.org/TR/cors/";>specification</a>, which is 
a
     mechanism that enables cross-origin requests.</p>
     <p>The filter works by adding required <code>Access-Control-*</code> 
headers
     to HttpServletResponse object. The filter also protects against HTTP
@@ -125,11 +125,11 @@
     <p>The CORS Filter supports following initialisation parameters:</p>
     <attributes>
       <attribute name="cors.allowed.origins" required="false">
-        <p>A list of <a href="http://tools.ietf.org/html/rfc6454";>origins</a>
+        <p>A list of <a href="https://tools.ietf.org/html/rfc6454";>origins</a>
         that are allowed to access the resource. A <code>*</code> can be
         specified to enable access to resource from any origin. Otherwise, a
         whitelist of comma separated origins can be provided. Eg: <code>
-        http://www.w3.org, https://www.apache.org</code>.
+        https://www.w3.org, https://www.apache.org</code>.
         <strong>Defaults:</strong> The empty String. (No origin is allowed to
         access the resource).</p>
       </attribute>
@@ -471,7 +471,7 @@ HTTP/1.1 200 OK
 
     <p>
     ExpiresFilter is a Java Servlet API port of <a
-    href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
+    href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html";>Apache
     mod_expires</a>.
     This filter controls the setting of the <code>Expires</code> HTTP header 
and the
     <code>max-age</code> directive of the <code>Cache-Control</code> HTTP 
header in
@@ -488,9 +488,9 @@ HTTP/1.1 200 OK
     </p>
     <p>
     To modify <code>Cache-Control</code> directives other than 
<code>max-age</code> (see
-    <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9"; 
>RFC
+    <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9"; 
>RFC
     2616 section 14.9</a>), you can use other servlet filters or <a
-    href="http://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
+    href="https://httpd.apache.org/docs/2.2/mod/mod_headers.html"; >Apache Httpd
     mod_headers</a> module.
     </p>
 
@@ -882,7 +882,7 @@ FINE: Request "/docs/config/manager.html
         <p>Will an HTTP Strict Transport Security (HSTS) header
         (<code>Strict-Transport-Security</code>) be set on the response for
         secure requests. Any HSTS header already present will be replaced. See
-        <a href="http://tools.ietf.org/html/rfc6797";>RFC 6797</a> for further
+        <a href="https://tools.ietf.org/html/rfc6797";>RFC 6797</a> for further
         details of HSTS. If not specified, the default value of
         <code>true</code> will be used.</p>
       </attribute>
@@ -1208,7 +1208,7 @@ FINE: Request "/docs/config/manager.html
   <subsection name="Introduction">
 
     <p>Tomcat port of
-    <a 
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
+    <a 
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
     this filter replaces the apparent client remote IP address and hostname for
     the request with the IP address list presented by a proxy or a load 
balancer
     via a request headers (e.g. &quot;X-Forwarded-For&quot;).</p>

Modified: tomcat/trunk/webapps/docs/config/jaspic.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/jaspic.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/jaspic.xml (original)
+++ tomcat/trunk/webapps/docs/config/jaspic.xml Thu Jun 21 09:16:08 2018
@@ -158,9 +158,9 @@
 
     <p>A sample configuration for using this module with Tomcat would look like
     this:</p>
-<source><![CDATA[<jaspic-providers xmlns="http://tomcat.apache.org/xml";
+<source><![CDATA[<jaspic-providers xmlns="https://tomcat.apache.org/xml";
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-                  xsi:schemaLocation="http://tomcat.apache.org/xml 
jaspic-providers.xsd"
+                  xsi:schemaLocation="https://tomcat.apache.org/xml 
jaspic-providers.xsd"
                   version="1.0">
   <provider name="google-oauth"
             
className="org.apache.catalina.authenticator.jaspic.SimpleAuthConfigProvider"

Modified: tomcat/trunk/webapps/docs/config/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/trunk/webapps/docs/config/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat 9 Configuration Reference"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
   <title>Apache Tomcat 9 Configuration Reference</title>
 
@@ -30,7 +30,7 @@
     <menu name="Links">
         <item name="Docs Home"             href="../index.html"/>
         <item name="Config Ref. Home"      href="index.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 

Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Thu Jun 21 09:16:08 2018
@@ -882,7 +882,7 @@
 
     <p>JAASRealm is prototype for Tomcat of the JAAS-based J2EE authentication
     framework for J2EE v1.4, based on the <a
-    href="http://www.jcp.org/en/jsr/detail?id=196";>JCP Specification Request
+    href="https://www.jcp.org/en/jsr/detail?id=196";>JCP Specification Request
     196</a> to enhance container-managed security and promote 'pluggable'
     authentication mechanisms whose implementations would be
     container-independent.</p>

Modified: tomcat/trunk/webapps/docs/config/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/server.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/server.xml (original)
+++ tomcat/trunk/webapps/docs/config/server.xml Thu Jun 21 09:16:08 2018
@@ -68,7 +68,7 @@
       <p>The TCP/IP port number on which this server waits for a shutdown
       command. Set to <code>-1</code> to disable the shutdown port.</p>
       <p>Note: Disabling the shutdown port works well when Tomcat is started
-      using <a href="http://commons.apache.org/daemon/";>Apache Commons 
Daemon</a>
+      using <a href="https://commons.apache.org/daemon/";>Apache Commons 
Daemon</a>
       (running as a service on Windows or with jsvc on un*xes). It cannot be
       used when running Tomcat with the standard shell scripts though, as it
       will prevent shutdown.bat|.sh and catalina.bat|.sh from stopping it

Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Jun 21 09:16:08 2018
@@ -580,7 +580,7 @@
       <code>javax.sql.DataSource</code>. If not specified the default of
       <code>org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory</code> is used
       which is a package renamed (to avoid conflicts) copy of
-      <a href="http://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p>
+      <a href="https://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p>
     </property>
 
     <property name="javax.mail.Session.Factory">

Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Thu Jun 21 09:16:08 2018
@@ -322,7 +322,7 @@
     headers, cookies, session or request attributes and special
     timestamp formats.
     It is modeled after the
-    <a href="http://httpd.apache.org/";>Apache HTTP Server</a> log configuration
+    <a href="https://httpd.apache.org/";>Apache HTTP Server</a> log 
configuration
     syntax. Each of them can be used multiple times with different 
<code>xxx</code> keys:
     </p>
     <ul>
@@ -373,7 +373,7 @@
     <a href="#Proxies_Support">Proxies Support</a> and the
     <a href="../proxy-howto.html">Proxy How-To</a>. For reverse proxies that
     use mod_jk, see the <a
-    
href="http://tomcat.apache.org/connectors-doc/generic_howto/proxy.html";>generic
+    
href="https://tomcat.apache.org/connectors-doc/generic_howto/proxy.html";>generic
     proxy</a> documentation. For other reverse proxies, consult their
     documentation.</p>
   </subsection>
@@ -392,7 +392,7 @@
     difference to the standard <code>AccessLogValve</code> is that
     <code>ExtendedAccessLogValve</code> creates log files which
     conform to the Working Draft for the
-    <a href="http://www.w3.org/TR/WD-logfile.html";>Extended Log File Format</a>
+    <a href="https://www.w3.org/TR/WD-logfile.html";>Extended Log File 
Format</a>
     defined by the W3C.</p>
 
   </subsection>
@@ -426,7 +426,7 @@
     <code>cs</code> for "client to server", <code>sc</code> for
     "server to client" or <code>x</code> for "application specific".
     Furthermore some tokens are completed by an additional selector.
-    See the <a href="http://www.w3.org/TR/WD-logfile.html";>W3C 
specification</a>
+    See the <a href="https://www.w3.org/TR/WD-logfile.html";>W3C 
specification</a>
     for more information about the format.</p>
 
     <p>The following format tokens are supported:</p>
@@ -898,7 +898,7 @@
   <subsection name="Introduction">
 
     <p>Tomcat port of
-    <a 
href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
+    <a 
href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip</a>,
     this valve replaces the apparent client remote IP address and hostname for
     the request with the IP address list presented by a proxy or a load 
balancer
     via a request headers (e.g. &quot;X-Forwarded-For&quot;).</p>

Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Thu Jun 21 09:16:08 2018
@@ -62,7 +62,7 @@
             There are a number of ways to perform deployment that rely on
             the Manager web application. Apache Tomcat provides tasks
             for Apache Ant build tool.
-            <a href="http://tomcat.apache.org/maven-plugin.html";>Apache Tomcat 
Maven Plugin</a>
+            <a href="https://tomcat.apache.org/maven-plugin.html";>Apache 
Tomcat Maven Plugin</a>
             project provides integration with Apache Maven.
             There is also a tool called the Client Deployer, which can be
             used from a command line and provides additional functionality

Modified: tomcat/trunk/webapps/docs/developers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/developers.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/developers.xml (original)
+++ tomcat/trunk/webapps/docs/developers.xml Thu Jun 21 09:16:08 2018
@@ -40,7 +40,7 @@
       tomcat-users mailing list instead, or one of the other support
       resources; some organizations and individual consultants also offer
       for pay Tomcat support, as listed on the
-      <a href="http://wiki.apache.org/tomcat/SupportAndTraining";>support and
+      <a href="https://wiki.apache.org/tomcat/SupportAndTraining";>support and
       training</a> page on the Tomcat Wiki).
     </p>
 

Modified: tomcat/trunk/webapps/docs/elapi/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/elapi/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/elapi/index.html (original)
+++ tomcat/trunk/webapps/docs/elapi/index.html Thu Jun 21 09:16:08 2018
@@ -27,7 +27,7 @@ The EL Javadoc is not installed by defau
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
 documentation bundle</a>.
 
 </body>

Modified: tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/fs-admin-apps.xml Thu Jun 21 09:16:08 
2018
@@ -180,12 +180,12 @@
     <ul>
     <li><a 
href="http://www.oracle.com/technetwork/java/javase/overview/index.html";>
         Java Standard Edition</a> (Version 1.2 or later)</li>
-    <li><a href="http://www.jcp.org/jsr/detail/154.jsp";>Servlet 2.4</a>
+    <li><a href="https://www.jcp.org/jsr/detail/154.jsp";>Servlet 2.4</a>
         (supported natively by Tomcat 5)</li>
-    <li><a href="http://www.jcp.org/jsr/detail/152.jsp";>JavaServer Pages 
2.0</a>
+    <li><a href="https://www.jcp.org/jsr/detail/152.jsp";>JavaServer Pages 
2.0</a>
         (supported natively by Tomcat 5)</li>
-    <li><a 
href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>JavaServer 
Pages Standard Tag Library 1.0 (Jakarta Taglibs-Standard 1.0.3)</a></li>
-    <li><a href="http://struts.apache.org/";>Struts Framework</a>
+    <li><a 
href="https://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>JavaServer
 Pages Standard Tag Library 1.0 (Jakarta Taglibs-Standard 1.0.3)</a></li>
+    <li><a href="https://struts.apache.org/";>Struts Framework</a>
         (Version 1.0) - MVC Framework for Web Applications</li>
     <li><strong>TO BE DETERMINED</strong> - Application for hosting SOAP
         based web services</li>

Modified: tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/fs-default.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/fs-default.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/fs-default.xml Thu Jun 21 09:16:08 2018
@@ -51,11 +51,11 @@
     <p>The following external specifications have provisions which
     partially define the correct behavior of the default servlet:</p>
     <ul>
-    <li><a 
href="http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html";>
+    <li><a 
href="https://jcp.org/aboutJava/communityprocess/final/jsr340/index.html";>
         Servlet Specification</a> (Version 4.0)</li>
-    <li><a href="http://www.rfc-editor.org/rfc/rfc2046.txt";>Multipurpose
+    <li><a href="https://www.rfc-editor.org/rfc/rfc2046.txt";>Multipurpose
         Internet Mail Extensions (MIME) Part Two: Media Types</a></li>
-    <li><a href="http://www.rfc-editor.org/rfc/rfc2616.txt";>Hypertext
+    <li><a href="https://www.rfc-editor.org/rfc/rfc2616.txt";>Hypertext
         Transfer Protocol &#x2013; HTTP/1.1</a></li>
     </ul>
 

Modified: tomcat/trunk/webapps/docs/funcspecs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/project.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Catalina Functional Specifications"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
     <title>Catalina Functional Specifications</title>
 
@@ -29,7 +29,7 @@
     <menu name="Links">
         <item name="Docs Home"             href="../index.html"/>
         <item name="Functional Specs"      href="index.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 

Modified: tomcat/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Thu Jun 21 09:16:08 2018
@@ -36,8 +36,8 @@
 <p>This is the top-level entry point of the documentation bundle for the
 <strong>Apache Tomcat</strong> Servlet/JSP container.  Apache Tomcat version
 <version-major-minor/> implements the Servlet 4.0 and JavaServer Pages 2.3
-<a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a> from 
the
-<a href="http://www.jcp.org";>Java Community Process</a>, and includes many
+<a href="https://wiki.apache.org/tomcat/Specifications";>specifications</a> 
from the
+<a href="https://www.jcp.org";>Java Community Process</a>, and includes many
 additional features that make it a useful platform for developing and deploying
 web applications and web services.</p>
 
@@ -160,7 +160,7 @@ are responsible for installing, configur
     - Reference manual that documents all available elements and attributes
       that may be placed into the Apache Tomcat <code>conf/server.xml</code> 
file.
     </li>
-<li><a href="http://tomcat.apache.org/connectors-doc/index.html";><strong>JK 
Documentation</strong></a>
+<li><a href="https://tomcat.apache.org/connectors-doc/index.html";><strong>JK 
Documentation</strong></a>
     - Complete documentation and HOWTOs on the JK native webserver connector,
       used to interface Apache Tomcat with servers like Apache HTTPd, IIS
       and others.</li>
@@ -174,13 +174,13 @@ are responsible for installing, configur
 -->
     </li>
 <li>JSP 2.3
-    <a 
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>
+    <a 
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>
     <strong>Specification</strong></a> and
     <a 
href="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/package-summary.html";>
     <strong>Javadoc</strong></a>
     </li>
 <li>EL 3.0
-    <a 
href="http://jcp.org/aboutJava/communityprocess/final/jsr341/index.html";>
+    <a 
href="https://jcp.org/aboutJava/communityprocess/final/jsr341/index.html";>
     <strong>Specification</strong></a> and
     <a 
href="http://docs.oracle.com/javaee/7/api/javax/el/package-summary.html";>
     <strong>Javadoc</strong></a>
@@ -215,7 +215,7 @@ the development of the <em>Apache Tomcat
 <li><a href="changelog.html"><strong>Changelog</strong></a> - Details the
     changes made to Apache Tomcat.
     </li>
-<li><a 
href="http://wiki.apache.org/tomcat/TomcatVersions";><strong>Status</strong></a> 
-
+<li><a 
href="https://wiki.apache.org/tomcat/TomcatVersions";><strong>Status</strong></a>
 -
     Apache Tomcat development status.
     </li>
 <li><a href="developers.html"><strong>Developers</strong></a> - List of active

Modified: tomcat/trunk/webapps/docs/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Thu Jun 21 09:16:08 2018
@@ -48,7 +48,7 @@ help.</p>
 
 <p>In the course of reading these documents, you will run across a number of
 terms; some specific to Tomcat, and others defined by the
-<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet and
+<a href="https://wiki.apache.org/tomcat/Specifications";>Servlet and
 JSP specifications</a>.</p>
 
 <ul>
@@ -118,21 +118,21 @@ only to earlier versions.</p>
     to fully read the relevant documentation as it will save you much time
     and effort. There's nothing like scouring the web only to find out that
     the answer was right in front of you all along!</li>
-<li><a href="http://wiki.apache.org/tomcat/FAQ";>Tomcat FAQ</a></li>
-<li><a href="http://wiki.apache.org/tomcat/";>Tomcat WIKI</a></li>
+<li><a href="https://wiki.apache.org/tomcat/FAQ";>Tomcat FAQ</a></li>
+<li><a href="https://wiki.apache.org/tomcat/";>Tomcat WIKI</a></li>
 <li>Tomcat FAQ at <a 
href="http://www.jguru.com/faq/home.jsp?topic=Tomcat";>jGuru</a></li>
 <li>Tomcat mailing list archives - numerous sites archive the Tomcat mailing
     lists. Since the links change over time, clicking here will search
-    <a 
href="http://www.google.com/search?q=tomcat+mailing+list+archives";>Google</a>.
+    <a 
href="https://www.google.com/search?q=tomcat+mailing+list+archives";>Google</a>.
     </li>
 <li>The TOMCAT-USER mailing list, which you can subscribe to
-    <a href="http://tomcat.apache.org/lists.html";>here</a>. If you don't
+    <a href="https://tomcat.apache.org/lists.html";>here</a>. If you don't
     get a reply, then there's a good chance that your question was probably
     answered in the list archives or one of the FAQs.  Although questions
     about web application development in general are sometimes asked and
     answered, please focus your questions on Tomcat-specific issues.</li>
 <li>The TOMCAT-DEV mailing list, which you can subscribe to
-    <a href="http://tomcat.apache.org/lists.html";>here</a>.  This list is
+    <a href="https://tomcat.apache.org/lists.html";>here</a>.  This list is
     <strong>reserved</strong> for discussions about the development of Tomcat
     itself.  Questions about Tomcat configuration, and the problems you run
     into while developing and running applications, will normally be more

Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Thu Jun 21 09:16:08 2018
@@ -37,7 +37,7 @@
 <section name="Introduction">
 
 <p>Tomcat <version-major-minor/> uses the Jasper 2 JSP Engine to implement
-the <a href="http://wiki.apache.org/tomcat/Specifications";>JavaServer Pages 
2.3</a>
+the <a href="https://wiki.apache.org/tomcat/Specifications";>JavaServer Pages 
2.3</a>
 specification.</p>
 
 <p>Jasper 2 has been redesigned to significantly improve performance over
@@ -98,7 +98,7 @@ classpath is created dynamically based o
 <li><strong>compiler</strong> - Which compiler Ant should use to compile JSP
 pages. The valid values for this are the same as for the compiler attribute of
 Ant&apos;s
-<a 
href="http://ant.apache.org/manual/Tasks/javac.html#compilervalues";>javac</a>
+<a 
href="https://ant.apache.org/manual/Tasks/javac.html#compilervalues";>javac</a>
 task. If the value is not set, then the default Eclipse JDT Java compiler will
 be used instead of using Ant. There is no default value. If this attribute is
 set then <code>setenv.[sh|bat]</code> should be used to add

Modified: tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml Thu Jun 21 
09:16:08 2018
@@ -56,7 +56,7 @@ Tomcat 7.x and Tomcat 8.x as they are us
 Apache Commons DBCP library.</b>  You will most likely need to modify older
 JNDI resource configurations to match the syntax in the example below in order
 to make them work in Tomcat <version-major/>.
-See <a href="http://tomcat.apache.org/migration.html";>Tomcat Migration 
Guide</a>
+See <a href="https://tomcat.apache.org/migration.html";>Tomcat Migration 
Guide</a>
 for details.
 </p>
 
@@ -113,7 +113,7 @@ a <code>ServletContextListener</code>.
 
 <p>The default database connection pool implementation in Apache Tomcat
 relies on the libraries from the
-<a href="http://commons.apache.org/";>Apache Commons</a> project.
+<a href="https://commons.apache.org/";>Apache Commons</a> project.
 The following libraries are used:
 </p>
 
@@ -133,7 +133,7 @@ packages have been renamed to avoid inte
 
 <subsection name="Installation">
 
-<p>See the <a href="http://commons.apache.org/dbcp/configuration.html";>
+<p>See the <a href="https://commons.apache.org/dbcp/configuration.html";>
 DBCP documentation</a> for a complete list of configuration parameters.
 </p>
 
@@ -172,7 +172,7 @@ removed and recycled, add one or both of
 <code>removeAbandonedOnMaintenance</code> has no effect unless pool
 maintenance is enabled by setting <code>timeBetweenEvictionRunsMillis</code>
 to a positive value.  See the
-<a href="http://commons.apache.org/dbcp/configuration.html";>
+<a href="https://commons.apache.org/dbcp/configuration.html";>
 DBCP documentation</a> for full documentation on these attributes.
 </p>
 
@@ -202,12 +202,12 @@ The default is <code>false</code>.
 <subsection name="MySQL DBCP Example">
 
 <h5>0. Introduction</h5>
-<p>Versions of <a 
href="http://www.mysql.com/products/mysql/index.html";>MySQL</a> and JDBC
+<p>Versions of <a 
href="https://www.mysql.com/products/mysql/index.html";>MySQL</a> and JDBC
 drivers that have been reported to work:
 </p>
 <ul>
 <li>MySQL 3.23.47, MySQL 3.23.47 using InnoDB,, MySQL 3.23.58,  MySQL 
4.0.1alpha</li>
-<li><a href="http://www.mysql.com/products/connector-j";>Connector/J</a> 
3.0.11-stable (the official JDBC Driver)</li>
+<li><a href="https://www.mysql.com/products/connector-j";>Connector/J</a> 
3.0.11-stable (the official JDBC Driver)</li>
 <li><a href="http://mmmysql.sourceforge.net";>mm.mysql</a> 2.0.14 (an old 3rd 
party JDBC Driver)</li>
 </ul>
 
@@ -333,7 +333,7 @@ select id, foo, bar from testdata
 <p>That JSP page makes use of
 <a 
href="http://www.oracle.com/technetwork/java/index-jsp-135995.html";>JSTL</a>'s
 SQL and Core taglibs. You can get it from
-<a href="http://tomcat.apache.org/taglibs/standard/";>Apache Tomcat Taglibs - 
Standard Tag Library</a>
+<a href="https://tomcat.apache.org/taglibs/standard/";>Apache Tomcat Taglibs - 
Standard Tag Library</a>
 project &#x2014; just make sure you get a 1.1.x or later release. Once you have
 JSTL, copy <code>jstl.jar</code> and <code>standard.jar</code> to your web 
app's
 <code>WEB-INF/lib</code> directory.

Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Thu Jun 21 09:16:08 2018
@@ -290,7 +290,7 @@ public class MyBean {
     <p><strong>WARNING</strong> - Be sure you respect the element ordering
     that is required by the DTD for web application deployment descriptors!
     See the
-    <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+    <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
     Specification</a> for details.</p>
 
   <h5>3.  Code Your Application's Use Of This Resource</h5>
@@ -540,7 +540,7 @@ public class MyBean2 {
     <p><strong>WARNING</strong> - Be sure you respect the element ordering
     that is required by the DTD for web application deployment descriptors!
     See the
-    <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+    <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
     Specification</a> for details.</p>
 
     <h5>2.  Code Your Application's Use Of This Resource</h5>
@@ -664,7 +664,7 @@ Transport.send(message);]]></source>
 
     <p><strong>NOTE</strong> - The default data source support in Tomcat
     is based on the <strong>DBCP</strong> connection pool from the
-    <a href="http://commons.apache.org/";>Commons</a>
+    <a href="https://commons.apache.org/";>Commons</a>
     project.  However, it is possible to use any other connection pool
     that implements <code>javax.sql.DataSource</code>, by writing your
     own custom resource factory, as described
@@ -709,7 +709,7 @@ Transport.send(message);]]></source>
     <p><strong>WARNING</strong> - Be sure you respect the element ordering
     that is required by the DTD for web application deployment descriptors!
     See the
-    <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+    <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
     Specification</a> for details.</p>
 
     <h5>3.  Code Your Application's Use Of This Resource</h5>
@@ -1005,7 +1005,7 @@ public class MyBeanFactory implements Ob
     <p><strong>WARNING</strong> - Be sure you respect the element ordering
     that is required by the DTD for web application deployment descriptors!
     See the
-    <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+    <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
     Specification</a> for details.</p>
 
   <h4>3.  Code Your Application's Use Of This Resource</h4>

Modified: tomcat/trunk/webapps/docs/jspapi/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jspapi/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jspapi/index.html (original)
+++ tomcat/trunk/webapps/docs/jspapi/index.html Thu Jun 21 09:16:08 2018
@@ -27,7 +27,7 @@ The JSP Javadoc is not installed by defa
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
 documentation bundle</a>.
 
 </body>

Modified: tomcat/trunk/webapps/docs/logging.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Thu Jun 21 09:16:08 2018
@@ -37,7 +37,7 @@
   <section name="Introduction">
     <p>
       The internal logging for Apache Tomcat uses JULI, a packaged renamed fork
-      of <a href="http://commons.apache.org/logging";>Apache Commons Logging</a>
+      of <a href="https://commons.apache.org/logging";>Apache Commons 
Logging</a>
       that is hard-coded to use the <code>java.util.logging</code> framework.
       This ensures that Tomcat&apos;s internal logging and any web application
       logging will remain independent, even if a web application uses Apache

Modified: tomcat/trunk/webapps/docs/manager-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/manager-howto.xml Thu Jun 21 09:16:08 2018
@@ -1202,7 +1202,7 @@ for the <em>Ant</em> (version 1.4 or lat
 commands, you must perform the following setup operations:</p>
 <ul>
 <li>Download the binary distribution of Ant from
-    <a href="http://ant.apache.org";>http://ant.apache.org</a>.
+    <a href="https://ant.apache.org";>https://ant.apache.org</a>.
     You must use version <strong>1.4</strong> or later.</li>
 <li>Install the Ant distribution in a convenient directory (called
     ANT_HOME in the remainder of these instructions).</li>
@@ -1376,7 +1376,7 @@ in which you can specify
 its full set of attributes, but <code>input</code>, <code>inputstring</code> 
and
 <code>inputencoding</code> that, even if accepted, are not used because they 
have
 no meaning in this context.
-Refer to <a href="http://ant.apache.org";>ant manual</a> for details on
+Refer to <a href="https://ant.apache.org";>ant manual</a> for details on
 <code>&lt;redirector&gt;</code> element attributes.
 </p>
 

Modified: tomcat/trunk/webapps/docs/maven-jars.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/maven-jars.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/maven-jars.xml (original)
+++ tomcat/trunk/webapps/docs/maven-jars.xml Thu Jun 21 09:16:08 2018
@@ -36,8 +36,8 @@
 <section name="Using Tomcat libraries With Maven">
     <subsection name="Tomcat Snapshots">
       Tomcat snapshots are located in the
-      <a 
href="http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/";>Apache
 Snapshot Repository</a>.
-      The official URL is 
<source>http://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/</source>
+      <a 
href="https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/";>Apache
 Snapshot Repository</a>.
+      The official URL is 
<source>https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/</source>
       <p>
         Snapshots are done periodically, not on a regular basis, but when 
changes happen and the Tomcat team deems a new snapshot might
         useful.
@@ -46,10 +46,10 @@
     <subsection name="Tomcat Releases">
       <p>
         Stable releases are published to the
-        <a href="http://repo2.maven.org/maven2/org/apache/tomcat/";>Central
+        <a href="https://repo2.maven.org/maven2/org/apache/tomcat/";>Central
         Maven Repositories</a>. The URL for this is
       </p>
-      <source>http://repo2.maven.org/maven2/org/apache/tomcat/</source>
+      <source>https://repo2.maven.org/maven2/org/apache/tomcat/</source>
     </subsection>
 
 </section>

Modified: tomcat/trunk/webapps/docs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat Documentation"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
     <title>Apache Tomcat 9</title>
 
@@ -29,7 +29,7 @@
 
     <menu name="Links">
         <item name="Docs Home"             href="index.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 
@@ -88,13 +88,13 @@
         <item name="WebSocket 1.1 Javadocs"
               href="websocketapi/index.html"/>
         <item name="JK 1.2 Documentation"
-              href="http://tomcat.apache.org/connectors-doc/"/>
+              href="https://tomcat.apache.org/connectors-doc/"/>
     </menu>
 
     <menu name="Apache Tomcat Development">
         <item name="Building"              href="building.html"/>
         <item name="Changelog"             href="changelog.html"/>
-        <item name="Status"                
href="http://wiki.apache.org/tomcat/TomcatVersions"/>
+        <item name="Status"                
href="https://wiki.apache.org/tomcat/TomcatVersions"/>
         <item name="Developers"            href="developers.html"/>
         <item name="Architecture"          href="architecture/index.html" />
         <item name="Functional Specs."     href="funcspecs/index.html"/>

Modified: tomcat/trunk/webapps/docs/realm-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/realm-howto.xml (original)
+++ tomcat/trunk/webapps/docs/realm-howto.xml Thu Jun 21 09:16:08 2018
@@ -47,7 +47,7 @@ to authenticate themselves.  If you are
 safely skip this document.</p>
 
 <p>For fundamental background information about container managed security,
-see the <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+see the <a href="https://wiki.apache.org/tomcat/Specifications";>Servlet
 Specification (Version 2.4)</a>, Section 12.</p>
 
 <p>For information about utilizing the <em>Single Sign On</em> feature of
@@ -726,7 +726,7 @@ scope of this document, because it is un
 implementation.  In the examples below, we will assume that you are using a
 distribution of the OpenLDAP directory server (version 2.0.11 or later), which
 can be downloaded from
-<a href="http://www.openldap.org";>http://www.openldap.org</a>.  Assume that
+<a href="https://www.openldap.org";>https://www.openldap.org</a>.  Assume that
 your <code>slapd.conf</code> file contains the following settings
 (among others):</p>
 <source>database ldbm
@@ -1032,7 +1032,7 @@ provided as part of the standard Java SE
 practically any conceivable security realm with Tomcat's CMA. </p>
         <p>JAASRealm is prototype for Tomcat of the JAAS-based
 J2EE authentication framework for J2EE v1.4, based on the <a
- href="http://www.jcp.org/en/jsr/detail?id=196";>JCP Specification
+ href="https://www.jcp.org/en/jsr/detail?id=196";>JCP Specification
 Request 196</a> to enhance container-managed security and promote
 'pluggable' authentication mechanisms whose implementations would be
 container-independent.

Modified: tomcat/trunk/webapps/docs/servletapi/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/servletapi/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/servletapi/index.html (original)
+++ tomcat/trunk/webapps/docs/servletapi/index.html Thu Jun 21 09:16:08 2018
@@ -27,7 +27,7 @@ The Servlet Javadoc is not installed by
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
 documentation bundle</a>.
 
 </body>

Modified: tomcat/trunk/webapps/docs/ssi-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssi-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/ssi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/ssi-howto.xml Thu Jun 21 09:16:08 2018
@@ -46,7 +46,7 @@ HTTP server and you require SSI support.
 during development when you don't want to run a web server like Apache.</p>
 
 <p>Tomcat SSI support implements the same SSI directives as Apache.  See the
-<a href="http://httpd.apache.org/docs/howto/ssi.html#basicssidirectives";>
+<a href="https://httpd.apache.org/docs/howto/ssi.html#basicssidirectives";>
 Apache Introduction to SSI</a> for information on using SSI directives.</p>
 
 <p>SSI support is available as a servlet and as a filter. You should use one
@@ -190,7 +190,7 @@ is used to assign a value to a user-defi
 </ul>
 <p>
 See the
-<a href="http://httpd.apache.org/docs/howto/ssi.html#basicssidirectives";>
+<a href="https://httpd.apache.org/docs/howto/ssi.html#basicssidirectives";>
 Apache Introduction to SSI</a> for more information on using SSI 
directives.</p>
 </section>
 

Modified: tomcat/trunk/webapps/docs/ssl-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/trunk/webapps/docs/ssl-howto.xml Thu Jun 21 09:16:08 2018
@@ -183,7 +183,7 @@ keystore using OpenSSL you would execute
                        -out mycert.p12 -name tomcat -CAfile myCA.crt
                        -caname root -chain</source>
 <p>For more advanced cases, consult the
-<a href="http://www.openssl.org/"; rel="nofollow">OpenSSL documentation</a>.</p>
+<a href="https://www.openssl.org/"; rel="nofollow">OpenSSL 
documentation</a>.</p>
 
 <p>To create a new <code>JKS</code> keystore from scratch, containing a single
 self-signed Certificate, execute the following from a terminal command 
line:</p>
@@ -608,7 +608,7 @@ SSL communications, and what to do about
 <strong>TOMCAT-USER</strong> mailing list.  You can find pointers to archives
 of previous messages on this list, as well as subscription and unsubscription
 information, at
-<a 
href="http://tomcat.apache.org/lists.html";>http://tomcat.apache.org/lists.html</a>.</p>
+<a 
href="https://tomcat.apache.org/lists.html";>https://tomcat.apache.org/lists.html</a>.</p>
 
 </section>
 
@@ -671,7 +671,7 @@ public class SessionTrackingModeListener
   <source><![CDATA[String sslID = 
(String)request.getAttribute("javax.servlet.request.ssl_session_id");]]></source>
 <p>
 For additional discussion on this area, please see
-<a href="http://bz.apache.org/bugzilla/show_bug.cgi?id=22679";>Bugzilla</a>.
+<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=22679";>Bugzilla</a>.
 </p>
 
   <p>To terminate an SSL session, use:</p>

Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Thu Jun 21 09:16:08 2018
@@ -31,7 +31,7 @@
 
   <!-- Defined parameters (overrideable) -->
   <xsl:param    name="home-name"           select="'The Tomcat Project'"/>
-  <xsl:param    name="home-href"           
select="'http://tomcat.apache.org/'"/>
+  <xsl:param    name="home-href"           
select="'https://tomcat.apache.org/'"/>
   <xsl:param    name="home-logo"           select="'/images/tomcat.png'"/>
   <xsl:param    name="home-stylesheet"     
select="'/images/docs-stylesheet.css'"/>
   <xsl:param    name="apache-logo"         select="'/images/asf-logo.svg'"/>
@@ -43,11 +43,11 @@
   <xsl:param    name="build-date"          select="'MMM d yyyy'"/>
   <xsl:param    name="build-date-iso-8601" select="'yyyy-MM-dd'"/>
   <xsl:param    name="year"                select="'yyyy'"/>
-  <xsl:param    name="buglink"             
select="'http://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
-  <xsl:param    name="revlink"             
select="'http://svn.apache.org/viewvc?view=rev&amp;rev='"/>
-  <xsl:param    name="doclink"             
select="'http://tomcat.apache.org/tomcat-9.0-doc'"/>
-  <xsl:param    name="sylink"              
select="'http://tomcat.apache.org/security-9.html'"/>
-  <xsl:param    name="dllink"              
select="'http://tomcat.apache.org/download-90.cgi'"/>
+  <xsl:param    name="buglink"             
select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
+  <xsl:param    name="revlink"             
select="'https://svn.apache.org/viewvc?view=rev&amp;rev='"/>
+  <xsl:param    name="doclink"             
select="'https://tomcat.apache.org/tomcat-9.0-doc'"/>
+  <xsl:param    name="sylink"              
select="'https://tomcat.apache.org/security-9.html'"/>
+  <xsl:param    name="dllink"              
select="'https://tomcat.apache.org/download-90.cgi'"/>
   <xsl:param    name="sitedir"             select="''"/>
   <xsl:param    name="filename"            select="'-'"/>
 
@@ -115,7 +115,7 @@
       document.addEventListener("DOMContentLoaded", (function() {
         var commentsDiv = document.getElementById("comments_thread");
         var commentsShortname = "tomcat";
-        var commentsIdentifier = "http://tomcat.apache.org/"; +
+        var commentsIdentifier = "https://tomcat.apache.org/"; +
           thisScript.getAttribute("data-comments-identifier") + ".html";
 
         (function(w, d) {
@@ -157,7 +157,7 @@
           <xsl:value-of select="$relative-path"/><xsl:value-of 
select="$apache-logo"/>
         </xsl:variable>
         <div class="asfLogo noPrint">
-          <a href="http://www.apache.org/"; target="_blank"><img src="{$src}" 
alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a>
+          <a href="https://www.apache.org/"; target="_blank"><img src="{$src}" 
alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a>
         </div>
         <h1><xsl:value-of select="$project/title"/></h1>
         <div class="versionInfo">
@@ -198,9 +198,9 @@
                     <strong>Notice: </strong>This comments section collects 
your suggestions
                     on improving documentation for Apache Tomcat.<br/><br/>
                     If you have trouble and need help, read
-                    <a href="http://tomcat.apache.org/findhelp.html";>Find 
Help</a> page
+                    <a href="https://tomcat.apache.org/findhelp.html";>Find 
Help</a> page
                     and ask your question on the tomcat-users
-                    <a href="http://tomcat.apache.org/lists.html";>mailing 
list</a>.
+                    <a href="https://tomcat.apache.org/lists.html";>mailing 
list</a>.
                     Do not ask such questions here. This is not a Q&amp;A 
section.<br/><br/>
                     The Apache Comments System is explained <a 
href="{$commentslink}">here</a>.
                     Comments may be removed by our moderators if they are 
either

Modified: tomcat/trunk/webapps/docs/tribes/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tribes/project.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/tribes/project.xml (original)
+++ tomcat/trunk/webapps/docs/tribes/project.xml Thu Jun 21 09:16:08 2018
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <project name="Apache Tribes Documentation - Top Level Directory"
-        href="http://tomcat.apache.org/";>
+        href="https://tomcat.apache.org/";>
 
     <title>Apache Tribes - The Tomcat Cluster Communication Module</title>
 
@@ -28,7 +28,7 @@
     <menu name="Links">
         <item name="Docs Home"             href="../index.html"/>
         <item name="Tribes Docs Home"      href="introduction.html"/>
-        <item name="FAQ"                   
href="http://wiki.apache.org/tomcat/FAQ"; />
+        <item name="FAQ"                   
href="https://wiki.apache.org/tomcat/FAQ"; />
         <item name="User Comments"         href="#comments_section"/>
     </menu>
 

Modified: tomcat/trunk/webapps/docs/web-socket-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/trunk/webapps/docs/web-socket-howto.xml Thu Jun 21 09:16:08 2018
@@ -34,18 +34,18 @@
 
 <section name="Overview">
 <p>Tomcat provides support for WebSocket as defined by
-   <a href="http://tools.ietf.org/html/rfc6455";>RFC 6455</a>.</p>
+   <a href="https://tools.ietf.org/html/rfc6455";>RFC 6455</a>.</p>
 </section>
 
 <section name="Application development">
 <p>Tomcat implements the Java WebSocket 1.1 API defined by <a
-   href="http://www.jcp.org/en/jsr/detail?id=356";>JSR-356</a>.</p>
+   href="https://www.jcp.org/en/jsr/detail?id=356";>JSR-356</a>.</p>
 
 <p>There are several example applications that demonstrate how the WebSocket 
API
    can be used. You will need to look at both the client side <a
-   
href="http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";>
+   
href="https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";>
    HTML</a> and the server side <a
-   
href="http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";>
+   
href="https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";>
    code</a>.</p>
 </section>
 

Modified: tomcat/trunk/webapps/docs/websocketapi/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/websocketapi/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/websocketapi/index.html (original)
+++ tomcat/trunk/webapps/docs/websocketapi/index.html Thu Jun 21 09:16:08 2018
@@ -27,7 +27,7 @@ The WebSocket Javadoc is not installed b
 the "fulldocs" package to get it.
 
 You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+<a href="https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
 documentation bundle</a>.
 
 </body>

Modified: tomcat/trunk/webapps/docs/windows-auth-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-auth-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-auth-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-auth-howto.xml Thu Jun 21 09:16:08 2018
@@ -223,7 +223,7 @@ com.sun.security.jgss.krb5.accept {
   <subsection name="References">
   <p>Correctly configuring Kerberos authentication can be tricky. The following
   references may prove helpful. Advice is also always available from the
-  <a href="http://tomcat.apache.org/lists.html#tomcat-users";>Tomcat users
+  <a href="https://tomcat.apache.org/lists.html#tomcat-users";>Tomcat users
   mailing list</a>.</p>
   <ol>
   <li><a 
href="http://www.adopenstatic.com/cs/blogs/ken/archive/2006/10/19/512.aspx";>
@@ -298,7 +298,7 @@ com.sun.security.jgss.krb5.accept {
   They are:</p>
   <ol>
   <li>Configure IIS as a reverse proxy for Tomcat (see the
-  <a href="http://tomcat.apache.org/connectors-doc/webserver_howto/iis.html";>
+  <a href="https://tomcat.apache.org/connectors-doc/webserver_howto/iis.html";>
   IIS Web Server How-To)</a>.</li>
   <li>Configure IIS to use Windows authentication</li>
   <li>Configure Tomcat to use the authentication user information from IIS by
@@ -324,7 +324,7 @@ com.sun.security.jgss.krb5.accept {
   authentication. They are:</p>
   <ol>
   <li>Configure httpd as a reverse proxy for Tomcat (see the
-  <a 
href="http://tomcat.apache.org/connectors-doc/webserver_howto/apache.html";>
+  <a 
href="https://tomcat.apache.org/connectors-doc/webserver_howto/apache.html";>
   Apache httpd Web Server How-To)</a>.</li>
   <li>Configure httpd to use Windows authentication</li>
   <li>Configure Tomcat to use the authentication user information from httpd by

Modified: tomcat/trunk/webapps/docs/windows-service-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-service-howto.xml?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/windows-service-howto.xml (original)
+++ tomcat/trunk/webapps/docs/windows-service-howto.xml Thu Jun 21 09:16:08 2018
@@ -384,14 +384,14 @@ To update the service parameters, you ne
 </p>
 
 <source>Update the service named 'Tomcat<version-major/>'
-C:\> tomcat<version-major/> //US//Tomcat<version-major/> --Description="Apache 
Tomcat Server - http://tomcat.apache.org/ " ^
+C:\> tomcat<version-major/> //US//Tomcat<version-major/> --Description="Apache 
Tomcat Server - https://tomcat.apache.org/ " ^
      --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar</source>
 
 <p>If you gave the service an optional name, you need to specify it like this:
 </p>
 
 <source>Update the service named 'MyService'
-C:\> tomcat<version-major/> //US//MyService --Description="Apache Tomcat 
Server - http://tomcat.apache.org/ " ^
+C:\> tomcat<version-major/> //US//MyService --Description="Apache Tomcat 
Server - https://tomcat.apache.org/ " ^
      --Startup=auto 
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar</source>
 
 </section>

Modified: tomcat/trunk/webapps/examples/jsp/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/index.html?rev=1833989&r1=1833988&r2=1833989&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/jsp/index.html (original)
+++ tomcat/trunk/webapps/examples/jsp/index.html Thu Jun 21 09:16:08 2018
@@ -33,7 +33,7 @@ parts of the Java Server Pages (JSP) spe
 JSP 1.2 examples are presented below.
 <p>These examples will only work when these pages are being served by a
 servlet engine; of course, we recommend
-<a href="http://tomcat.apache.org/";>Tomcat</a>.
+<a href="https://tomcat.apache.org/";>Tomcat</a>.
 They will not work if you are viewing these pages via a
 "file://..." URL.
 <p>To navigate your way through the examples, the following icons will



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to