X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/11ad66c29764521f87f0dd399a1e592147c7af36..8111ced6e2561056d0e34500ea013bd921548081:/svc/conntrack.8.in?ds=sidebyside

diff --git a/svc/conntrack.8.in b/svc/conntrack.8.in
index 36742577..713a70b3 100644
--- a/svc/conntrack.8.in
+++ b/svc/conntrack.8.in
@@ -55,7 +55,9 @@ conntrack \- tripe service to start/stop peers depending on external connectivit
 The
 .B conntrack
 service watches D-Bus network management services like
-.BR NetworkManager (8)
+.BR NetworkManager (8),
+.BR ConnMan
+.RB ( connmand (8)),
 and Nokia's
 .BR ICd ,
 bringing peers up and down automatically.  It's designed to be useful on
@@ -217,22 +219,30 @@ is to be brought down, or no matching peer was found.  The
 is one of the following.
 .RS
 .TP
-.B "nm initially-connected"
-NetworkManager was detected on startup, and has an active network
-connection.
+.BI "connman initially-" state
+ConnMan was detected on startup, and is in the given
+.I state
+\(en see below.
 .TP
-.B "nm initially-disconnected"
-NetworkManager was detected on startup, and has no active network
-connection.
+.BI "connman " state
+ConnMan has transitioned to
+.IR state .
+The possible states are:
+.B offline
+(the network is turned off by user request);
+.B idle
+(no network interfaces are active);
+.B ready
+(an interface is up but not fully configured); and
+.B online
+(an interface is up and configured).
 .TP
-.B "nm connected"
-NetworkManager has acquired an active network connection.
-.TP
-.B "nm disconnected"
-NetworkManager has lost its active network connection.
+.BI "icd connected " iap
+Maemo ICd has acquired an active network connection, identified by
+.IR iap .
 .TP
-.B "nm default-connection-change"
-NetworkManager has changed its default route.
+.B "icd idle"
+Maemo ICd has lost its active network connection.
 .TP
 .BI "icd initially-connected " iap
 Maemo ICd was detected on startup, and has an active network connection
@@ -242,13 +252,6 @@ identified by
 .B "icd initially-disconnected"
 Maemo ICd was detected on startup, and has no active network connection.
 .TP
-.BI "icd connected " iap
-Maemo ICd has acquired an active network connection, identified by
-.IR iap .
-.TP
-.B "icd idle"
-Maemo ICd has lost its active network connection.
-.TP
 .B interval-timer
 A change was detected during
 .BR conntrack 's
@@ -262,6 +265,23 @@ The connection status was changed manually, using the
 or
 .B down
 service command.
+.TP
+.B "nm connected"
+NetworkManager has acquired an active network connection.
+.TP
+.B "nm default-connection-change"
+NetworkManager has changed its default route.
+.TP
+.B "nm disconnected"
+NetworkManager has lost its active network connection.
+.TP
+.B "nm initially-connected"
+NetworkManager was detected on startup, and has an active network
+connection.
+.TP
+.B "nm initially-disconnected"
+NetworkManager was detected on startup, and has no active network
+connection.
 .RE
 .
 .\"--------------------------------------------------------------------------