From beff96e42d0a1fa88a334aa1cc95144dc0f3142d Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Thu, 22 Mar 2018 21:15:37 +0100
Subject: [PATCH] Make sure to end internal links with /

To avoid a permanent redirect on internal links, ensure we are
ending them with a slash. Also change the mailing list URL to
avoid a 301 to /list/.
---
 templates/base/base.html                             |  4 ++--
 templates/core/community.html                        |  4 ++--
 templates/docs/docspage.html                         |  4 ++--
 templates/docs/index.html                            | 12 ++++++------
 templates/index.html                                 | 16 ++++++++--------
 templates/misc/bug_header.html                       |  6 +++---
 templates/pages/about.html                           |  2 +-
 templates/pages/about/casestudies.html               |  6 +++---
 templates/pages/about/contact.html                   |  4 ++--
 templates/pages/about/donate_pg_org.html             |  2 +-
 templates/pages/about/press/faq.html                 |  4 ++--
 templates/pages/about/users.html                     |  2 +-
 templates/pages/community/irc.html                   |  2 +-
 templates/pages/developer.html                       |  8 ++++----
 templates/pages/developer/summerofcode.html          |  2 +-
 templates/pages/developer/summerofcode2011.html      |  2 +-
 templates/pages/developer/summerofcode2012.html      |  2 +-
 templates/pages/developer/summerofcode2013.html      |  2 +-
 templates/pages/developer/summerofcode2014.html      |  2 +-
 templates/pages/developer/summerofcode2016.html      |  2 +-
 templates/pages/developer/testing.html               |  4 ++--
 templates/pages/download.html                        |  6 +++---
 templates/pages/download/linux/linux_source.inc      |  2 +-
 templates/pages/support.html                         | 12 ++++++------
 templates/pages/support/security/faq/2013-04-04.html |  2 +-
 templates/pugs/index.html                            |  2 +-
 templates/security/security.html                     |  4 ++--
 templates/support/versioning.html                    |  2 +-
 28 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/templates/base/base.html b/templates/base/base.html
index 3acfaea..09752bf 100644
--- a/templates/base/base.html
+++ b/templates/base/base.html
@@ -45,10 +45,10 @@
       <div id="pgSearchNav">
        <ul id="pgSearchNavList">
         <li>
-          <a href="/about/donate">Donate</a>
+          <a href="/about/donate/">Donate</a>
         </li>
         <li>
-          <a href="/about/contact">Contact</a>
+          <a href="/about/contact/">Contact</a>
         </li>
        </ul>
       </div>
diff --git a/templates/core/community.html b/templates/core/community.html
index 04cef4c..0a4f097 100644
--- a/templates/core/community.html
+++ b/templates/core/community.html
@@ -5,9 +5,9 @@
 <div id="pgCommunity">
 <h1>Community</h1>
 
-<p>PostgreSQL is well supported by its active community. There are more than a dozen <a href="/community/lists">mailing lists</a> available, categorized into topics like administration, announcements, jobs, performance, and SQL. We also have several PostgreSQL User Groups in the world, and there is also an active <a href="/community/irc">IRC</a> community.</p>
+<p>PostgreSQL is well supported by its active community. There are more than a dozen <a href="/list/">mailing lists</a> available, categorized into topics like administration, announcements, jobs, performance, and SQL. We also have several PostgreSQL User Groups in the world, and there is also an active <a href="/community/irc/">IRC</a> community.</p>
 
-<p>In addition to the resources available on this site, there are also links to <a href="/community/international">international sites</a> that contain PostgreSQL information in various languages. PostgreSQL community <a href="/community/resources">resources</a> are also highlighted in this section of the website.</p>
+<p>In addition to the resources available on this site, there are also links to <a href="/community/international/">international sites</a> that contain PostgreSQL information in various languages. PostgreSQL community <a href="/community/resources/">resources</a> are also highlighted in this section of the website.</p>
 </div>
 </div>
 
diff --git a/templates/docs/docspage.html b/templates/docs/docspage.html
index ca2bd17..3d8a6b9 100644
--- a/templates/docs/docspage.html
+++ b/templates/docs/docspage.html
@@ -34,7 +34,7 @@
 	</form>
 </div>
 <div id="docNav">
-<a href="/" title="Home">Home</a> &rarr; <a href="/docs" title="Documentation">Documentation</a> &rarr; <a href="/docs/manuals" title="Manuals">Manuals</a> &rarr; <a href="/docs/{{page.display_version}}/static/{{doc_index_filename}}">PostgreSQL {{page.display_version}}</a>{%if loaddate%} ({{loaddate|date:"Y-m-d H:i:s"}}){%endif%}
+<a href="/" title="Home">Home</a> &rarr; <a href="/docs/" title="Documentation">Documentation</a> &rarr; <a href="/docs/manuals/" title="Manuals">Manuals</a> &rarr; <a href="/docs/{{page.display_version}}/static/{{doc_index_filename}}">PostgreSQL {{page.display_version}}</a>{%if loaddate%} ({{loaddate|date:"Y-m-d H:i:s"}}){%endif%}
 </div>
 <div id="docVersions">
 This page in other versions:
