7 files changed, 23 insertions, 30 deletions
diff --git a/docs/download.html b/docs/download.html
index 6b2b60cd606..86b4d5063c5 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -102,9 +102,9 @@ In the past, GLUT, GLU and the Mesa demos were released in conjunction with
 Mesa releases.  But since GLUT, GLU and the demos change infrequently, they
 were split off into their own git repositories:
 
-<a href="https://cgit.freedesktop.org/mesa/glut/">GLUT</a>,
-<a href="https://cgit.freedesktop.org/mesa/glu/">GLU</a> and
-<a href="https://cgit.freedesktop.org/mesa/demos/">Demos</a>,
+<a href="https://gitlab.freedesktop.org/mesa/glut">GLUT</a>,
+<a href="https://gitlab.freedesktop.org/mesa/glu">GLU</a> and
+<a href="https://gitlab.freedesktop.org/mesa/demos">Demos</a>,
 </p>
 
 </div>
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 9b7b5e00046..f9583e6761a 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -47,7 +47,7 @@ You can find some further To-do lists here:
 <b>Common To-Do lists:</b>
 </p>
 <ul>
-  <li><a href="https://cgit.freedesktop.org/mesa/mesa/tree/docs/features.txt">
+  <li><a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/features.txt">
     <b>features.txt</b></a> - Status of OpenGL 3.x / 4.x features in Mesa.</li>
 </ul>
 
diff --git a/docs/repository.html b/docs/repository.html
index 802c9a235cb..fa891273e21 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -35,9 +35,9 @@ You may access the repository either as an
 
 <p>
 You may also 
-<a href="https://cgit.freedesktop.org/mesa/mesa/"
+<a href="https://gitlab.freedesktop.org/mesa/mesa"
 >browse the main Mesa git repository</a> and the
-<a href="https://cgit.freedesktop.org/mesa/demos"
+<a href="https://gitlab.freedesktop.org/mesa/demos"
 >Mesa demos and tests git repository</a>.
 </p>
 
@@ -52,7 +52,7 @@ To get the Mesa sources anonymously (read-only):
 <li>Install the git software on your computer if needed.<br><br>
 <li>Get an initial, local copy of the repository with:
     <pre>
-    git clone git://anongit.freedesktop.org/git/mesa/mesa
+    git clone https://gitlab.freedesktop.org/mesa/mesa.git
     </pre>
 <li>Later, you can update your tree from the master repository with:
     <pre>
@@ -60,7 +60,7 @@ To get the Mesa sources anonymously (read-only):
     </pre>
 <li>If you also want the Mesa demos/tests repository:
     <pre>
-    git clone git://anongit.freedesktop.org/git/mesa/demos
+    git clone https://gitlab.freedesktop.org/mesa/demos.git
     </pre>
 </ol>
 
@@ -98,24 +98,17 @@ on a particular driver, add a new extension, etc.) in the bugzilla record.
 </ol>
 
 <p>
-Once your account is established:
-</p>
+Once your account is established, you can update your push url to use SSH:
+<pre>
+git remote set-url --push <em>origin</em> [email protected]:mesa/mesa.git
+</pre>
 
-<ol>
-<li>Get an initial, local copy of the repository with:
-    <pre>
-    git clone git+ssh://[email protected]/git/mesa/mesa
-    </pre>
-    Replace <em>username</em> with your actual login name.<br><br>
-<li>Later, you can update your tree from the master repository with:
-    <pre>
-    git pull origin
-    </pre>
-<li>If you also want the Mesa demos/tests repository:
-    <pre>
-    git clone git+ssh://[email protected]/git/mesa/demos
-    </pre>
-</ol>
+You can also use <a href="https://gitlab.freedesktop.org/profile/personal_access_tokens">personal access tokens</a>
+to push over HTTPS instead (useful for people behind strict proxies).
+In this case, create a token, and put it in the url as shown here:
+<pre>
+git remote set-url --push <em>origin</em> https://<em>USER</em>:<em>TOKEN</em>@gitlab.freedesktop.org/mesa/mesa.git
+</pre>
 
 
 <h2>Windows Users</h2>
diff --git a/docs/shading.html b/docs/shading.html
index a0bbe997c1b..9e3c7218e31 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -85,7 +85,7 @@ should match the filenames of the corresponding dumped shaders.
 <p>
 Setting <b>MESA_SHADER_CAPTURE_PATH</b> to a directory will cause the compiler
 to write <tt>.shader_test</tt> files for use with
-<a href="https://cgit.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
+<a href="https://gitlab.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
 which compiler developers can use to gather statistics about shaders
 (instructions, cycles, memory accesses, and so on).
 </p>
diff --git a/docs/sourcedocs.html b/docs/sourcedocs.html
index 660dcb2ef0e..10a0810ad22 100644
--- a/docs/sourcedocs.html
+++ b/docs/sourcedocs.html
@@ -31,7 +31,7 @@ the <code>doxygen</code> directory and run <code>make</code>.
 
 <p>
 For an example of Doxygen usage in Mesa, see a recent source file
-such as <a href="https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/main/bufferobj.c">bufferobj.c</a>.
+such as <a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/src/mesa/main/bufferobj.c">bufferobj.c</a>.
 </p>
 
 
diff --git a/docs/utilities.html b/docs/utilities.html
index 222e7343897..5d7cb17f9dc 100644
--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -17,7 +17,7 @@
 <h1>Development Utilities</h1>
 
 <dl>
-  <dt><a href="https://cgit.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
+  <dt><a href="https://gitlab.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
   <dd>includes several utility routines in the <code>src/util/</code>
   directory.</dd>
 
diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index dce4fc27598..4e0932e781f 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -143,7 +143,7 @@ Begin by saving your current directory location:
 <ul>
 <li>Mesa/Gallium master branch. This code is used to build libGL, and the direct rendering svga driver for libGL, vmwgfx_dri.so, and the X acceleration library libxatracker.so.x.x.x. 
   <pre>
-  git clone git://anongit.freedesktop.org/git/mesa/mesa
+  git clone https://gitlab.freedesktop.org/mesa/mesa.git
   </pre>
 <li>VMware Linux guest kernel module. Note that this repo contains the complete DRM and TTM code. The vmware-specific driver is really only the files prefixed with vmwgfx. 
   <pre>
@@ -153,7 +153,7 @@ Begin by saving your current directory location:
 Most distros ship with this but it's safest to install a newer version.
 To get the latest code from git:
   <pre>
-  git clone git://anongit.freedesktop.org/git/mesa/drm
+  git clone https://gitlab.freedesktop.org/mesa/drm.git
   </pre>
 <li>xf86-video-vmware. The chainloading driver, vmware_drv.so, the legacy driver vmwlegacy_drv.so, and the vmwgfx driver vmwgfx_drv.so. 
   <pre>