setxkbmap: Changes to 'master'

[Peter Hutterer]

 man/setxkbmap.man |   23 +++++++++++++----------
 setxkbmap.c       |   12 ++++++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 56346c72127303a445a273217f7633c2afb29cfc
Author: Benno Schulenberg <bensberg at justemail.net>
Date:   Thu Aug 29 12:31:37 2013 +0200

    Fixing a small mistake in the man page -- s/comp/map/.
    
    And seizing the opportunity to tweak some of the wording.
    
    Signed-off-by: Benno Schulenberg <bensberg at justemail.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit cd14edbc245ca7a34c6a7143ac40014a5bede217
Author: Benno Schulenberg <bensberg at justemail.net>
Date:   Thu Aug 29 12:18:20 2013 +0200

    Printing the program's version number on -version.
    
    Also unwrap a help-text line, as it looks neater and stays within
    80 characters, and alphabetize the -help option in the man page.
    
    Signed-off-by: Benno Schulenberg <bensberg at justemail.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    
    [squashed in: include "config.h" directive]
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>