@@ -101,7 +101,7 @@ to report a documentation issue.
 </div>
 
 <div id="docFooter">
-    <a href="{{link_root}}/about/privacypolicy">Privacy Policy</a> |
+    <a href="{{link_root}}/about/privacypolicy/">Privacy Policy</a> |
     <a href="{{link_root}}/about/">About PostgreSQL</a><br/>
 Copyright &copy; 1996-{% now "Y" %} The PostgreSQL Global Development Group
 </div>
diff --git a/templates/docs/index.html b/templates/docs/index.html
index 4ed98e3..ed6c5bd 100644
--- a/templates/docs/index.html
+++ b/templates/docs/index.html
@@ -5,13 +5,13 @@
 <div id="pgDocs">
 <h1>Documentation</h1>
 
-<p>There is a wealth of PostgreSQL information available online. This section contains <a href="/docs/manuals">current</a>
-and <a href="/docs/manuals/archive">archived</a> manuals for PostgreSQL users, as well as
-<a href="/docs/faq">frequently asked questions</a>.</p>
+<p>There is a wealth of PostgreSQL information available online. This section contains <a href="/docs/manuals/">current</a>
+and <a href="/docs/manuals/archive/">archived</a> manuals for PostgreSQL users, as well as
+<a href="/docs/faq/">frequently asked questions</a>.</p>
 
-<p>You can learn <a href="/docs/9.6/static/release-9-6.html">what's new</a> in the latest release, and view a listing of <a href="/docs/books">books</a>
+<p>You can learn <a href="/docs/9.6/static/release-9-6.html">what's new</a> in the latest release, and view a listing of <a href="/docs/books/">books</a>
 written about PostgreSQL (some of which are available in their entirety online).
-<a href="https://wiki.postgresql.org">Technical documentation</a> is also available in this section, or you can check <a href="/support/security">Security Information</a>.</p>
+<a href="https://wiki.postgresql.org">Technical documentation</a> is also available in this section, or you can check <a href="/support/security/">Security Information</a>.</p>
 
 </div>
 </div>
@@ -35,7 +35,7 @@ written about PostgreSQL (some of which are available in their entirety online).
           <li><a href="https://postgrespro.ru/docs/postgresql">Russian</a></li>
         </ul>
     </dd>
-    <dd><p></p><a href="/docs/manuals">More manuals</a></dd>
+    <dd><p></p><a href="/docs/manuals/">More manuals</a></dd>
   </dl>
 </div>
 </div>
diff --git a/templates/index.html b/templates/index.html
index 7d48f2c..9b90d85 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -40,7 +40,7 @@
                       <div id="txtFrontUserText">{{quote.quote}}</div>
                       <div id="txtFrontUserName"><b>{{quote.who}}, <a href="{{quote.link}}">{{quote.org}}</a></b></div>
                       <div id="txtFrontUserLink">
-                          <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="5" alt="" /><a href="/about/casestudies">Case Studies</a><span class="txtDivider">|</span><a href="/about/quotesarchive" title="See more quotes">More Quotes</a><span class="txtDivider">|</span><a href="/about/users" title="See featured users">Featured Users</a>
+                          <img src="/media/img/layout/blt_blu_arrow.png" width="6" height="5" alt="" /><a href="/about/casestudies/">Case Studies</a><span class="txtDivider">|</span><a href="/about/quotesarchive/" title="See more quotes">More Quotes</a><span class="txtDivider">|</span><a href="/about/users/" title="See featured users">Featured Users</a>
                       </div>
                     </div>
                   </div> <!-- pgFrontUserWrap -->
@@ -58,7 +58,7 @@
              <br />
              {%endfor%}
             </div>
-	    <div id="pgFrontLatestReleasesNote"><b><a href="/download">Download</a></b> | <a href="/versions.rss" title="Versions RSS Feed"><img class="pgRSSImage" src="/media/img/misc/ico_rss.png" width="28" height="13" alt="Versions RSS Feed" /></a><br /><a href="/support/versioning">Why should I upgrade?</a><br/><a href="/developer/roadmap/">Upcoming releases</a></div>
+	    <div id="pgFrontLatestReleasesNote"><b><a href="/download/">Download</a></b> | <a href="/versions.rss" title="Versions RSS Feed"><img class="pgRSSImage" src="/media/img/misc/ico_rss.png" width="28" height="13" alt="Versions RSS Feed" /></a><br /><a href="/support/versioning/">Why should I upgrade?</a><br/><a href="/developer/roadmap/">Upcoming releases</a></div>
           </div> <!-- pgFrontLatestreleases -->
           <div id="pgFrontShortcuts">
             <h3 class="txtHomeHeader">&gt;&nbsp; Shortcuts</h3>
