#907 try to fix issues #884 and #866
Closed 3 years ago by sijis. Opened 3 years ago by sujiniku.
Unknown source master  into  master

file modified
+12 -12
@@ -14,21 +14,21 @@

  ### Websites

  This repository contains the sources for the following Fedora Websites:

  

- * http://alt.fedoraproject.org

- * http://arm.fedoraproject.org

- * http://boot.fedoraproject.org

- * http://budget.fedoraproject.org

+ * https://alt.fedoraproject.org/

+ * https://arm.fedoraproject.org/

+ * https://boot.fedoraproject.org/

+ * https://budget.fedoraproject.org/budget/docs/index.html

  * http://fedoracommunity.org

- * http://fedorahosted.org

- * http://fedorapeople.org

+ * https://fedoraproject.org/wiki/Infrastructure/Fedorahosted-retirement

+ * https://fedorapeople.org/

  * http://fedoraproject.org

- * http://flocktofedora.org

+ * https://flocktofedora.org/

  * http://fudcon.fedoraproject.org

- * http://getfedora.org

- * http://labs.fedoraproject.org

- * http://mirrors.fedoraproject.org

- * http://spins.fedoraproject.org

- * http://start.fedoraproject.org

+ * https://getfedora.org/

+ * https://labs.fedoraproject.org/

+ * https://admin.fedoraproject.org/mirrormanager/

+ * https://spins.fedoraproject.org/

+ * https://start.fedoraproject.org/

  

  ### Getting started

  

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>
@@ -79,7 +79,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/en"><img class="rh-logo" src="${path}/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>

                          </div>

                      </div>

                      <div class="col-md-7">

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>

@@ -15,7 +15,7 @@

        <div class="row">

          <div class="col-xs-12">

            <h5 class="text-center" style="margin-bottom:0;"><strong><span class="fa fa-exclamation-triangle text-warning"></span> ${Markup(_('The Fedora Privacy Policy has been updated. &lt;a href="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"&gt;Read the new version on the wiki.&lt;/a&gt;'))}</strong></h5>

-           <div class="text-center" style="margin-bottom:10px">Use of Fedora services is subject to these terms starting May 25, 2018.</div>

+           <div class="text-center" style="margin-bottom:10px">${_('Use of Fedora services is subject to these terms starting May 25, 2018.')}</div>

          </div>

        </div>

      </div>

@@ -48,7 +48,7 @@

  	</div>

  	<div class="col-xs-12">

            <h3>${_('How do I turn the Live image into bootable media?')}</h3>

