[gtkmm-documentation/gtkmm-3-24] Change git.gnome.org to gitlab.gnome.org

[Kjell Ahlstedt <kjellahl src gnome org>]

commit ee21811923b8e6565759ac8627aecd42a0d3de15
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Jan 7 14:20:49 2020 +0100

    Change git.gnome.org to gitlab.gnome.org
    
    * docs/tutorial/C/index-in.docbook: Change URLs.
    * docs/tutorial/insert_example_code.pl: Don't add url_examples_branchsuffix.
    The branch is not a suffix in gitlab, it's included in url_examples_base.

 docs/tutorial/C/index-in.docbook     | 17 +++++------------
 docs/tutorial/insert_example_code.pl |  8 ++++----
 2 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index 435ab91..f9e0f92 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -8,8 +8,8 @@
   <!ENTITY url_refdocs_base_gtk "&url_refdocs_base_gtk_html;classGtk_1_1">
   <!ENTITY url_refdocs_base_gtk_namespace "&url_refdocs_base_gtk_html;namespaceGtk_1_1">
   <!ENTITY url_figures_base "figures/">
-  <!ENTITY url_examples_base "http://git.gnome.org/browse/gtkmm-documentation/tree/examples/book/";>
-  <!ENTITY url_examples_branchsuffix "gtkmm-3-24">
+  <!ENTITY url_examples_branch "gtkmm-3-24">
+  <!ENTITY url_examples_base 
"https://gitlab.gnome.org/GNOME/gtkmm-documentation/tree/&url_examples_branch;/examples/book/";>
   <!ENTITY gtkmm "<application>gtkmm</application>">
   <!ENTITY uuml "&#252;" >
   <!ENTITY szlig "&#223;" >
@@ -18,13 +18,6 @@
   <!ENTITY nbsp "&#160;" >
 ]>
 
-<!-- At present (2018-11-09) links to git.gnome.org are redirected to the
-corresponding part of gitlab.gnome.org. If url_examples_base is updated to
-point to gitlab.gnome.org, insert_example_code.pl must also be updated.
-The search path after xxx.gnome.org/ is not the same in gitlab.gnome.org
-as in git.gnome.org. /Kjell Ahlstedt
--->
-
 <!--
 NOTE TO TUTORIAL DOCUMENTATION AUTHORS:
 When referring to the gtkmm project in this document, please use the form
@@ -6856,7 +6849,7 @@ This example shows how to load a <application>Glade</application> file at runtim
         <application>automake</application> and
         <application>autoconf</application>) to build your project, and
         that you are using <ulink
-          url="http://git.gnome.org/browse/gnome-common/tree/autogen.sh";>
+          url="https://gitlab.gnome.org/GNOME/gnome-common/blob/master/autogen.sh";>
           <literal>./autogen.sh</literal> from
           <application>gnome-common</application></ulink>
         or a similar <literal>autogen.sh</literal> file, which, among other
@@ -9466,8 +9459,8 @@ $ jhbuild sanitycheck</screen>
 <title>Copying the skeleton project</title>
 
 <para>Typically our wrapper library would be called libsomethingmm. We can start by
-  copying the <ulink url="http://git.gnome.org/browse/mm-common/tree/skeletonmm";>skeleton
-  source tree</ulink> from the mm-common module.
+  copying the <ulink url="https://gitlab.gnome.org/GNOME/mm-common/tree/master/skeletonmm";>
+  skeleton source tree</ulink> from the mm-common module.
 <programlisting>
   $ git clone https://gitlab.gnome.org/GNOME/mm-common.git
   $ cp -a mm-common/skeletonmm libsomethingmm
diff --git a/docs/tutorial/insert_example_code.pl b/docs/tutorial/insert_example_code.pl
index 018a495..27d9463 100755
--- a/docs/tutorial/insert_example_code.pl
+++ b/docs/tutorial/insert_example_code.pl
@@ -19,10 +19,10 @@ use strict;
 
       if(/<para><ulink url=\"&url_examples_base;([\/\w]+)\">Source 
Code<\/ulink><\/para>\s*(?:<!--\s*Insert\s+(.*?)-->)?/)
       {
-        #Modify the line to add the branch, so people see the correct version.
-        #This is particularly important during major API changes every few years,
-        #when the API might no longer even exist in the new version.
-        print "<para><ulink url=\"&url_examples_base;${1}?h=&url_examples_branchsuffix;\">Source 
Code<\/ulink><\/para>\n";
+        # Modify the line to remove the trailing comment, if any.
+        # url_examples_base is assumed to be a GitLab URL. The branch is then
+        # included in url_examples_base. No need to add it here.
+        print "<para><ulink url=\"&url_examples_base;$1\">Source Code</ulink></para>\n";
 
         #List all the source files in that directory:
         my $directory = $examples_base . $1;