@@ -68,16 +68,16 @@
                   <a href="/support/security/">Security</a>
                 </li>
                 <li>
-                  <a href="/community/international">International Sites</a>
+                  <a href="/community/international/">International Sites</a>
                 </li>
                 <li>
-                  <a href="/community/lists">Mailing Lists</a>
+                  <a href="/list/">Mailing Lists</a>
                 </li>
                 <li>
                   <a href="https://wiki.postgresql.org/">Wiki</a>
                 </li>
                 <li>
-                  <a href="/account/submitbug">Report a Bug</a>
+                  <a href="/account/submitbug/">Report a Bug</a>
                 </li>
                 <li>
                   <a href="/docs/faq/">FAQs</a>
@@ -89,7 +89,7 @@
             <h3 class="txtHomeHeader">&gt;&nbsp; Support Us</h3>
             <div id="pgFrontSupportUsWrap">
               <div id="txtFrontSupportUsText">
-                PostgreSQL is free. Please support our work by making a <a href="/about/donate">donation</a>.
+                PostgreSQL is free. Please support our work by making a <a href="/about/donate/">donation</a>.
               </div>
             </div>
           </div> <!-- pgFrontSupportUs -->
@@ -98,7 +98,7 @@
          <div id="pgFrontNews" class="txtNewsEvent">
            <h3 class="txtHomeHeader">
              &gt;&nbsp;
-             <a href="/about/newsarchive">News</a>
+             <a href="/about/newsarchive/">News</a>
            </h3>
            <div class="pgNewsEventsWrap">
              {% for n in news %}
@@ -111,7 +111,7 @@
                <img class="pgArrowImage" src="/media/img/layout/blt_blu_arrow.png" width="6" height="5" alt="" />
                <ul class="pgRSSBottomList">
                  <li>
-                   <a href="/about/newsarchive" title="More News">More</a>
+                   <a href="/about/newsarchive/" title="More News">More</a>
                  </li>
                  <li>
                   <a href="/account/news/new/">Submit News</a>
diff --git a/templates/misc/bug_header.html b/templates/misc/bug_header.html
index cb44ec4..f82d7f0 100644
--- a/templates/misc/bug_header.html
+++ b/templates/misc/bug_header.html
@@ -7,7 +7,7 @@ it is a documentation bug. If a program does something different from what the
 documentation says, that is also a bug.</p>
 
 <p>Poor performance is not necessarily a bug. Read the documentation or ask on
-one of the <a href="/community/lists/">mailing lists</a> for help in tuning
+one of the <a href="/list/">mailing lists</a> for help in tuning
 your applications. Failing to comply to the SQL standard is not necessarily a
 bug either, unless compliance for the specific feature is explicitly claimed.</p>
 
@@ -24,7 +24,7 @@ other bugs will be forwarded to the
 list where they will be publicly archived.</p>
 
 <p>Make sure you are running the latest available minor release for your major
-<a href="/support/versioning">version</a> before reporting a bug. The current
+<a href="/support/versioning/">version</a> before reporting a bug. The current
 list of supported versions is
 {%for ver in supportedversions%}{{ver}}{%if not forloop.last%}, {%endif%}{%endfor%}.
 </p>
@@ -34,7 +34,7 @@ with the PostgreSQL database.  Problems with database connectors such as ODBC
 and JDBC, graphical administration tools such as pgAdmin or other external
 projects <strong>should not be reported here</strong>; please report to those projects
 directly.  For products closely connected with PostgreSQL, there may be an
-appropriate <a href='/community/lists'>mailing list</a> available.
+appropriate <a href='/list/'>mailing list</a> available.
 
 <p>
 By submitting a bug through this form you agree that all contents of the bug report,
diff --git a/templates/pages/about.html b/templates/pages/about.html
index adc7f66..6f4e906 100644
--- a/templates/pages/about.html
+++ b/templates/pages/about.html
@@ -25,7 +25,7 @@ of data it can manage and in the number of concurrent users it can
 accommodate. There are active PostgreSQL instances in production environments that
 manage many terabytes of data, as well as clusters managing petabytes. Some general PostgreSQL limits are
 included in the table below. </p><div class="informaltable"><a name="table1"></a><table border="0"><colgroup><col /><col /></colgroup><thead><tr><th><span class="bold"><b>Limit</b></span></th><th><span class="bold"><b>Value</b></span></th></tr></thead><tbody><tr><td>Maximum Database Size</td><td>Unlimited</td></tr><tr><td>Maximum Table Size</td><td>32 TB</td></tr><tr><td>Maximum Row Size</td><td>1.6 TB</td></tr><tr><td>Maximum Field Size</td><td>1 GB</td></tr><tr><td>Maximum Rows per Table</td><td>Unlimited</td></tr><tr><td>Maximum Columns per Table</td><td>250 - 1600 depending on column types</td></tr><tr><td>Maximum Indexes per Table</td><td>Unlimited</td></tr></tbody></table></div>
