Merge branch 'ebassi/for-master' into 'master'

Ebassi/for master

See merge request GNOME/gtk!3321
This commit is contained in:
Emmanuele Bassi 2021-03-19 17:57:42 +00:00
commit dae59112d7

View File

@ -63,7 +63,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
<div class="docblock"> <div class="docblock">
<h5 id="gio">GIO</h5> <h5 id="gio">GIO</h5>
<p>GIO provides a portable, modern and easy-to-use file system <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> 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 IPC specification; an application settings API; portable networking
abstractions; and additional utilities for writing asynchronous abstractions; and additional utilities for writing asynchronous
@ -79,11 +79,23 @@ SPDX-License-Identifier: LGPL-2.1-or-later
</h4> </h4>
<div class="docblock"> <div class="docblock">
<h5 id="cairo">Cairo</h5> <h5 id="gdk">GTK</h5>
<p>Cairo is a 2D graphics library with support for multiple output <p>GTK is the primary library used to construct user interfaces. It
devices. It is designed to produce consistent, high quality output provides user interface controls and signal callbacks to respond to
on all media.</p> user actions.</p>
<p><a href="https://www.cairographics.org/docs/" class="external">Cairo API reference</a></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>
<div class="docblock"> <div class="docblock">
@ -101,23 +113,11 @@ SPDX-License-Identifier: LGPL-2.1-or-later
</div> </div>
<div class="docblock"> <div class="docblock">
<h5 id="gdk">GDK</h5> <h5 id="cairo">Cairo</h5>
<p>An intermediate layer which isolates GTK from the details of the windowing system.</p> <p>Cairo is a 2D graphics library with support for multiple output
<p><a href="https://gnome.pages.gitlab.gnome.org/gtk/gdk4/" class="external">GDK API reference</a></p> devices. It is designed to produce consistent, high quality output
</div> on all media.</p>
<p><a href="https://www.cairographics.org/docs/" class="external">Cairo API reference</a></p>
<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>
</div> </div>
</div> </div>
</section> </section>