diff options
| author | Michael Biebl <biebl@debian.org> | 2012-03-24 01:37:02 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-03-24 01:37:02 +0100 |
| commit | de06e5715e780baade318f3490ac7a4c9ce84e32 (patch) | |
| tree | 23fbc3fafc12072476eff98bee60100eb54c29db /man | |
| parent | b436a68a20ff3114ded32a7a3d70cdd4954039f9 (diff) | |
Imported Upstream version 0.9.4.0 upstream/0.9.4.0
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.in | 9 | ||||
| -rw-r--r-- | man/NetworkManager.conf.5 | 20 | ||||
| -rw-r--r-- | man/NetworkManager.conf.5.in | 20 |
3 files changed, 49 insertions, 0 deletions
diff --git a/man/Makefile.in b/man/Makefile.in index 6171271c..89bb3c89 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -140,6 +140,8 @@ GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ @@ -194,11 +196,15 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ +LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -209,6 +215,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -248,6 +255,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 9fe722c4..84b4d751 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -211,6 +211,26 @@ OLPC = OLPC Mesh device operations .br WIMAX = Wimax device operations .br +.SS [connectivity] +This section controls NetworkManager's optional connectivity checking +functionality. This allows NetworkManager to detect whether or not the system +can actually access the internet or whether it is behind a captive portal. +.TP +.B uri=\fI<uri>\fP +The URI of a web page to periodically request when connectivity is being checked. +This page should return the header "X-NetworkManager-Status" with a value of +"online". Alternatively, it's body content should be set to "NetworkManager +is online". The body content check can be controlled by the \fIresponse\fP +option. If this option is blank or missing, connectivity checking is disabled. +.TP +.B interval=\fI<seconds>\fP +Controls how often connectivity is checked when a network connection exists. If +set to 0 connectivity checking is disabled. If missing, the default is 300 +seconds. +.TP +.B response=\fI<response>\fP +If set controls what body content NetworkManager checks for when requesting the +URI for connectivity checking. If missing, defaults to "NetworkManager is online" .SH "SEE ALSO" .BR http://live.gnome.org/NetworkManager/SystemSettings .sp diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index 9fe722c4..84b4d751 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -211,6 +211,26 @@ OLPC = OLPC Mesh device operations .br WIMAX = Wimax device operations .br +.SS [connectivity] +This section controls NetworkManager's optional connectivity checking +functionality. This allows NetworkManager to detect whether or not the system +can actually access the internet or whether it is behind a captive portal. +.TP +.B uri=\fI<uri>\fP +The URI of a web page to periodically request when connectivity is being checked. +This page should return the header "X-NetworkManager-Status" with a value of +"online". Alternatively, it's body content should be set to "NetworkManager +is online". The body content check can be controlled by the \fIresponse\fP +option. If this option is blank or missing, connectivity checking is disabled. +.TP +.B interval=\fI<seconds>\fP +Controls how often connectivity is checked when a network connection exists. If +set to 0 connectivity checking is disabled. If missing, the default is 300 +seconds. +.TP +.B response=\fI<response>\fP +If set controls what body content NetworkManager checks for when requesting the +URI for connectivity checking. If missing, defaults to "NetworkManager is online" .SH "SEE ALSO" .BR http://live.gnome.org/NetworkManager/SystemSettings .sp |