-<p>PostgreSQL has won <a href="/about/quotesarchive">praise from its users</a> and <a href="/about/awards">industry recognition</a>, including the Linux New Media Award for Best Database System and five time winner of the The Linux Journal Editors' Choice Award for best DBMS.
+<p>PostgreSQL has won <a href="/about/quotesarchive/">praise from its users</a> and <a href="/about/awards/">industry recognition</a>, including the Linux New Media Award for Best Database System and five time winner of the The Linux Journal Editors' Choice Award for best DBMS.
 
 </p>
 <h2>Featureful and Standards Compliant</h2><p>PostgreSQL prides itself in standards compliance. Its SQL implementation
diff --git a/templates/pages/about/casestudies.html b/templates/pages/about/casestudies.html
index 146ce47..36be4a9 100644
--- a/templates/pages/about/casestudies.html
+++ b/templates/pages/about/casestudies.html
@@ -7,15 +7,15 @@
 <h2>Organizations Using PostgreSQL</h2>
 <a href="http://www.osbr.ca/ojs/index.php/osbr/article/view/1142/1093">Afilias</a> <span class="txtMediumGrey"></span><br />
 <a href="/files/about/casestudies/wcgcasestudyonpostgresqlv1.2.pdf">BASF</a> <span class="txtMediumGrey">(PDF format)</span><br />
-<a href="/about/casestudies/mohawk" target="_self">Mohawk Software</a><br />
+<a href="/about/casestudies/mohawk/" target="_self">Mohawk Software</a><br />
 <a href="/files/about/casestudies/Proximity10.pdf">Proximity</a> <span class="txtMediumGrey">(PDF format)</span><br />
 <a href="/files/about/casestudies/RadioParadise.pdf">Radio Paradise</a> <span class="txtMediumGrey">(PDF format)</span><br/>
-<a href="/about/casestudies/shannonmedical" target="_self">Shannon Medical Center</a><br />
+<a href="/about/casestudies/shannonmedical/" target="_self">Shannon Medical Center</a><br />
 <a href="/files/about/casestudies/Spiros.pdf">Spiros Louis Stadium</a> <span class="txtMediumGrey">(PDF format)</span><br/>
 <a href="/files/about/casestudies/OpenSourceSoftware_Dravis.pdf">The Dravis Group OSS Report</a> <span class="txtMediumGrey">(PDF format)</span><br/>
 <a href="/files/about/casestudies/travelpost_case_study.pdf">Travelpost</a> <span class="txtMediumGrey">(PDF format)</span><br/>
 <a href="/files/about/casestudies/valhalla_case_study.pdf">Valhalla</a> <span class="txtMediumGrey">(PDF format)</span><br/>
-<a href="/about/casestudies/vanten" target="_self">Vanten Inc.</a><br />
+<a href="/about/casestudies/vanten/" target="_self">Vanten Inc.</a><br />
 <br />
 <br />
 <a href="mailto:press@postgresql.org">Share Your Story</a><br />
diff --git a/templates/pages/about/contact.html b/templates/pages/about/contact.html
index b3e0c0a..3f1f5ff 100644
--- a/templates/pages/about/contact.html
+++ b/templates/pages/about/contact.html
@@ -21,12 +21,12 @@ funds group directly at <a href="mailto:funds-group@postgresql.org">funds-group@
 
 <h2>Press Enquiries</h2>
 
-<p>For press enquiries, please refer to the <a href="/about/press">Press</a> section.
+<p>For press enquiries, please refer to the <a href="/about/press/">Press</a> section.
 This section includes information on regional contacts as well.</p>
 
 <h2>Technical Support</h2>
 <p>If you are looking for help with PostgreSQL, or this website.</p>
-<p><a href="/support">Community support</a></p>
+<p><a href="/support/">Community support</a></p>
 
 <h2>Webmasters</h2>
 
diff --git a/templates/pages/about/donate_pg_org.html b/templates/pages/about/donate_pg_org.html
index 577e477..15ee197 100644
--- a/templates/pages/about/donate_pg_org.html
+++ b/templates/pages/about/donate_pg_org.html
@@ -59,7 +59,7 @@
 href="mailto:funds-group@postgresql.org">PostgreSQL Funds Group</a>.</p>
 
 <h2>Infrastructure Donations</h2>
-<p>There are many companies that donate <a href="/about/servers">servers.</a></p>
+<p>There are many companies that donate <a href="/about/servers/">servers.</a></p>
 
 
 {%endblock%}
