From c3cb7604120a155fabcc767170e8564cf0882411 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 10 Jan 2024 20:33:25 +0100
Subject: [PATCH] misc: Use the new mutter.gnome.org URL

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3514>
---
 README.md                                   | 12 ++++++------
 doc/reference/cally/cally.toml.in           |  2 +-
 doc/reference/cally/urlmap.js               |  2 +-
 doc/reference/clutter/clutter.toml.in       |  2 +-
 doc/reference/clutter/urlmap.js             |  4 ++--
 doc/reference/cogl-pango/cogl-pango.toml.in |  2 +-
 doc/reference/cogl-pango/urlmap.js          |  2 +-
 doc/reference/cogl/cogl.toml.in             |  2 +-
 doc/reference/cogl/urlmap.js                |  2 +-
 doc/reference/meta/meta.toml.in             |  2 +-
 doc/reference/meta/urlmap.js                |  6 +++---
 doc/reference/mtk/mtk.toml.in               |  2 +-
 doc/website/404.html                        | 16 +++++++++-------
 doc/website/index.html                      | 20 ++++++++++----------
 14 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index a32db16c6..0e58440ca 100644
--- a/README.md
+++ b/README.md
@@ -41,12 +41,12 @@ documentation and API references below first.
 
 ## API Reference
 
-- Meta: <https://gnome.pages.gitlab.gnome.org/mutter/meta/>
-- Clutter: <https://gnome.pages.gitlab.gnome.org/mutter/clutter/>
-- Cally: <https://gnome.pages.gitlab.gnome.org/mutter/cally/>
-- Cogl: <https://gnome.pages.gitlab.gnome.org/mutter/cogl/>
-- CoglPango: <https://gnome.pages.gitlab.gnome.org/mutter/cogl-pango/>
-- Mtk: <https://gnome.pages.gitlab.gnome.org/mutter/mtk/>
+- Meta: <https://mutter.gnome.org/meta/>
+- Clutter: <https://mutter.gnome.org/clutter/>
+- Cally: <https://mutter.gnome.org/cally/>
+- Cogl: <https://mutter.gnome.org/cogl/>
+- CoglPango: <https://mutter.gnome.org/cogl-pango/>
+- Mtk: <https://mutter.gnome.org/mtk/>
 
 ## License
 
diff --git a/doc/reference/cally/cally.toml.in b/doc/reference/cally/cally.toml.in
index 4b57c747f..2b1a111c5 100644
--- a/doc/reference/cally/cally.toml.in
+++ b/doc/reference/cally/cally.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/reference/cally/urlmap.js b/doc/reference/cally/urlmap.js
index 05f1ee30a..51a8da1ca 100644
--- a/doc/reference/cally/urlmap.js
+++ b/doc/reference/cally/urlmap.js
@@ -7,5 +7,5 @@ baseURLs = [
     [ 'GObject', 'https://docs.gtk.org/gobject/' ],
     [ 'Gio', 'https://docs.gtk.org/gio/' ],
     [ 'Atk', 'https://docs.gtk.org/atk/' ],
-    [ 'Clutter', 'https://gnome.pages.gitlab.gnome.org/mutter/clutter/' ],
+    [ 'Clutter', 'https://mutter.gnome.org/clutter/' ],
 ]
diff --git a/doc/reference/clutter/clutter.toml.in b/doc/reference/clutter/clutter.toml.in
index ffd7020ec..5878bccf0 100644
--- a/doc/reference/clutter/clutter.toml.in
+++ b/doc/reference/clutter/clutter.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/reference/clutter/urlmap.js b/doc/reference/clutter/urlmap.js
index 574334b2a..8cf206cad 100644
--- a/doc/reference/clutter/urlmap.js
+++ b/doc/reference/clutter/urlmap.js
@@ -7,6 +7,6 @@ baseURLs = [
     [ 'GObject', 'https://docs.gtk.org/gobject/' ],
     [ 'Gio', 'https://docs.gtk.org/gio/' ],
     [ 'Atk', 'https://docs.gtk.org/atk/' ],
-    [ 'Mtk', 'https://gnome.pages.gitlab.gnome.org/mutter/mtk/' ],
-    [ 'Cogl', 'https://gnome.pages.gitlab.gnome.org/mutter/cogl/' ],
+    [ 'Mtk', 'https://mutter.gnome.org/mtk/' ],
+    [ 'Cogl', 'https://mutter.gnome.org/cogl/' ],
 ]
