summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-05-02 07:23:32 -0400
committerMatthias Clasen <mclasen@redhat.com>2017-05-02 07:23:32 -0400
commit6ddfd516e6acf9582eafd02874525a26281765de (patch)
tree16b9e86b7552b670d6dd4bb6ac0ac759bc70c4d1
parentf3403548614a8b0c378f7c39ff4321b0a118ebb1 (diff)
downloadglib-6ddfd516e6acf9582eafd02874525a26281765de.tar.gz
Small documentation additions
The GNetworkMonitor docs were talking about one implementation, omitting the others. While fixing that, add a bit about implementations to the GProxyResolver docs too.
-rw-r--r--gio/gnetworkmonitor.c7
-rw-r--r--gio/gproxyresolver.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c
index c59caee84..db57d90cb 100644
--- a/gio/gnetworkmonitor.c
+++ b/gio/gnetworkmonitor.c
@@ -35,8 +35,11 @@
* @include: gio/gio.h
*
* #GNetworkMonitor provides an easy-to-use cross-platform API
- * for monitoring network connectivity. On Linux, the implementation
- * is based on the kernel's netlink interface.
+ * for monitoring network connectivity. On Linux, the available
+ * implementations are based on the kernel's netlink interface and
+ * on NetworkManager.
+ *
+ * There is also an implmeentation for use inside Flatpak sandboxes.
*/
/**
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index c9418ceab..b3bdec3b9 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.c
@@ -38,6 +38,10 @@
* #GProxyResolver provides synchronous and asynchronous network proxy
* resolution. #GProxyResolver is used within #GSocketClient through
* the method g_socket_connectable_proxy_enumerate().
+ *
+ * Implementations of #GProxyResolver based on libproxy and GNOME settings can
+ * be found in glib-networking. GIO comes with an implementation for use inside
+ * FLatpak portals.
*/
/**