diff --git a/templates/pages/about/press/faq.html b/templates/pages/about/press/faq.html
index 5310107..50d4a52 100644
--- a/templates/pages/about/press/faq.html
+++ b/templates/pages/about/press/faq.html
@@ -14,7 +14,7 @@ A: The next release of PostgreSQL will be version 11, and will follow a two-part
 A: Because of the long history of our project the first two decimals are major releases.  Thus 9.6, 9.5 etc. were all major releases.  Minor releases have numbers like 9.6.6. Since version 10, the project has adopted a two-part version numbering scheme.</p>
 
 <p><b>Q: How is PostgreSQL licensed? How much does it cost?</b><br />
-A: PostgreSQL is released under the OSI-approved PostgreSQL License.  There is no fee, even for use in commercial software products.  Please see <a href="/about/licence">the PostgreSQL License</a></p>
+A: PostgreSQL is released under the OSI-approved PostgreSQL License.  There is no fee, even for use in commercial software products.  Please see <a href="/about/licence/">the PostgreSQL License</a></p>
 
 <p><b>Q: How many developers work on PostgreSQL?</b><br />
 A: About 200.  As with other open source projects, of course, we depend on hundreds of community members for documentation, translations, advocacy, conferences, website development, infrastructure, and peer-to-peer support.</p>
@@ -26,7 +26,7 @@ A: Our wide distribution through the open source world and liberal licensing mak
 A: Please contact press@postgresql.org and our press volunteers will try to arrange a contact.</p>
 
 <p><b>Q: What company owns PostgreSQL?</b><br />
-A: None.  We are an unincorporated association of volunteers and companies who share code under the PostgreSQL License.   The PostgreSQL project involves a couple dozen companies who either support PostgreSQL contributors or directly contribute corporate projects to our repository.  Some of our major corporate sponsors are on the <a href="/about/sponsors">sponsors page,</a> and there are many more companies who contribute to the project in other ways.</p>
+A: None.  We are an unincorporated association of volunteers and companies who share code under the PostgreSQL License.   The PostgreSQL project involves a couple dozen companies who either support PostgreSQL contributors or directly contribute corporate projects to our repository.  Some of our major corporate sponsors are on the <a href="/about/sponsors/">sponsors page,</a> and there are many more companies who contribute to the project in other ways.</p>
 
 <p><b>Q: Where can people get support for PostgreSQL?</b><br />
 A: There are several companies which provide paid support for PostgreSQL.  Most of them are regional in nature.  People should contact the nearest regional contact volunteer to be connected with one or more companies, or check our <a href="/support/professional_support/">professional services list</a>.</p>
diff --git a/templates/pages/about/users.html b/templates/pages/about/users.html
index b20ccc9..7c651a5 100644
--- a/templates/pages/about/users.html
+++ b/templates/pages/about/users.html
@@ -72,7 +72,7 @@
 <ul>
 	<li>CalorieKing.com</li>
 	<li>GNUmed (<a href="http://wiki.gnumed.de/bin/view/Gnumed/DbStructure">white-paper</a>)</li>
-	<li>Shannon Medical Center (<a href="/about/casestudies/shannonmedical">white-paper</a>)</li>
+	<li>Shannon Medical Center (<a href="/about/casestudies/shannonmedical/">white-paper</a>)</li>
 </ul>
 <h2>Manufacturing</h2>
 <ul>
diff --git a/templates/pages/community/irc.html b/templates/pages/community/irc.html
index 666b53b..bb01ac0 100644
--- a/templates/pages/community/irc.html
+++ b/templates/pages/community/irc.html
@@ -7,7 +7,7 @@
 <p>If you have a problem that you cannot resolve, you might want to try asking a question in our IRC channel
 <a href="irc://irc.freenode.net/postgresql">#postgresql on irc.freenode.net</a>. The channel has many active users,
 and it is an entry into participating in the wider PostgreSQL community.  Don't forget to consult
-the <a href="/docs">documentation</a> about your problem before asking your question.</p>
+the <a href="/docs/">documentation</a> about your problem before asking your question.</p>
 
 <h2>Other PostgreSQL Related Channels</h2>
 <p>PostgreSQL Related Projects:</p>
diff --git a/templates/pages/developer.html b/templates/pages/developer.html
index 2feab98..d2d41e5 100644
--- a/templates/pages/developer.html
+++ b/templates/pages/developer.html
@@ -7,7 +7,7 @@
 
 <p>A PostgreSQL database developer is someone who is actually working on the project, not someone using it to develop
 an application or a website. We don't hire programmers, we reach across the Internet, drawing the best database
-developers in the world to PostgreSQL. Read about the <a href="/community/contributors">people behind PostgreSQL</a> and
+developers in the world to PostgreSQL. Read about the <a href="/community/contributors/">people behind PostgreSQL</a> and
 check out the <a href="/files/community/conference06/conference_group.html">group picture</a> from the 2006
 PostgreSQL Anniversary Summit.
 </p>
