[systemd-devel] [PATCH 1/2] man: fix localectl set-x11-keymap syntax description

[Ran Benita]

On Mon, Oct 20, 2014 at 11:07:06AM +0200, Jan Synacek wrote:
> Ran Benita <ran234 at gmail.com> writes:
> > On Fri, Oct 17, 2014 at 02:02:12PM +0200, Jan Synacek wrote:
> >> ---
> >>  man/localectl.xml | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >> 
> >> diff --git a/man/localectl.xml b/man/localectl.xml
> >> index 38e73c7..c332027 100644
> >> --- a/man/localectl.xml
> >> +++ b/man/localectl.xml
> >> @@ -178,7 +178,7 @@
> >>                          </varlistentry>
> >>  
> >>                          <varlistentry>
> >> -                                <term><command>set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]</command></term>
> >> +                                <term><command>set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]</command></term>
> >
> > Would have been nice if this used the same order as setxkbmap (which is
> > more sensible), but I suppose this cannot be changed?
> 
> I'm not sure. The man page of setxkbmap doesn't specify model in the
> optional argumets at all, you can change it with the -model
> option. Otherwise, the order of arguments is the same. If you want to
> put the model argument somewhere, I think that the order that localectl
> uses now makes sense. That's just my opinion, though.

It cannot be changed, but just for reference: the natural order (IMO) is
LAYOUT VARIANT OPTIONS MODEL because: layout and variant are better
together, and model is the least used of the bunch.

In any case, the comparison to setxkbmap is probably not accurate, it
has different semantics (this is from memory):
1. setxkbmap applies the keymap immediately, localectl on next X
   restart.
2. setxkbmap allows to change model, options, or layout+variant (they
   always change together) individually without affecting what is not
   specified. localectl regards what isn't specified as empty.

So the order is unfortunate but doesn't matter as much.