summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2021-03-19 17:57:42 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2021-03-19 17:57:42 +0000
commitdae59112d75a7d9a1e9777321e41d105a9630441 (patch)
tree9b759a987a5a64d140c11321cc769b98f8782720
parent830efa6ce2611860c3c0ad264a2c6ac0d1810b14 (diff)
parentf25beff7a6102d2b4719ab6060aa34f5782fd6b6 (diff)
downloadgtk+-dae59112d75a7d9a1e9777321e41d105a9630441.tar.gz
Merge branch 'ebassi/for-master' into 'master'
Ebassi/for master See merge request GNOME/gtk!3321
-rw-r--r--.gitlab-ci/pages/index.html46
1 files changed, 23 insertions, 23 deletions
diff --git a/.gitlab-ci/pages/index.html b/.gitlab-ci/pages/index.html
index c47f00b7b1..79f6e44358 100644
--- a/.gitlab-ci/pages/index.html
+++ b/.gitlab-ci/pages/index.html
@@ -63,7 +63,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
<div class="docblock">
<h5 id="gio">GIO</h5>
<p>GIO provides a portable, modern and easy-to-use file system
- abstraction API for accessing locale and remote files; a set of
+ abstraction API for accessing local and remote files; a set of
low and high level abstractions over the <a href="https://www.freedesktop.org/wiki/Software/dbus/" class="external">DBus</a>
IPC specification; an application settings API; portable networking
abstractions; and additional utilities for writing asynchronous
@@ -79,11 +79,23 @@ SPDX-License-Identifier: LGPL-2.1-or-later
</h4>
<div class="docblock">
- <h5 id="cairo">Cairo</h5>
- <p>Cairo is a 2D graphics library with support for multiple output
- devices. It is designed to produce consistent, high quality output
- on all media.</p>
- <p><a href="https://www.cairographics.org/docs/" class="external">Cairo API reference</a></p>
+ <h5 id="gdk">GTK</h5>
+ <p>GTK is the primary library used to construct user interfaces. It
+ provides user interface controls and signal callbacks to respond to
+ user actions.</p>
+ <p><a href="https://docs.gtk.org/gtk4/" class="external">GTK API reference</a></p>
+ </div>
+
+ <div class="docblock">
+ <h5 id="gdk">GSK</h5>
+ <p>An intermediate layer which provides a rendering API implemented using Cairo, OpenGL or Vulkan.</p>
+ <p><a href="https://docs.gtk.org/gsk4/" class="external">GDK API reference</a></p>
+ </div>
+
+ <div class="docblock">
+ <h5 id="gdk">GDK</h5>
+ <p>An intermediate layer which isolates GTK from the details of the windowing system.</p>
+ <p><a href="https://docs.gtk.org/gdk4/" class="external">GDK API reference</a></p>
</div>
<div class="docblock">
@@ -101,23 +113,11 @@ SPDX-License-Identifier: LGPL-2.1-or-later
</div>
<div class="docblock">
- <h5 id="gdk">GDK</h5>
- <p>An intermediate layer which isolates GTK from the details of the windowing system.</p>
- <p><a href="https://gnome.pages.gitlab.gnome.org/gtk/gdk4/" class="external">GDK API reference</a></p>
- </div>
-
- <div class="docblock">
- <h5 id="gdk">GSK</h5>
- <p>An intermediate layer which provides a rendering API implemented using Cairo, OpenGL or Vulkan.</p>
- <p><a href="https://gnome.pages.gitlab.gnome.org/gtk/gsk4/" class="external">GDK API reference</a></p>
- </div>
-
- <div class="docblock">
- <h5 id="gdk">GTK</h5>
- <p>GTK is the primary library used to construct user interfaces. It
- provides user interface controls and signal callbacks to respond to
- user actions.</p>
- <p><a href="https://gnome.pages.gitlab.gnome.org/gtk/gtk4/" class="external">GTK API reference</a></p>
+ <h5 id="cairo">Cairo</h5>
+ <p>Cairo is a 2D graphics library with support for multiple output
+ devices. It is designed to produce consistent, high quality output
+ on all media.</p>
+ <p><a href="https://www.cairographics.org/docs/" class="external">Cairo API reference</a></p>
</div>
</div>
</section>