@@ -15,8 +15,8 @@ PostgreSQL Anniversary Summit.
 <h2>What will you find here?</h2>
 
 <p>The information available in this section will mainly interest PostgreSQL developers. Here you'll find the
-<a href="/developer/roadmap">roadmap</a> with current <a href="https://wiki.postgresql.org/wiki/Todo">TODO list</a>, <a href="/developer/coding">coding</a> and
-<a href="/developer/testing">testing</a> information, <a href="/community/lists#developer">mailing lists</a>, and
+<a href="/developer/roadmap/">roadmap</a> with current <a href="https://wiki.postgresql.org/wiki/Todo">TODO list</a>, <a href="/developer/coding/">coding</a> and
+<a href="/developer/testing/">testing</a> information, <a href="/list/">mailing lists</a>, and
 the developer <a href="https://wiki.postgresql.org/wiki/Developer_FAQ">FAQ</a>. Keep in mind the information available here is not
 necessarily available in the release version of PostgreSQL - it may not yet even be in the development version.
 </p>
@@ -24,6 +24,6 @@ necessarily available in the release version of PostgreSQL - it may not yet even
 
 <h2>Google Summer of Code Program</h2>
 
-<p>The PostgreSQL Project is a proud participant in Google's Summer of Code program. If you are interested in working on a PostgreSQL related project, please check out our <a href="/developer/summerofcode">Summer of Code</a> page.</p>
+<p>The PostgreSQL Project is a proud participant in Google's Summer of Code program. If you are interested in working on a PostgreSQL related project, please check out our <a href="/developer/summerofcode/">Summer of Code</a> page.</p>
 
 {%endblock%}
diff --git a/templates/pages/developer/summerofcode.html b/templates/pages/developer/summerofcode.html
index 51daf6e..ae3998a 100644
--- a/templates/pages/developer/summerofcode.html
+++ b/templates/pages/developer/summerofcode.html
@@ -95,7 +95,7 @@ It is important to be responsive and providing an email/IM/phone method for bein
 would help to make sure we can reach you as needed for project check-ins.</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/summerofcode2011.html b/templates/pages/developer/summerofcode2011.html
index 4e47e3a..b6750b6 100644
--- a/templates/pages/developer/summerofcode2011.html
+++ b/templates/pages/developer/summerofcode2011.html
@@ -74,7 +74,7 @@ project?</li>
 Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/summerofcode2012.html b/templates/pages/developer/summerofcode2012.html
index eb22221..295cfd7 100644
--- a/templates/pages/developer/summerofcode2012.html
+++ b/templates/pages/developer/summerofcode2012.html
@@ -75,7 +75,7 @@ project?</li>
 Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/summerofcode2013.html b/templates/pages/developer/summerofcode2013.html
index 780e73a..5c78023 100644
--- a/templates/pages/developer/summerofcode2013.html
+++ b/templates/pages/developer/summerofcode2013.html
@@ -73,7 +73,7 @@ project?</li>
 Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/summerofcode2014.html b/templates/pages/developer/summerofcode2014.html
index d44ca52..3c0fb91 100644
--- a/templates/pages/developer/summerofcode2014.html
+++ b/templates/pages/developer/summerofcode2014.html
@@ -73,7 +73,7 @@ project?</li>
 Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/summerofcode2016.html b/templates/pages/developer/summerofcode2016.html
index b8da6ca..88e1427 100644
--- a/templates/pages/developer/summerofcode2016.html
+++ b/templates/pages/developer/summerofcode2016.html
@@ -93,7 +93,7 @@ project?</li>
 Can you supply us with an email/IM/phone method for being contacted, in case of emergency?</li>
 </ul>
 
-<p>Please also see our additional <a href="/developer/summerofcodeadvice">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
+<p>Please also see our additional <a href="/developer/summerofcodeadvice/">Advice to Students</a> <strong>before</strong> submitting a proposal.</p>
 
 <p>We would prefer that development discussion occur on our project mailing lists when possible, with special recognition being given to those students who vet their proposal with community developers before submitting their proposal to Google SoC. This is not required, but can have a large impact on the chances of your proposal being accepted, so please don't be shy. In any case, you will be required to keep open lines of communication with your mentor should you be accepted, so if you have circumstances that may affect this, please explain them up front in your proposal.</p>
 
diff --git a/templates/pages/developer/testing.html b/templates/pages/developer/testing.html
index a6010f6..65df3e9 100644
--- a/templates/pages/developer/testing.html
+++ b/templates/pages/developer/testing.html
@@ -10,7 +10,7 @@
 <ul>
     <li><a href="/developer/beta/">Current Beta release information</a></li>
     <li><a href="/ftp/snapshot/dev/">Download nightly code build</a></li>
