From 49b5b358d7246f5af6c2a99d163e4984f264abf4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 22 Oct 2018 02:37:27 +0200 Subject: [PATCH] Magnum has HTTPS now. --- doc/css/page-layout.rst | 2 +- doc/css/themes.rst | 2 +- doc/pelican/theme.rst | 2 +- doc/plugins/links.rst | 4 ++-- doxygen/test/contents_tagfile/Doxyfile | 2 +- doxygen/test/contents_tagfile/index.html | 2 +- doxygen/test/test_utility.py | 2 +- pelican-plugins/m/test/dox/page.html | 26 ++++++++++++------------ pelican-plugins/m/test/test_dox.py | 2 +- site/pelicanconf.py | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/css/page-layout.rst b/doc/css/page-layout.rst index 531f78c3..719a5546 100644 --- a/doc/css/page-layout.rst +++ b/doc/css/page-layout.rst @@ -440,7 +440,7 @@ the following markup in front of your page content --- an outer .. note-info:: Real-world example of a page with cover image can be seen on the - `Magnum Engine website `_. + `Magnum Engine website `_. `Breadcrumb navigation`_ ------------------------ diff --git a/doc/css/themes.rst b/doc/css/themes.rst index b3776d73..f6f4053e 100644 --- a/doc/css/themes.rst +++ b/doc/css/themes.rst @@ -75,7 +75,7 @@ is below: -This theme is used on this site and also on http://magnum.graphics. +This theme is used on this site and also on https://magnum.graphics. `Light`_ ======== diff --git a/doc/pelican/theme.rst b/doc/pelican/theme.rst index f9c2bf9d..046fa107 100644 --- a/doc/pelican/theme.rst +++ b/doc/pelican/theme.rst @@ -466,7 +466,7 @@ for details about how the cover image affects page layout. .. note-info:: Real-world example of a page with cover image can be seen on the - `Magnum Engine website `_. + `Magnum Engine website `_. `Page header and footer`_ ------------------------- diff --git a/doc/plugins/links.rst b/doc/plugins/links.rst index 3669aed4..de607ca2 100644 --- a/doc/plugins/links.rst +++ b/doc/plugins/links.rst @@ -244,8 +244,8 @@ work. Example configuration: PLUGINS += ['m.dox'] M_DOX_TAGFILES = [ - ('doxygen/corrade.tag', 'http://doc.magnum.graphics/corrade/', ['Corrade::']), - ('doxygen/magnum.tag', 'http://doc.magnum.graphics/magnum/', ['Magnum::'])] + ('doxygen/corrade.tag', 'https://doc.magnum.graphics/corrade/', ['Corrade::']), + ('doxygen/magnum.tag', 'https://doc.magnum.graphics/magnum/', ['Magnum::'])] Use the :rst:`:dox:` interpreted text role for linking to documented symbols. All link targets understood by Doxygen's ``@ref`` or ``@link`` commands are diff --git a/doxygen/test/contents_tagfile/Doxyfile b/doxygen/test/contents_tagfile/Doxyfile index fa4481d6..0b52ac8b 100644 --- a/doxygen/test/contents_tagfile/Doxyfile +++ b/doxygen/test/contents_tagfile/Doxyfile @@ -1,5 +1,5 @@ INPUT = input.dox -TAGFILES = ../../../doc/doxygen/corrade.tag=http://doc.magnum.graphics/corrade/ +TAGFILES = ../../../doc/doxygen/corrade.tag=https://doc.magnum.graphics/corrade/ QUIET = YES GENERATE_HTML = NO GENERATE_LATEX = NO diff --git a/doxygen/test/contents_tagfile/index.html b/doxygen/test/contents_tagfile/index.html index c25d006b..5ce0d48a 100644 --- a/doxygen/test/contents_tagfile/index.html +++ b/doxygen/test/contents_tagfile/index.html @@ -22,7 +22,7 @@

My Project

-

See CORRADE_INTERNAL_ASSERT() for more information.

Corrade::Utility::Resource rx;
+

See CORRADE_INTERNAL_ASSERT() for more information.

Corrade::Utility::Resource rx;
diff --git a/doxygen/test/test_utility.py b/doxygen/test/test_utility.py index 2df7a5a9..169826e9 100644 --- a/doxygen/test/test_utility.py +++ b/doxygen/test/test_utility.py @@ -30,5 +30,5 @@ class Utility(unittest.TestCase): def test_add_wbr(self): self.assertEqual(add_wbr('Corrade::Containers'), 'Corrade::Containers') self.assertEqual(add_wbr('CORRADE_TEST_MAIN()'), 'CORRADE_TEST_MAIN()') - self.assertEqual(add_wbr('http://magnum.graphics/showcase/'), 'http://magnum.graphics/showcase/') + self.assertEqual(add_wbr('https://magnum.graphics/showcase/'), 'https://magnum.graphics/showcase/') self.assertEqual(add_wbr('a'), 'a') diff --git a/pelican-plugins/m/test/dox/page.html b/pelican-plugins/m/test/dox/page.html index 33e05c4e..64f49a99 100644 --- a/pelican-plugins/m/test/dox/page.html +++ b/pelican-plugins/m/test/dox/page.html @@ -24,26 +24,26 @@

m.dox

These should produce warnings:

  • Link to nonexistent name will be rendered as code: nonExistent()
  • Link to nonexistent name with custom title will be just text
  • Link to a section that doesn't have a title will keep the ID (this may -break on tagfile update, watch out): corrade-cmake-add-test
    • +break on tagfile update, watch out): corrade-cmake-add-test
  • Link to index page without title will have the tag file basename: -corrade
    • +corrade
diff --git a/pelican-plugins/m/test/test_dox.py b/pelican-plugins/m/test/test_dox.py index 5ffb5a84..b6c7d56e 100644 --- a/pelican-plugins/m/test/test_dox.py +++ b/pelican-plugins/m/test/test_dox.py @@ -32,7 +32,7 @@ class Dox(PluginTestCase): self.run_pelican({ 'PLUGINS': ['m.htmlsanity', 'm.dox'], 'M_DOX_TAGFILES': [ - ('../doc/doxygen/corrade.tag', 'http://doc.magnum.graphics/corrade/', ['Corrade::'])] + ('../doc/doxygen/corrade.tag', 'https://doc.magnum.graphics/corrade/', ['Corrade::'])] }) self.assertEqual(*self.actual_expected_contents('page.html')) diff --git a/site/pelicanconf.py b/site/pelicanconf.py index cfcb7335..06fd35c4 100644 --- a/site/pelicanconf.py +++ b/site/pelicanconf.py @@ -168,7 +168,7 @@ FORMATTED_FIELDS = ['summary', 'landing', 'header', 'footer', 'description', 'ba M_HTMLSANITY_SMART_QUOTES = True M_HTMLSANITY_HYPHENATION = True M_DOX_TAGFILES = [ - ('../doc/doxygen/corrade.tag', 'http://doc.magnum.graphics/corrade/', ['Corrade::'])] + ('../doc/doxygen/corrade.tag', 'https://doc.magnum.graphics/corrade/', ['Corrade::'])] if not shutil.which('latex'): logging.warning("LaTeX not found, fallback to rendering math as code") -- 2.30.2