diff --git a/NEWS b/NEWS index 03dc5ba2e38..e56a922d2b3 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ CHANGES WITH 227: It allows accounting the number of tasks in a cgroup and enforcing limits on it. This adds two new setting TasksAccounting= and TasksMax= to each unit, as well as a - gloabl option DefaultTasksAccounting=. + global option DefaultTasksAccounting=. * Support for the "net_cls" cgroup controller has been added. It allows assigning a net class ID to each task in the cgroup, @@ -27,7 +27,7 @@ CHANGES WITH 227: sockets. This adds a new config directive called NetClass= to CGroup - enabled units. Allowed values are positive numbers for fix + enabled units. Allowed values are positive numbers for fixed assignments and "auto" for picking a free value automatically. diff --git a/man/machine-id.xml b/man/machine-id.xml index 8ce9c46ff12..db72c2a01ca 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -119,7 +119,7 @@ id[8] = (id[8] & 0x3F) | 0x80; /etc/machine-id originates in the /var/lib/dbus/machine-id file introduced by D-Bus. In fact, this latter file might be a symlink to - /etc/machine-id. + /etc/machine-id. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 642d95a0295..eeb98198abf 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -287,7 +287,7 @@ below (see section "Command Lines" below). - When Type is not + When Type= is not , only one command may and must be given. When Type=oneshot is used, zero or more commands may be specified. This can be specified by @@ -421,7 +421,7 @@ ExecStop= defined, or where the service exited unexpectedly. This argument takes multiple command lines, following the same scheme as described for - ExecStart. Use of these settings is + ExecStart=. Use of these settings is optional. Specifier and environment variable substitution is supported. @@ -486,7 +486,7 @@ "keep-alive ping"). If the time between two such calls is larger than the configured time, then the service is placed in a failed state and it will be terminated with - SIGABRT. By setting + SIGABRT. By setting Restart= to or , the service will be automatically restarted. The time configured here will be passed to the @@ -905,12 +905,15 @@ USBFunctionDescriptors= - Configure the location of file containing - FunctionFS descriptors. This is is used only when socket with - ListenUSBFunction line want to activate this service. Content of - this file is writen to ep0 file after it is opened. This is required - for socket activation using ListenUSBFunction - (i.e. for passing all ffs endpoints to service). + Configure the location of the file containing + functionfs + descriptors. This is is used only when a socket with + ListenUSBFunction= configured wants to + activate this service. Content of this file is writen to + ep0 file after it is opened. This is + required for socket activation using + ListenUSBFunction= (i.e. for passing all + functionfs endpoints to the service). diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 7f884aa1be3..bb75b69cea4 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -262,13 +262,17 @@ ListenUSBFunction= - Specifies a functionfs endpoint location - to listen on. This expects an absolute file system path as + Specifies a + functionfs + endpoint location to + listen on. This expects an absolute file system path as the argument. Behavior otherwise is very similar to the ListenFIFO= directive above. Use this to - open functionfs endpoint ep0. When using this option, activated - service has to have USBFunctionDescriptors - and USBFunctionStrings options set. + open functionfs endpoint ep0. When using + this option, activated service has to have the + USBFunctionDescriptors= and + USBFunctionStrings= options set. + diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 6e0dff9b475..78bad4d814e 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -215,20 +215,19 @@ exit.target A special service unit for shutting down the system or - user service manager. It also works in containers and is - equivalent to poweroff.target on - non-container systems. + user service manager. It is equivalent to + poweroff.target on non-container + systems, and also works in containers. - Applications wanting to terminate the user service - manager should start this unit. If systemd receives + systemd will start this unit when it receives a + request to shut down over D-Bus or a SIGTERM or SIGINT - when running as user service daemon, it will start this - unit. + signal when running as user service daemon. - Normally, this pulls in + Normally, this (indirectly) pulls in shutdown.target which in turn should be - conflicted by all units that want to be shut down on user - service manager exit. + conflicted by all units that want to be scheduled for + shutdown when the service manager starts to exit. diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 015deab4bb1..8985b6b9406 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1055,8 +1055,11 @@ auto (for dynamic allocation). Network traffic of all processes inside the unit will have the network class ID assigned by the kernel. Also see - systemd.resource-control5 - . + the kernel docs for + net_cls controller + and + systemd.resource-control5. + diff --git a/man/timedatectl.xml b/man/timedatectl.xml index 9a86c4126a9..c439bc56ede 100644 --- a/man/timedatectl.xml +++ b/man/timedatectl.xml @@ -178,7 +178,7 @@ protected by a different access policy. Note that even if time synchronization is turned off - with this command another, unrelated system service might + with this command, another unrelated system service might still synchronize the clock with the network. Also note that strictly speaking systemd-timesyncd.service does more than