-    <li><a href="/download/snapshots">Download periodic binary builds</a></li>
+    <li><a href="/download/snapshots/">Download periodic binary builds</a></li>
     <li><a href="https://buildfarm.postgresql.org/">Distributed Build Farm</a></li>
 </ul>
 
@@ -21,6 +21,6 @@ These facilities are used for a wide range of tasks from DBT-style tests, to sys
 </p>
 <h2>Documentation</h2>
 <ul>
-  <li><a href="/docs/devel/static">Developer Version of The Docs</a> (<a href="https://buildfarm.postgresql.org/cgi-bin/show_stage_log.pl?nm=guaibasaurus&dt=latest&stg=make-doc">build log</a>)</li>
+  <li><a href="/docs/devel/static/">Developer Version of The Docs</a> (<a href="https://buildfarm.postgresql.org/cgi-bin/show_stage_log.pl?nm=guaibasaurus&dt=latest&stg=make-doc">build log</a>)</li>
 </ul>
 {%endblock%}
diff --git a/templates/pages/download.html b/templates/pages/download.html
index edcfaf7..751be82 100644
--- a/templates/pages/download.html
+++ b/templates/pages/download.html
@@ -42,7 +42,7 @@ systems:
 <h3>Source code</h3>
 
 <p>
-The source code can be found in the main <a href="/ftp/source">file browser</a>
+The source code can be found in the main <a href="/ftp/source/">file browser</a>
 or you can access the source control repository directly
 at <a href="https://git.postgresql.org/gitweb/?p=postgresql.git;a=summary">git.postgresql.org</a>.
 Instructions for building from source can be found in the
@@ -52,7 +52,7 @@ Instructions for building from source can be found in the
 <h3>Beta/RC Releases and development snapshots (unstable)</h3>
 
 <p>
-There are source code and binary <a href="/download/snapshots">packages</a>
+There are source code and binary <a href="/download/snapshots/">packages</a>
 of beta and release candidates, and of the current development code available
 for testing and evaluation of new features. Note that these builds should
 be used <b>for testing purposes only</b>, and not for production systems.
@@ -109,7 +109,7 @@ stacks are available from
 
 <h3>Software Catalogue</h3>
 
-<p>There is much software available that is not bundled with PostgreSQL. The <a href="/download/product-categories">Software
+<p>There is much software available that is not bundled with PostgreSQL. The <a href="/download/product-categories/">Software
 Catalogue</a> offers a listing of many commercial and Open Source applications, interfaces and extensions to PostgreSQL
 that you may find useful.</p>
 
diff --git a/templates/pages/download/linux/linux_source.inc b/templates/pages/download/linux/linux_source.inc
index 43e15b0..547c260 100644
--- a/templates/pages/download/linux/linux_source.inc
+++ b/templates/pages/download/linux/linux_source.inc
@@ -1,6 +1,6 @@
 <h2>Build from source</h2>
 <p>
-The source code can be found in the main <a href="/ftp/source">file browser</a>.
+The source code can be found in the main <a href="/ftp/source/">file browser</a>.
 Instructions for building from source can be found in the
 <a href="/docs/current/static/installation.html">documentation</a>.
 </p>
diff --git a/templates/pages/support.html b/templates/pages/support.html
index 1459583..0cb10c5 100644
--- a/templates/pages/support.html
+++ b/templates/pages/support.html
@@ -5,19 +5,19 @@
 <h1>Support</h1>
 
 <p>PostgreSQL has a wide variety of community and commercial support options available for users.
-The <a href="/community">Community</a> section of this website details the support options available to users from the PostgreSQL
-community, including <a href="/community/lists">mailing lists</a> and <a href="/community/irc">IRC</a>.
-And don't forget to read the <a href="/docs/faq">FAQs</a> and <a href="/docs/">documentation</a>.
+The <a href="/community/">Community</a> section of this website details the support options available to users from the PostgreSQL
+community, including <a href="/list/">mailing lists</a> and <a href="/community/irc/">IRC</a>.
+And don't forget to read the <a href="/docs/faq/">FAQs</a> and <a href="/docs/">documentation</a>.
 </p>
 
-<p>Commercial support is also available from one of the many companies providing <a href="/support/professional_support">professional services</a>
-to the PostgreSQL community. A listing of companies that provide <a href="/support/professional_hosting">hosting</a> with PostgreSQL access is
+<p>Commercial support is also available from one of the many companies providing <a href="/support/professional_support/">professional services</a>
+to the PostgreSQL community. A listing of companies that provide <a href="/support/professional_hosting/">hosting</a> with PostgreSQL access is
 also available.</p>
 
 <h2>Bug Reporting</h2>
 
 <p>Found a bug in PostgreSQL? Please read over our <a href="/docs/current/static/bug-reporting.html">bug reporting guidelines</a>