- 	  <p>${Markup(_('After you download the image, you will make bootable media from it. Either &lt;a href="%s"&gt;burn the image to a blank DVD disc&lt;/a&gt;, or &lt;a href="%s"&gt;write the image to a USB flash drive&lt;/a&gt;.') % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Preparing_for_Installation/#_creating_a_boot_cd_or_dvd', 'https://fedoraproject.org/wiki/How_to_create_and_use_Live_USB'))}</p>

+ 	  <p>${Markup(_('After you download the image, you will make bootable media from it. Either &lt;a href="%s"&gt;burn the image to a blank DVD disc&lt;/a&gt;, or &lt;a href="%s"&gt;write the image to a USB flash drive&lt;/a&gt;.') % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Preparing_for_Installation/#_creating_a_boot_cd_or_dvd', 'https://docs.fedoraproject.org/en-US/quick-docs/creating-and-using-a-live-installation-image/index.html'))}</p>

  	  <h3>${_('How do I boot from the media?')}</h3>

  	  <p>${Markup(_("Consult your computer system's documentation for the procedure to boot from media other than the built-in hard disk. The process may differ based on the manufacturer and model of your computer. You may find &lt;a href='%s'&gt;these common tips&lt;/a&gt; useful.") % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Booting_the_Installation/#sect-preparing-boot'))}</p>

  	  <xi:include href="../../../templates/generic/docs-links.html" />

@@ -43,7 +43,7 @@

              <div class="fmw-linux hidden">

                <p><a class="btn btn-success ws-download-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso" role="button">${_('Download')}</a></p>

                <p>${Markup(_('64-bit %s GB ISO for &lt;strong&gt;Linux&lt;/strong&gt;.')) % global_variables.iso_size['x86_64_workstation']}</p>

-               <p>${Markup(_('A download is only needed for new installs. To upgrade, &lt;a href="%s"&gt;follow these instructions.&lt;/a&gt;') % ('https://docs.fedoraproject.org/quick-docs/en-US/upgrading.html'))}</p>

+               <p>${Markup(_('A download is only needed for new installs. To upgrade, &lt;a href="%s"&gt;follow these instructions.&lt;/a&gt;') % ('https://docs.fedoraproject.org/en-US/quick-docs/upgrading/index.html'))}</p>

              </div>

              <div class="fmw-windows hidden">

                <p><a class="btn btn-success" href="https://getfedora.org/fmw/FedoraMediaWriter-win32-${global_variables.release['fmw']}.exe" role="button">${_('Download')}</a></p>

@@ -53,7 +53,7 @@

  	</div>

  	<div class="col-xs-12">

            <h3>${_('How do I turn the Live image into bootable media?')}</h3>

- 	  <p>${Markup(_('After you download the image, you will make bootable media from it. Either &lt;a href="%s"&gt;burn the image to a blank DVD disc&lt;/a&gt;, or &lt;a href="%s"&gt;write the image to a USB flash drive&lt;/a&gt;.') % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Preparing_for_Installation/#_creating_a_boot_cd_or_dvd', 'https://fedoraproject.org/wiki/How_to_create_and_use_Live_USB'))}</p>

+ 	  <p>${Markup(_('After you download the image, you will make bootable media from it. Either &lt;a href="%s"&gt;burn the image to a blank DVD disc&lt;/a&gt;, or &lt;a href="%s"&gt;write the image to a USB flash drive&lt;/a&gt;.') % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Preparing_for_Installation/#_creating_a_boot_cd_or_dvd', 'https://docs.fedoraproject.org/en-US/quick-docs/creating-and-using-a-live-installation-image/index.html'))}</p>

  	  <h3>${_('How do I boot from the media?')}</h3>

  	  <p>${Markup(_("Consult your computer system's documentation for the procedure to boot from media other than the built-in hard disk. The process may differ based on the manufacturer and model of your computer. You may find &lt;a href='%s'&gt;these common tips&lt;/a&gt; useful.") % ('https://docs.fedoraproject.org/en-US/fedora/f29/install-guide/install/Booting_the_Installation/#sect-preparing-boot'))}</p>

  	  <xi:include href="../../../templates/generic/docs-links.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/index.html">${_('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>
@@ -107,4 +107,4 @@

              </div>

          </div>

      </footer>

- </html>

+ </html> 

\ No newline at end of file

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>

@@ -14,18 +14,18 @@

                          <h3 class="widget-title">${_('About')}</h3>

                          <div class="widget-body">

                              <dl>

-                                 <dd><a href="//fedoraproject.org/wiki/Overview">${_('About Fedora')}</a></dd>

+                                 <dd><a href="https://docs.fedoraproject.org/en-US/project/">${_('About Fedora')}</a></dd>

                                  <dd><a href="//getfedora.org/${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/index.html">${_('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>

@@ -23,7 +23,7 @@

          <li class="left"><a href="https://fedoraproject.org/wiki/Legal:Trademark_guidelines">${Markup(_('Trademark Guidelines'))}</a></li>

          <li class="left"><a href="https://fedoraproject.org/wiki/Legal:Licenses?rd=Legal/Licenses#This_Website">${Markup(_('Content License'))}</a></li>

          <li class="left"><a href="https://getfedora.org/sponsors">${Markup(_('Sponsors'))}</a></li>

-         <li class="left"><a href="https://docs.fedoraproject.org/fedora-project/project/code-of-conduct.html">${Markup(_('Fedora Code of Conduct'))}</a></li>

+         <li class="left"><a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/index.html">${Markup(_('Fedora Code of Conduct'))}</a></li>

        </ul>

        </div>

      </footer>

link:
issues #884 "The second line of the header of the privacy policy has not been included in the translation yet."
issues #866 "Update to new Fedora Docs links, fix Google+ URL, correct Fedora Planet name, don't show Free Media"

6 new commits added

  • Update start.fedoraproject.org/data/templates/footer.html
  • Update spins.fedoraproject.org/data/templates/footer.html
  • Update labs.fedoraproject.org/data/templates/footer.html
  • Update flocktofedora.org/data/templates/footer.html
  • Update arm.fedoraproject.org/data/templates/footer.html
  • Update alt.fedoraproject.org/data/templates/footer.html
3 years ago

I'm good with these changes.
I'd like if someone else could bless this too.
:thumbsup:

6 new commits added

  • Update spins.fedoraproject.org/data/templates/footer.html
  • Update labs.fedoraproject.org/data/templates/footer.html
  • Update getfedora.org/data/templates/footer.html
  • Update flocktofedora.org/data/templates/footer.html
  • Update arm.fedoraproject.org/data/templates/footer.html
  • Update alt.fedoraproject.org/data/templates/footer.html
3 years ago

2 new commits added

  • Update alt.fedoraproject.org/data/templates/footer.html
  • Update iot.fedoraproject.org/data/templates/footer.html
3 years ago

1 new commit added

  • Update getfedora.org/data/content/workstation/download/ws-download-splash.html
3 years ago

2 new commits added

  • Update getfedora.org/data/content/workstation/download/index.html
  • Update getfedora.org/data/content/server/download/server-download-splash.html
3 years ago

Gnome Community has "Planet Gnome", therefore I don’t intend to change "Planet Fedora".

There's been a lot of changes to the site.
You should rebase against master branch, so that this can be merged in.

Issue #884 is fixed already.

OK, then i'll close this. If not, we can reopen it.

Pull-Request has been closed by sijis

3 years ago