diff options
Diffstat (limited to 'man')
-rw-r--r-- | man/NetworkManager.8.in | 33 | ||||
-rw-r--r-- | man/NetworkManager.conf.5.in | 66 |
2 files changed, 82 insertions, 17 deletions
diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in index c5f44513d8..127c72bf37 100644 --- a/man/NetworkManager.8.in +++ b/man/NetworkManager.8.in @@ -1,14 +1,16 @@ .\" NetworkManager(8) manual page .\" -.\" Copyright (C) 2005 - 2010 Red Hat, Inc. +.\" Copyright (C) 2005 - 2011 Red Hat, Inc. .\" Copyright (C) 2005 - 2009 Novell, Inc. .\" Copyright (C) 2005 Robert Love .\" -.TH NETWORKMANAGER "8" "January 29, 2010" +.TH NETWORKMANAGER "8" "2 August 2011" .SH NAME NetworkManager \- network management daemon .SH SYNOPSIS -.B NetworkManager [\-\-version] [\-\-no\-daemon] [\-\-pid\-file=<filename>] [\-\-state\-file=<filename>] [\-\-config=<filename>] [\-\-plugins=<plugin1>,plugin2>,...] [\-\-log\-level=<level>] [\-\-log\-domains=<domain1>,<domain2>,...] +.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>,...] .SH DESCRIPTION The \fINetworkManager\fP daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network @@ -21,10 +23,22 @@ settings and operation. .P NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher.d directory in alphabetical order in response to network events. Each script -should be (a) a regular file, (b) owned by root, (c) not writable by group or -other, (d) not set-uid, (e) and executable by the owner. Each script receives -two arguments, the first being the interface name of the device just activated, -and second an action. +should be: +.IP "(a)" 4 +a regular file +.IP "(b)" 4 +owned by root +.IP "(c)" 4 +not writable by group or other +.IP "(d)" 4 +not set-uid +.IP "(e)" 4 +and executable by the owner +.PP +Each script receives two arguments, the first being the interface name of the +device just activated, and second an action. +.PP +Actions: .TP .I "up" The interface has been activated. The environment contains more information @@ -64,6 +78,9 @@ The following options are supported: .I "\-\-version" Print the NetworkManager software version and exit. .TP +.I "\-\-help" +Print NetworkManager's available options and exit. +.TP .I "\-\-no\-daemon" Do not daemonize. This is useful for debugging, and directs log output to the controlling terminal in addition to syslog. @@ -113,5 +130,7 @@ When set to anything, causes NetworkManager to turn on PPP debugging in pppd, which logs all PPP and PPTP frames and client/server exchanges. .SH SEE ALSO .BR nm\-tool (1), +.BR nm\-online (1), +.BR nmcli (1), .BR NetworkManager.conf (5). diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index d047f39391..9fe722c4c9 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -1,8 +1,8 @@ .\" NetworkManager.conf(5) manual page .\" -.\" Copyright (C) 2010 Red Hat, Inc. +.\" Copyright (C) 2010 - 2011 Red Hat, Inc. .\" -.TH "NetworkManager.conf" "5" "23 November 2010" "" +.TH "NetworkManager.conf" "5" "2 August 2011" "" .SH NAME NetworkManager.conf \- NetworkManager configuration file .SH SYNOPSIS @@ -20,9 +20,6 @@ is a configuration file for NetworkManager. It is used to set up various aspects of NetworkManager's behavior. The location of the file may be changed through use of the "\-\-config=" argument for \fBNetworkManager\fP (8). - -It is not necessary to restart NetworkManager when making changes, as the -configuration file is watched for changes and reloaded automatically when necessary. .SH "FILE FORMAT" .P The configuration file format is so-called key file (sort of ini-style format). @@ -163,12 +160,61 @@ warning messages. The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX]. When "NONE" is given by -itself, logging is disabled. MB = Mobile Broadband, AGENTS = secret agents -operations and communication, SETTINGS = settings/config service operations, -OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE = -activation and general interface operations. +itself, logging is disabled. +.PP +.RS +HW = Hardware related operations +.br +RFKILL = RFKill subsystem operations +.br +ETHER = Ethernet device operations +.br +WIFI = Wi-Fi device operations +.br +BT = Bluetooth +.br +MB = Mobile Broadband +.br +DHCP4 = DHCP for IPv4 +.br +DHCP6 = DHCP for IPv6 +.br +PPP = Point-to-point protocol operations +.br +WIFI_SCAN = Wi-Fi scanning operations +.br +IP4 = Domain for IPv4 logging +.br +IP6 = Domain for IPv6 logging +.br +AUTOIP4 = AutoIP (avahi) operations +.br +DNS = Domain Name System related operations +.br +VPN = Virtual Private Network connections and operaions +.br +SHARING = Connection sharing +.br +SUPPLICANT = WPA supplicant related operations +.br +AGENTS = Secret agents operations and communication +.br +SETTINGS = Settings/config service operations +.br +SUSPEND = Suspend/resume +.br +CORE = Core daemon operations +.br +DEVICE = Activation and general interface operations +.br +OLPC = OLPC Mesh device operations +.br +WIMAX = Wimax device operations +.br .SH "SEE ALSO" .BR http://live.gnome.org/NetworkManager/SystemSettings .sp .BR NetworkManager (8), -.BR nm\-tool (1). +.BR nmcli (1), +.BR nm\-tool (1), +.BR nm\-online (1). |