-and then report it using our <a href="/account/submitbug">bug reporting form</a>.</p>
+and then report it using our <a href="/account/submitbug/">bug reporting form</a>.</p>
 
 <p>You can see previous bug reports, and track your own on the <a href="/list/pgsql-bugs/">pgsql-bugs@postgresql.org</a> mailing
 list.</p>
diff --git a/templates/pages/support/security/faq/2013-04-04.html b/templates/pages/support/security/faq/2013-04-04.html
index 37d995e..6704312 100644
--- a/templates/pages/support/security/faq/2013-04-04.html
+++ b/templates/pages/support/security/faq/2013-04-04.html
@@ -183,7 +183,7 @@ fixed. This includes:</p>
 
 <h2>What else is included in this release?</h2>
 <p>This release also updates four other, minor, security issues which are
-detailed on the <a href="/support/security">security
+detailed on the <a href="/support/security/">security
 page</a> and in the release announcement. It includes a number of bug fixes for
 PostgreSQL as well, most notably fixes for two potential data corruption issues
 with binary replication.</p>
diff --git a/templates/pugs/index.html b/templates/pugs/index.html
index 52439e9..99f9b3e 100644
--- a/templates/pugs/index.html
+++ b/templates/pugs/index.html
@@ -3,7 +3,7 @@
 {%block contents%}
 
 <h1>Local User Groups</h1>
-<p>The PostgreSQL community is proud to have many local chapters that advocate and educate users about PostgreSQL.  Below is a list of PostgreSQL User Groups (PUGs) sorted by country and local area.  If you would like to start a PostgreSQL User Group, please join the <a href="/community/lists/subscribe/">pgsql-advocacy mailing list</a> and describe the PUG that you want to create.</p>
+<p>The PostgreSQL community is proud to have many local chapters that advocate and educate users about PostgreSQL.  Below is a list of PostgreSQL User Groups (PUGs) sorted by country and local area.  If you would like to start a PostgreSQL User Group, please join the <a href="https://lists.postgresql.org/">pgsql-advocacy mailing list</a> and describe the PUG that you want to create.</p>
 <p>If a PUG already exists in your area, follow the URLs below to find out how to attend and participate.</p>
 
 
diff --git a/templates/security/security.html b/templates/security/security.html
index ef4197b..5838725 100644
--- a/templates/security/security.html
+++ b/templates/security/security.html
@@ -8,7 +8,7 @@
 If you wish to report a new security vulnerability in PostgreSQL, please
 send an email to
 <a href="mailto:security@postgresql.org">security@postgresql.org</a>.
-For reporting non-security bugs, please see the <a href="/account/submitbug">Report a Bug</a> page.
+For reporting non-security bugs, please see the <a href="/account/submitbug/">Report a Bug</a> page.
 </p>
 
 {%if version and not version.supported%}
@@ -29,7 +29,7 @@ security infrastructure software.
 </p>
 
 <p>
-PostgreSQL security updates are primarily made available as <a href="/support/versioning">minor version</a>
+PostgreSQL security updates are primarily made available as <a href="/support/versioning/">minor version</a>
 upgrades. You are always advised to use the latest minor version available,
 as it will likely also contain other non-security related fixes. All known
 security issues are always fixed in the next major release, when it comes out.
diff --git a/templates/support/versioning.html b/templates/support/versioning.html
index 9c1b67b..4bb5e6c 100644
--- a/templates/support/versioning.html
+++ b/templates/support/versioning.html
@@ -17,7 +17,7 @@ Major releases usually change the internal format of system tables and data file
 </p>
 
 <p>
-Minor releases are numbered by increasing the last part of the version number.  Beginning with version 10, this is the second part of the version number, e.g. 10.0 to 10.1; for older versions this is the third part of the version number, e.g. 9.5.3 to 9.5.4. The PostgreSQL team only adds bug fixes to minor releases. All users should upgrade to the most recent minor release as soon as possible. While upgrades always have some risk, PostgreSQL minor releases fix only frequently-encountered, <a href="/support/security">security</a>, and data corruption bugs to reduce the risk associated with upgrading. <i>The community considers not upgrading to be riskier than upgrading</i>.
+Minor releases are numbered by increasing the last part of the version number.  Beginning with version 10, this is the second part of the version number, e.g. 10.0 to 10.1; for older versions this is the third part of the version number, e.g. 9.5.3 to 9.5.4. The PostgreSQL team only adds bug fixes to minor releases. All users should upgrade to the most recent minor release as soon as possible. While upgrades always have some risk, PostgreSQL minor releases fix only frequently-encountered, <a href="/support/security/">security</a>, and data corruption bugs to reduce the risk associated with upgrading. <i>The community considers not upgrading to be riskier than upgrading</i>.
 </p>
 
 <p>
-- 
2.14.1.145.gb3622a4ee

