[systemd-devel] [PATCH] man/systemctl: document enable on masked units

2014-10-08 Thread Jan Synacek
---
 man/systemctl.xml | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/man/systemctl.xml b/man/systemctl.xml
index b28a3b7..d2fa3b3 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -924,6 +924,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket 
systemd-udevd.service
 the system, or for all future logins of all users, or only this
 boot.  Note that in the last case, no systemd daemon
 configuration is reloaded./para
+
+paraUsing commandenable/command on masked units
+results in an error./para
   /listitem
 /varlistentry
 
@@ -1080,8 +1083,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket 
systemd-udevd.service
 filename/dev/null/filename, making it impossible to
 start them. This is a stronger version of
 commanddisable/command, since it prohibits all kinds of
-activation of the unit, including manual activation. Use
-this option with care. This honors the
+activation of the unit, including enablement and manual
+activation. Use this option with care. This honors the
 option--runtime/option option to only mask temporarily
 until the next reboot of the system./para
   /listitem
-- 
1.9.3

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] man/systemctl: document enable on masked units

2014-10-08 Thread Zbigniew Jędrzejewski-Szmek
On Wed, Oct 08, 2014 at 08:04:52AM +0200, Jan Synacek wrote:
 ---
  man/systemctl.xml | 7 +--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/man/systemctl.xml b/man/systemctl.xml
 index b28a3b7..d2fa3b3 100644
 --- a/man/systemctl.xml
 +++ b/man/systemctl.xml
 @@ -924,6 +924,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket 
 systemd-udevd.service
  the system, or for all future logins of all users, or only this
  boot.  Note that in the last case, no systemd daemon
  configuration is reloaded./para
 +
 +paraUsing commandenable/command on masked units
 +results in an error./para
/listitem
  /varlistentry
  
 @@ -1080,8 +1083,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket 
 systemd-udevd.service
  filename/dev/null/filename, making it impossible to
  start them. This is a stronger version of
  commanddisable/command, since it prohibits all kinds of
 -activation of the unit, including manual activation. Use
 -this option with care. This honors the
 +activation of the unit, including enablement and manual
 +activation. Use this option with care. This honors the
  option--runtime/option option to only mask temporarily
  until the next reboot of the system./para
/listitem
 -- 
Yep, applied.

Zbyszek
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel