X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/965eb987fc277cdbd200738e8d5c4e85568751d2..43b899540840f8e9bfd2f3b5751ee247433a7cc9:/svc/conntrack.8.in diff --git a/svc/conntrack.8.in b/svc/conntrack.8.in index 36742577..a1e94916 100644 --- a/svc/conntrack.8.in +++ b/svc/conntrack.8.in @@ -217,22 +217,12 @@ 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. -.TP -.B "nm initially-disconnected" -NetworkManager was detected on startup, and has no active network -connection. -.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 +232,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 +245,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 . .\"--------------------------------------------------------------------------