diff --git a/doc/reference/cogl-pango/cogl-pango.toml.in b/doc/reference/cogl-pango/cogl-pango.toml.in
index eabe8902e..a994e71b1 100644
--- a/doc/reference/cogl-pango/cogl-pango.toml.in
+++ b/doc/reference/cogl-pango/cogl-pango.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/reference/cogl-pango/urlmap.js b/doc/reference/cogl-pango/urlmap.js
index 45131ab42..e0f4194e8 100644
--- a/doc/reference/cogl-pango/urlmap.js
+++ b/doc/reference/cogl-pango/urlmap.js
@@ -6,5 +6,5 @@ baseURLs = [
     [ 'GObject', 'https://docs.gtk.org/gobject/' ],
     [ 'Pango', 'https://docs.gtk.org/Pango/' ],
     [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
-    [ 'Cogl', 'https://gnome.pages.gitlab.gnome.org/mutter/cogl/' ],
+    [ 'Cogl', 'https://mutter.gnome.org/cogl/' ],
 ]
diff --git a/doc/reference/cogl/cogl.toml.in b/doc/reference/cogl/cogl.toml.in
index 9d1bbc177..b3f271bd1 100644
--- a/doc/reference/cogl/cogl.toml.in
+++ b/doc/reference/cogl/cogl.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/reference/cogl/urlmap.js b/doc/reference/cogl/urlmap.js
index 14d364610..3f8bc3a35 100644
--- a/doc/reference/cogl/urlmap.js
+++ b/doc/reference/cogl/urlmap.js
@@ -7,5 +7,5 @@ baseURLs = [
     [ 'GObject', 'https://docs.gtk.org/gobject/' ],
     [ 'Gio', 'https://docs.gtk.org/gio/' ],
     [ 'GdkPixbuf', 'https://docs.gtk.org/gdk-pixbuf/' ],
-    [ 'Mtk', 'https://gnome.pages.gitlab.gnome.org/mutter/mtk/' ],
+    [ 'Mtk', 'https://mutter.gnome.org/mtk/' ],
 ]
diff --git a/doc/reference/meta/meta.toml.in b/doc/reference/meta/meta.toml.in
index d7f69803b..10eca48c9 100644
--- a/doc/reference/meta/meta.toml.in
+++ b/doc/reference/meta/meta.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/reference/meta/urlmap.js b/doc/reference/meta/urlmap.js
index 9e565dc69..5866ed20d 100644
--- a/doc/reference/meta/urlmap.js
+++ b/doc/reference/meta/urlmap.js
@@ -6,7 +6,7 @@ baseURLs = [
     [ 'GLib', 'https://docs.gtk.org/glib/' ],
     [ 'GObject', 'https://docs.gtk.org/gobject/' ],
     [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Mtk', 'https://gnome.pages.gitlab.gnome.org/mutter/mtk/' ],
-    [ 'Cogl', 'https://gnome.pages.gitlab.gnome.org/mutter/cogl/' ],
-    [ 'Clutter', 'https://gnome.pages.gitlab.gnome.org/mutter/clutter/' ],
+    [ 'Mtk', 'https://mutter.gnome.org/mtk/' ],
+    [ 'Cogl', 'https://mutter.gnome.org/cogl/' ],
+    [ 'Clutter', 'https://mutter.gnome.org/clutter/' ],
 ]
diff --git a/doc/reference/mtk/mtk.toml.in b/doc/reference/mtk/mtk.toml.in
index 9495bc8c0..dfff81bba 100644
--- a/doc/reference/mtk/mtk.toml.in
+++ b/doc/reference/mtk/mtk.toml.in
@@ -3,7 +3,7 @@ version = "@version@"
 browse_url = "https://gitlab.gnome.org/GNOME/mutter/"
 repository_url = "https://gitlab.gnome.org/GNOME/mutter.git"
 website_url = "https://blogs.gnome.org/shell-dev/"
-docs_url = "https://gnome.pages.gitlab.gnome.org/mutter/"
+docs_url = "https://mutter.gnome.org/"
 logo_url = "logo.svg"
 authors = "Mutter Development Team"
 license = "GPL-2.0-or-later"
diff --git a/doc/website/404.html b/doc/website/404.html
index db3d08d01..0f3d52e08 100644
--- a/doc/website/404.html
+++ b/doc/website/404.html
@@ -9,8 +9,8 @@
 
   <title>Mutter</title>
 
-  <link rel="canonical" href="https://gnome.pages.gitlab.gnome.org/mutter/404.html" />
-  <link rel="alternate" type="application/rss+xml" title="Mutter" href="https://gnome.pages.gitlab.gnome.org/mutter/feed.xml" />
+  <link rel="canonical" href="https://mutter.gnome.org/404.html" />
+  <link rel="alternate" type="application/rss+xml" title="Mutter" href="https://mutter.gnome.org/feed.xml" />
 
   <link rel="stylesheet" href="/style.css" />
   
@@ -19,7 +19,7 @@
   
   <!-- Twitter -->
   <meta property="twitter:title" content="Mutter" />
-  <meta property="twitter:image" content="https://gnome.pages.gitlab.gnome.org/mutter/assets/card.png" />
+  <meta property="twitter:image" content="https://mutter.gnome.org/assets/card.png" />
   <meta property="twitter:card" content="summary_large_image" />
   <meta property="twitter:description" content="Mutter Window Manager website." />
 
@@ -27,7 +27,7 @@
   <meta property="og:title" content="Mutter" />
   <meta property="og:url" content="https://mutter.gnome.org" />
   <meta property="og:description" content="Mutter Window Manager website." />
-  <meta property="og:image" content="https://gnome.pages.gitlab.gnome.org/mutter/assets/card.png" />
+  <meta property="og:image" content="https://mutter.gnome.org/assets/card.png" />
 </head>
 
 
@@ -45,14 +45,16 @@
 
 <p>The requested page could not be found. If you feel this is not normal, then you create an issue on the Gitlab.</p>
 
-<p class="dialog-buttons"><a href="javascript:window.history.go(-1);" class="inline-button">Go Back</a> <a href="https://gitlab.gnome.org/Teams/Websites/mutter.gnome.org/issues">File an issue</a></p>
+<p class="dialog-buttons"><a href="javascript:window.history.go(-1);" class="inline-button">Go Back</a> <a href="https://gitlab.gnome.org/GNOME/mutter/-/issues">File an issue</a></p>
 
     </div>
 
     <footer class="site-footer">
-  <p>&copy; Mutter, 2021 &ndash; 2023</p>
+  <p>&copy; Mutter, 2021 &ndash; 2024</p>
 
-  <p><a href="https://gitlab.gnome.org/Teams/Websites/mutter.gnome.org">Website source</a></p>
+  <p><a
+    href="https://gitlab.gnome.org/GNOME/mutter/-/tree/main/doc/website?ref_type=heads">Website
+    source</a></p>
 </footer>
 
 
diff --git a/doc/website/index.html b/doc/website/index.html
index 75ee49775..050b81d4d 100644
--- a/doc/website/index.html
+++ b/doc/website/index.html
@@ -9,9 +9,9 @@
 
   <title>Mutter</title>
 
-  <link rel="canonical" href="https://gnome.pages.gitlab.gnome.org/mutter/" />
+  <link rel="canonical" href="https://mutter.gnome.org/" />
   <link rel="alternate" type="application/rss+xml" title="Mutter"
-    href="https://gnome.pages.gitlab.gnome.org/mutter/feed.xml" />
+    href="https://mutter.gnome.org/feed.xml" />
 
   <link rel="stylesheet" href="style.css" />
 
@@ -20,7 +20,7 @@
 
   <!-- Twitter -->
   <meta property="twitter:title" content="Mutter" />
-  <meta property="twitter:image" content="https://gnome.pages.gitlab.gnome.org/mutter/assets/card.png" />
+  <meta property="twitter:image" content="https://mutter.gnome.org/assets/card.png" />
   <meta property="twitter:card" content="summary_large_image" />
   <meta property="twitter:description" content="Mutter Window Manager website." />
 
@@ -28,7 +28,7 @@
   <meta property="og:title" content="Mutter" />
   <meta property="og:url" content="https://mutter.gnome.org" />
   <meta property="og:description" content="Mutter Window Manager website." />
-  <meta property="og:image" content="https://gnome.pages.gitlab.gnome.org/mutter/assets/card.png" />
+  <meta property="og:image" content="https://mutter.gnome.org/assets/card.png" />
 </head>
 
 
@@ -73,13 +73,13 @@
 
     <ul class="tiles">
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/meta/">
+      <li><a href="https://mutter.gnome.org/meta/">
           <h3>Meta</h3>
           <p>The display server and window manager library. Contains a X11 window manager and compositing manager
             implementation, as well as a Wayland display server implementation.</p>
         </a></li>
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/clutter/">
+      <li><a href="https://mutter.gnome.org/clutter/">
           <h3>Clutter</h3>
           <p>
             Compositing toolkit, containing an actor and render node based scene graph, and has features such as input
@@ -88,23 +88,23 @@
           </p>
         </a></li>
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/cally/">
+      <li><a href="https://mutter.gnome.org/cally/">
           <h3>Cally</h3>
           <p>The Clutter Accessibility Implementation Library.</p>
         </a></li>
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/cogl/">
+      <li><a href="https://mutter.gnome.org/cogl/">
           <h3>Cogl</h3>
           <p>Hardware acceleration pipeline abstraction layer. Handles things like allocating framebuffer, allocating,
             importing and drawing textures, internally using OpenGL.</p>
         </a></li>
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/cogl-pango/">
+      <li><a href="https://mutter.gnome.org/cogl-pango/">
           <h3>CoglPango</h3>
           <p>A Low Level GPU Graphics and Utilities API.</p>
         </a></li>
 
-      <li><a href="https://gnome.pages.gitlab.gnome.org/mutter/mtk/">
+      <li><a href="https://mutter.gnome.org/mtk/">
           <h3>Mtk</h3>
           <p>The Meta Toolkit containing utilities shared by other parts of mutter.</p>
         </a></li>