6 files changed, 68 insertions, 24 deletions
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 127c72bf..0c84af77 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -1,16 +1,16 @@
 .\" NetworkManager(8) manual page
 .\"
-.\" Copyright (C) 2005 - 2011 Red Hat, Inc.
+.\" Copyright (C) 2005 - 2012 Red Hat, Inc.
 .\" Copyright (C) 2005 - 2009 Novell, Inc.
 .\" Copyright (C) 2005 Robert Love
 .\"
-.TH NETWORKMANAGER "8" "2 August 2011"
+.TH NETWORKMANAGER "8" "26 July 2012"
 .SH NAME
 NetworkManager \- network management daemon
 .SH SYNOPSIS
 .B NetworkManager [\-\-version] | [\-\-help]
 .PP
-.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
+.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>]
 .SH DESCRIPTION
 The \fINetworkManager\fP daemon attempts to make  networking configuration and
 operation as painless and automatic as possible by managing the primary network
@@ -118,6 +118,24 @@ log levels and domains.
 Sets which operations are logged to the log destination (usually syslog).  By
 default, most domains are logging-enabled.  See \fBNetworkManager.conf\fP(5) for
 more information on log levels and domains.
+.TP
+.I "\-\-connectivity\-uri=<uri>
+Sets the URI of a web page that will be used for connectivity checking. By
+default connectivity checking is disabled.  See \fBNetworkManager.conf\fP(5)
+[connectivity] section for more information on connectivity checking feature.
+.TP
+.I "\-\-connectivity\-interval=<int>
+Sets the interval (in seconds) in which connection checks for the URI are done.
+0 means no checks. The default value is 300 seconds. See
+\fBNetworkManager.conf\fP(5) [connectivity] section for more information on
+connectivity checking feature.
+.TP
+.I "\-\-connectivity\-response=<resp>
+If set, it controls what body content NetworkManager checks for when requesting
+the URI for connectivity checking.  If missing, defaults to "NetworkManager is online".
+See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on
+connectivity checking feature.
+
 .SH DEBUGGING
 The following environment variables are supported to help debugging.  When used
 in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper
diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in
index 127c72bf..0c84af77 100644
--- a/man/NetworkManager.8.in
+++ b/man/NetworkManager.8.in
@@ -1,16 +1,16 @@
 .\" NetworkManager(8) manual page
 .\"
-.\" Copyright (C) 2005 - 2011 Red Hat, Inc.
+.\" Copyright (C) 2005 - 2012 Red Hat, Inc.
 .\" Copyright (C) 2005 - 2009 Novell, Inc.
 .\" Copyright (C) 2005 Robert Love
 .\"
-.TH NETWORKMANAGER "8" "2 August 2011"
+.TH NETWORKMANAGER "8" "26 July 2012"
 .SH NAME
 NetworkManager \- network management daemon
 .SH SYNOPSIS
 .B NetworkManager [\-\-version] | [\-\-help]
 .PP
-.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...]
+.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] [\-\-connectivity\-uri=<uri>] [\-\-connectivity\-interval=<int>] [\-\-connectivity\-response=<resp>]
 .SH DESCRIPTION
 The \fINetworkManager\fP daemon attempts to make  networking configuration and
 operation as painless and automatic as possible by managing the primary network
@@ -118,6 +118,24 @@ log levels and domains.
 Sets which operations are logged to the log destination (usually syslog).  By
 default, most domains are logging-enabled.  See \fBNetworkManager.conf\fP(5) for
 more information on log levels and domains.
+.TP
+.I "\-\-connectivity\-uri=<uri>
+Sets the URI of a web page that will be used for connectivity checking. By
+default connectivity checking is disabled.  See \fBNetworkManager.conf\fP(5)
+[connectivity] section for more information on connectivity checking feature.
+.TP
+.I "\-\-connectivity\-interval=<int>
+Sets the interval (in seconds) in which connection checks for the URI are done.
+0 means no checks. The default value is 300 seconds. See
+\fBNetworkManager.conf\fP(5) [connectivity] section for more information on
+connectivity checking feature.
+.TP
+.I "\-\-connectivity\-response=<resp>
+If set, it controls what body content NetworkManager checks for when requesting
+the URI for connectivity checking.  If missing, defaults to "NetworkManager is online".
+See \fBNetworkManager.conf\fP(5) [connectivity] section for more information on
+connectivity checking feature.
+
 .SH DEBUGGING
 The following environment variables are supported to help debugging.  When used
 in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper
diff --git a/man/nm-online.1 b/man/nm-online.1
index 2c8c9e9a..4859ba90 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -15,10 +15,9 @@
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
 .\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
-.\" USA.
+.\" You should have received a copy of the GNU General Public Licence along
+.\" with this manual; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
 .\" Copyright (C) 2010 Red Hat, Inc.
 .\"
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index 2c8c9e9a..4859ba90 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -15,10 +15,9 @@
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
 .\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
-.\" USA.
+.\" You should have received a copy of the GNU General Public Licence along
+.\" with this manual; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
 .\" Copyright (C) 2010 Red Hat, Inc.
 .\"
diff --git a/man/nmcli.1 b/man/nmcli.1
index bd84edb7..184ce40c 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -15,14 +15,13 @@
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
 .\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
-.\" USA.
+.\" You should have received a copy of the GNU General Public Licence along
+.\" with this manual; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
 .\" Copyright (C) 2010 - 2012 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "29 May 2012"
+.TH NMCLI "1" "26 July 2012"
 
 .SH NAME
 nmcli \(en command\(hyline tool for controlling NetworkManager
@@ -455,6 +454,12 @@ Connection activation failed
 Connection deactivation failed
 .IP "6" 4
 Disconnecting device failed
+.IP "7" 4
+Connection deletion failed
+.IP "8" 4
+NetworkManager is not running
+.IP "9" 4
+\fInmcli\fP and \fINetworkManager\fP versions mismatch
 
 .SH EXAMPLES
 .IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP"
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index bd84edb7..184ce40c 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -15,14 +15,13 @@
 .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 .\" GNU General Public License for more details.
 .\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with this manual; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111,
-.\" USA.
+.\" You should have received a copy of the GNU General Public Licence along
+.\" with this manual; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
 .\" Copyright (C) 2010 - 2012 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "29 May 2012"
+.TH NMCLI "1" "26 July 2012"
 
 .SH NAME
 nmcli \(en command\(hyline tool for controlling NetworkManager
@@ -455,6 +454,12 @@ Connection activation failed
 Connection deactivation failed
 .IP "6" 4
 Disconnecting device failed
+.IP "7" 4
+Connection deletion failed
+.IP "8" 4
+NetworkManager is not running
+.IP "9" 4
+\fInmcli\fP and \fINetworkManager\fP versions mismatch
 
 .SH EXAMPLES
 .IP "\fB\f(CWnmcli \-t \-f RUNNING nm\fP\fP"