From ae3230760fd580b14e8af7ca39c2a2b4be281b63 Mon Sep 17 00:00:00 2001
From: Justin W. Flory <git@jwf.io>
Date: Jan 14 2019 18:32:05 +0000
Subject: [PATCH 1/3] Free Media is offline for over two years now – avoid frustration and omit


---

diff --git a/getfedora.org/data/templates/generic/other-media-sources.html b/getfedora.org/data/templates/generic/other-media-sources.html
index 50c2d14..7c3768c 100644
--- a/getfedora.org/data/templates/generic/other-media-sources.html
+++ b/getfedora.org/data/templates/generic/other-media-sources.html
@@ -6,7 +6,7 @@
   py:strip="">
 
   <h3>${_('Other ways of obtaining media')}</h3>
-  <p>${Markup(_('You may purchase installation media for Fedora from &lt;a href="%s"&gt;online vendors&lt;/a&gt; or a &lt;a href="%s"&gt;local vendor&lt;/a&gt; in your area.') % ('http://fedoraproject.org/wiki/Distribution/OnlineVendors', 'http://fedoraproject.org/wiki/Distribution/LocalVendors'))}</p>
-  <p>${Markup(_('Can\'t afford the price of installation media? Request Fedora installation media from the &lt;a href="%s"&gt;Fedora Free Media Program&lt;/a&gt;.') % ('http://fedoraproject.org/freemedia/FreeMedia-form.html'))}</p>
+  <!-- TODO: Should we omit this section altogether? -->
+  <p>${Markup(_('You may purchase installation media for Fedora from &lt;a href="%s"&gt;online vendors&lt;/a&gt; or a &lt;a href="%s"&gt;local vendor&lt;/a&gt; in your area.') % ('https://fedoraproject.org/wiki/Distribution/OnlineVendors', 'https://fedoraproject.org/wiki/Distribution/LocalVendors'))}</p>
 
 </html>

From ada2c7e845f94a39e2ff43028144f4a69970c523 Mon Sep 17 00:00:00 2001
From: Justin W. Flory <git@jwf.io>
Date: Jan 14 2019 18:32:09 +0000
Subject: [PATCH 2/3] Update Fedora Docs links, fix Google+ URL


---

diff --git a/getfedora.org/data/templates/footer.html b/getfedora.org/data/templates/footer.html
index de6e0f8..99e0c4a 100644
--- a/getfedora.org/data/templates/footer.html
+++ b/getfedora.org/data/templates/footer.html
@@ -14,18 +14,18 @@
                         <h3 class="widget-title">${_('About')}</h3>
                         <div class="widget-body">
                             <dl>
-                                <dd><a href="//docs.fedoraproject.org/fedora-project/project/fedora-overview.html">${_('About Fedora')}</a></dd>
+                                <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>
                                 <dd><a href="${path}/${lang}/sponsors">${_('Sponsors')}</a></dd>
                                 <dd><a href="//fedoramagazine.org">${_('Fedora Magazine')}</a></dd>
                                 <dd><a href="https://fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>
-                                <dd><a href="//docs.fedoraproject.org/fedora-project/project/code-of-conduct.html">${_('Fedora Code of Conduct')}</a></dd> 
+                                <dd><a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/">${_('Fedora Code of Conduct')}</a></dd> 
                             </dl>
                             <ul class="list-inline">
                             <li>
                                 <a href="https://www.facebook.com/TheFedoraProject" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
                             </li>
                             <li>
-                                <a href="https://plus.google.com/112917221531140868607" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
+                                <a href="https://plus.google.com/+Fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-google-plus"></i></a>
                             </li>
                             <li>
                                 <a href="https://twitter.com/fedora" class="btn-social btn-outline"><i class="fa fa-fw fa-twitter"></i></a>
@@ -80,7 +80,7 @@
                 <div class="row">
                     <div class="col-md-2">
                         <div class="widget-body">
-                            <a href="http://www.redhat.com/"><img class="rh-logo" src="${path}/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>
+                            <a href="https://www.redhat.com/"><img class="rh-logo" src="${path}/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>
                         </div>
                     </div>
                     <div class="col-md-7">

From 47c90a51c5fa796fac034c77bca834975ea02e6b Mon Sep 17 00:00:00 2001
From: Justin W. Flory <git@jwf.io>
Date: Jan 14 2019 18:32:09 +0000
Subject: [PATCH 3/3] Use same URL schema for f*.fp.o links


---

diff --git a/getfedora.org/data/templates/footer.html b/getfedora.org/data/templates/footer.html
index 99e0c4a..283c850 100644
--- a/getfedora.org/data/templates/footer.html
+++ b/getfedora.org/data/templates/footer.html
@@ -14,11 +14,11 @@
                         <h3 class="widget-title">${_('About')}</h3>
                         <div class="widget-body">
                             <dl>
-                                <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>
+                                <dd><a href="//docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>
                                 <dd><a href="${path}/${lang}/sponsors">${_('Sponsors')}</a></dd>
                                 <dd><a href="//fedoramagazine.org">${_('Fedora Magazine')}</a></dd>
-                                <dd><a href="https://fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>
-                                <dd><a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/">${_('Fedora Code of Conduct')}</a></dd> 
+                                <dd><a href="//fedoraproject.org/wiki/Legal:Main#Legal">${_('Legal')}</a></dd>
+                                <dd><a href="//docs.fedoraproject.org/en-US/project/code-of-conduct/">${_('Fedora Code of Conduct')}</a></dd> 
                             </dl>
                             <ul class="list-inline">
                             <li>