[systemd-devel] [RFC] core, login: wording

[Zbigniew Jędrzejewski-Szmek]

On Fri, Feb 20, 2015 at 11:01:18AM +0100, Daniele Medri wrote:
> ---
>  src/core/org.freedesktop.systemd1.policy.in.in | 6 +++---
>  src/login/org.freedesktop.login1.policy.in     | 8 ++++----
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in
> index cc39a9e..11a27de 100644
> --- a/src/core/org.freedesktop.systemd1.policy.in.in
> +++ b/src/core/org.freedesktop.systemd1.policy.in.in
> @@ -39,7 +39,7 @@
>  
>          <action id="org.freedesktop.systemd1.manage-unit-files">
>                  <_description>Manage system service or unit files</_description>
> -                <_message>Authentication is required to manage system service or unit files.</_message>
> +                <_message>Authentication is required to handle system service or unit files.</_mes
Doesn't seem to be an improvment.

sage>
>                  <defaults>
>                          <allow_any>auth_admin</allow_any>
>                          <allow_inactive>auth_admin</allow_inactive>
> @@ -48,8 +48,8 @@
>          </action>
>  
>          <action id="org.freedesktop.systemd1.set-environment">
> -                <_description>Set or unset system and service manager environment variables</_description>
> +                <_description>Configure system and service manager environment variables</_description>
This is less specific than the original. I'd say that it is worse.

> -                <_message>Authentication is required to set or unset system and service manager environment variables.</_message>
> +                <_message>Authentication is required to handle system and service manager environment variables.</_message>
This one too. "handle" could mean anything. "set or unset" is maybe not pretty, but
at least very clear.

>                  <defaults>
>                          <allow_any>auth_admin</allow_any>
>                          <allow_inactive>auth_admin</allow_inactive>
> diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
> index 35bb390..906fea2 100644
> --- a/src/login/org.freedesktop.login1.policy.in
> +++ b/src/login/org.freedesktop.login1.policy.in
> @@ -271,8 +271,8 @@
>          </action>
>  
>          <action id="org.freedesktop.login1.manage">
> -                <_description>Manager active sessions, users and seats</_description>
> +                <_description>Active sessions, users and seats management</_description>
I think this was just a typo, extra "r", and the original wording is OK.
This was actually already fixed in git.

> -                <_message>Authentication is required for managing active sessions, users and seats.</_message>
> +                <_message>Authentication is required to handle active sessions, users and seats.</_message>
>                  <defaults>
>                          <allow_any>auth_admin_keep</allow_any>
>                          <allow_inactive>auth_admin_keep</allow_inactive>
> @@ -281,8 +281,8 @@
>          </action>
>  
>          <action id="org.freedesktop.login1.lock-sessions">
> -                <_description>Lock or unlock active sessions</_description>
> -                <_message>Authentication is required for locking or unlocking active sessions.</_message>
> +                <_description>Active sessions management</_description>
> +                <_message>Authentication is required to handle active sessions.</_message>
Less specific.

But we should say "to lock or unlock". I'll fix that.

All in all, I think there's nothing to fix here.

Zbyszek