--- adduser.8.txt	2017-09-06 10:20:38.069388161 +0200
+++ adduser_3.8.txt	2017-09-06 11:54:30.694456897 +0200
@@ -6,30 +6,30 @@
        adduser, addgroup - add a user or group to the system
 
.\" annotation mh 2017-09-03: consider usage of macro .SY, .OP and .YS
.\" as presented in groff_man(7)

 SSYYNNOOPPSSIISS
-       aadddduusseerr  [options]  [--home  DIR]  [--shell  SHELL]  [--no-create-home]
-       [--uid ID] [--firstuid ID] [--lastuid ID] [--ingroup GROUP | --gid  ID]
-       [--disabled-password]      [--disabled-login]      [--gecos      GECOS]
-       [--add_extra_groups] user
+       aadddduusseerr  [[ooppttiioonnss]]  [[----hhoommee  _d_i_r]]  [[----sshheellll  _s_h_e_l_l]]  [[----nnoo--ccrreeaattee--hhoommee]]
+       [[----uuiidd _I_D]] [[----ffiirrssttuuiidd _I_D]] [[----llaassttuuiidd _I_D]] [[----iinnggrroouupp _g_r_o_u_p || ----ggiidd  _I_D]]
+       [[----ddiissaabblleedd--ppaasssswwoorrdd]]      [[----ddiissaabblleedd--llooggiinn]]      [[----ggeeccooss      _G_E_C_O_S]]
+       [[----aadddd__eexxttrraa__ggrroouuppss]] _u_s_e_r
 
-       aadddduusseerr --system [options] [--home DIR] [--shell  SHELL]  [--no-create-
-       home]  [--uid  ID]  [--group | --ingroup GROUP | --gid ID] [--disabled-
-       password] [--disabled-login] [--gecos GECOS] user
+       aadddduusseerr  ----ssyysstteemm [[ooppttiioonnss]] [[----hhoommee _d_i_r]] [[----sshheellll _s_h_e_l_l]]  [[----nnoo--ccrreeaattee--
+       hhoommee]]  [[----uuiidd  _I_D]]  [[----ggrroouupp || ----iinnggrroouupp _g_r_o_u_p || ----ggiidd _I_D]] [[----ddiissaabblleedd--
+       ppaasssswwoorrdd]] [[----ddiissaabblleedd--llooggiinn]] [[----ggeeccooss _G_E_C_O_S]] _u_s_e_r
 
-       aaddddggrroouupp [options] [--gid ID] group
+       aaddddggrroouupp  [[ooppttiioonnss]] [[----ggiidd _I_D]] _g_r_o_u_p
 
-       aaddddggrroouupp --system [options] [--gid ID] group
+       aaddddggrroouupp  ----ssyysstteemm [[ooppttiioonnss]] [[----ggiidd _I_D]] _g_r_o_u_p
 
-       aadddduusseerr [options] user group
+       aadddduusseerr  [[ooppttiioonnss]] _u_s_e_r _g_r_o_u_p
 
.\" annotation mh 2017-09-03: as suggested in bug report #846242
.\" short options according to output of --help added

CCOOMMMMOONN OOPPTTIIOONNSS
-       [--quiet] [--debug] [--force-badname] [--help|-h]  [--version]  [--conf
-       FILE]
+       [[----qquuiieett||--qq]]  [[----ddeebbuugg||--dd]]  [[----ffoorrccee--bbaaddnnaammee]]  [[----hheellpp||--hh]]  [[----vveerrssiioonn]]
+       [[----ccoonnff _f_i_l_e||--cc _f_i_l_e]]
 
 DDEESSCCRRIIPPTTIIOONN
        aadddduusseerr  and  aaddddggrroouupp  add users and groups to the system according to
        command    line    options    and    configuration    information    in
        _/_e_t_c_/_a_d_d_u_s_e_r_._c_o_n_f.   They  are  friendlier  front ends to the low level
-       tools like uusseerraadddd,, ggrroouuppaadddd and uusseerrmmoodd programs, by default  choosing
+       tools like uusseerraadddd, ggrroouuppaadddd and uusseerrmmoodd programs, by default  choosing
        Debian  policy conformant UID and GID values, creating a home directory
        with skeletal configuration, running a custom script,  and  other  fea-
        tures.  aadddduusseerr and aaddddggrroouupp can be run in one of five modes:
@@ -53,16 +53,16 @@
        UUSSEERRGGRROOUUPPSS to _n_o, all users' GIDs are set to UUSSEERRSS__GGIIDD.  Users' primary
        groups  can  also be overridden from the command line with the ----ggiidd or
        ----iinnggrroouupp options to set the group by id or name, respectively.   Also,
-       users can be added to one or more groups defined in adduser.conf either
-       by setting  ADD_EXTRA_GROUPS  to  1  in  adduser.conf,  or  by  passing
+       users can be added to one or more groups defined in _a_d_d_u_s_e_r_._c_o_n_f either
+       by setting  AADDDD__EEXXTTRRAA__GGRROOUUPPSS  to  1  in  _a_d_d_u_s_e_r_._c_o_n_f,  or  by  passing
        ----aadddd__eexxttrraa__ggrroouuppss on the commandline.
 
        aadddduusseerr  will create a home directory subject to DDHHOOMMEE, GGRROOUUPPHHOOMMEESS, and
        LLEETTTTEERRHHOOMMEESS.  The home directory can be  overridden  from  the  command
-       line with the ----hhoommee option, and the shell with the ----sshheellll option. The
-       home directory's set-group-ID bit is set if UUSSEERRGGRROOUUPPSS is _y_e_s  so  that
-       any  files  created  in the user's home directory will have the correct
-       group.
+       line  with  the  ----hhoommee  option, and the shell with the ----sshheellll option.
+       The home directory's set-group-ID bit is set if UUSSEERRGGRROOUUPPSS  is  _y_e_s  so
+       that  any files created in the user's home directory will have the cor-
+       rect group.
 
        aadddduusseerr will copy files from SSKKEELL into the home  directory  and  prompt
        for  finger  (gecos) information and a password.  The gecos may also be
@@ -71,21 +71,22 @@
        The ----ddiissaabblleedd--ppaasssswwoorrdd option will not set a password,  but  login  is
        still possible (for example with SSH RSA keys).
 
-       If  the  file //uussrr//llooccaall//ssbbiinn//aadddduusseerr..llooccaall exists, it will be executed
+       If  the  file _/_u_s_r_/_l_o_c_a_l_/_s_b_i_n_/_a_d_d_u_s_e_r_._l_o_c_a_l exists, it will be executed
        after the user account has been set up in order to do any local  setup.
        The arguments passed to aadddduusseerr..llooccaall are:
-       username uid gid home-directory
-       The  environment  variable  VERBOSE  is  set according to the following
+       _u_s_e_r_n_a_m_e _u_i_d _g_i_d _h_o_m_e_-_d_i_r_e_c_t_o_r_y
+       The  environment  variable  VVEERRBBOOSSEE  is  set according to the following
        rule:
 
        0 if   ----qquuiieett is specified
 
-       1 if neither
-              ----qquuiieett nor ----ddeebbuugg is specified
+
+       1      if neither ----qquuiieett nor ----ddeebbuugg is specified
+
 
        2 if   ----ddeebbuugg is specified
 
-              (The same applies to the variable DEBUG, but DEBUG is deprecated
+              (The same applies to the variable DDEEBBUUGG, but DDEEBBUUGG is deprecated
               and will be removed in a later version of aadddduusseerr.)
 
 
@@ -93,12 +94,12 @@
        If called with one non-option argument and the ----ssyysstteemm option, aadddduusseerr
        will add a system user. If a user with the same name already exists  in
        the  system uid range (or, if the uid is specified, if a user with that
-       uid already exists), adduser will exit with a warning. This warning can
-       be suppressed by adding ----qquuiieett.
+       uid already exists), aadddduusseerr will exit with a  warning.   This  warning
+       can be suppressed by adding ----qquuiieett.
 
        aadddduusseerr  will  choose  the first available UID from the range specified
-       for system  users  in  the  configuration  file  (FIRST_SYSTEM_UID  and
-       LAST_SYSTEM_UID).  If  you want to have a specific UID, you can specify
+       for system  users  in  the  configuration  file  (FFIIRRSSTT__SSYYSSTTEEMM__UUIIDD  and
+       LLAASSTT__SSYYSSTTEEMM__UUIIDD).   If you want to have a specific UID, you can specify
        it using the ----uuiidd option.
 
        By default, system users are placed in the nnooggrroouupp group.  To place the
@@ -115,2 +116,2 @@
        If aadddduusseerr is called with the ----ggrroouupp option and without  the  ----ssyysstteemm
        option, or aaddddggrroouupp is called respectively, a user group will be added.

.\" annotation mh 2017-09-03: GIDS replaced by GIDs as elsewhere with
.\" plural of UID and GID

-
-       A  GID  will  be chosen from the range specified for system GIDS in the
-       configuration file (FIRST_GID, LAST_GID). To  override  that  mechanism
+       A  GID  will  be chosen from the range specified for system GIDs in the
+       configuration file (FFIIRRSSTT__GGIIDD, LLAASSTT__GGIIDD).  To override  that  mechanism
        you can give the GID using the ----ggiidd option.
 
        The group is created with no users.
@@ -126,2 +126,2 @@
        If  aaddddggrroouupp is called with the ----ssyysstteemm option, a system group will be
        added.

.\" annotation mh 2017-09-03: GIDS replaced with GIDs as elsewhere with
.\" plural of UID and GID
-       A GID will be chosen from the range specified for system  GIDS  in  the
-       configuration  file  (FIRST_SYSTEM_GID,  LAST_SYSTEM_GID).  To override
-       that mechanism you can give the GID using the ----ggiidd option.
+       A GID will be chosen from the range specified for system  GIDs  in  the
+       configuration  file  (FFIIRRSSTT__SSYYSSTTEEMM__GGIIDD,  LLAASSTT__SSYYSSTTEEMM__GGIIDD).  To override
+       that mechanism you can give the GID using the ----ggiidd option.  The  group
+       is created with no users.
 
-       The group is created with no users.
 
    AAdddd aann eexxiissttiinngg uusseerr ttoo aann eexxiissttiinngg ggrroouupp
        If called with two non-option arguments, aadddduusseerr will add  an  existing
        user to an existing group.
 
+
 OOPPTTIIOONNSS
-       ----ccoonnff FFIILLEE
-              Use FILE instead of _/_e_t_c_/_a_d_d_u_s_e_r_._c_o_n_f.
+       --cc _f_i_l_e, ----ccoonnff _f_i_l_e
+              Use _f_i_l_e instead of _/_e_t_c_/_a_d_d_u_s_e_r_._c_o_n_f.
 
        ----ddiissaabblleedd--llooggiinn
               Do  not  run passwd to set the password.  The user won't be able
               to use her account until the password is set.
 
        ----ddiissaabblleedd--ppaasssswwoorrdd
-              Like --disabled-login, but logins are still possible (for  exam-
+              Like  ----ddiissaabblleedd--llooggiinn, but logins are still possible (for exam-
               ple using SSH RSA keys) but not using password authentication.
 
        ----ffoorrccee--bbaaddnnaammee
               By default, user and group names are checked against the config-
               urable regular expression NNAAMMEE__RREEGGEEXX specified in the configura-
-              tion file. This option forces aadddduusseerr and aaddddggrroouupp to apply only
-              a weak check for validity of the name.  NNAAMMEE__RREEGGEEXX is  described
-              in aadddduusseerr..ccoonnff(5).
+              tion file.  This option forces aadddduusseerr  and  aaddddggrroouupp  to  apply
+              only  a  weak  check  for  validity  of the name.  NNAAMMEE__RREEGGEEXX is
+              described in aadddduusseerr..ccoonnff(5).
 
-       ----ggeeccooss GGEECCOOSS
+       ----ggeeccooss _G_E_C_O_S
               Set  the  gecos field for the new entry generated.  aadddduusseerr will
               not ask for finger information if this option is given.
 
-       ----ggiidd IIDD
+       ----ggiidd _I_D
               When creating a group, this option forces the new groupid to  be
               the  given  number.   When creating a user, this option will put
               the user in that group.
 
        ----ggrroouupp
-              When combined with ----ssyysstteemm, a group with the same name  and  ID
-              as the system user is created.  If not combined with ----ssyysstteemm, a
-              group with the given name  is  created.   This  is  the  default
+              When  combined with ----ssyysstteemm , a group with the same name and ID
+              as the system user is created.  If not combined with ----ssyysstteemm  ,
+              a  group  with  the  given name is created.  This is the default
               action if the program is invoked as aaddddggrroouupp.
 
-       ----hheellpp Display brief instructions.
+       --hh, ----hheellpp
+              Display brief instructions.
 
-       ----hhoommee DDIIRR
-              Use  DIR  as  the user's home directory, rather than the default
+       ----hhoommee _d_i_r
+              Use _d_i_r as the user's home directory, rather  than  the  default
               specified by the configuration file.  If the directory does  not
               exist, it is created and skeleton files are copied.
 
-       ----sshheellll SSHHEELLLL
-              Use  SHELL  as  the  user's login shell, rather than the default
+       ----sshheellll _s_h_e_l_l
+              Use _s_h_e_l_l as the user's login shell,  rather  than  the  default
               specified by the configuration file.
 
-       ----iinnggrroouupp GGRROOUUPP
-              Add the new user to GROUP instead of a usergroup or the  default
+       ----iinnggrroouupp _g_r_o_u_p
+              Add  the new user to _g_r_o_u_p instead of a usergroup or the default
               group  defined  by  UUSSEERRSS__GGIIDD  in  the configuration file.  This
               affects the users primary group.  To add additional groups,  see
               the aadddd__eexxttrraa__ggrroouuppss option.
@@ -190,57 +192,57 @@
        ----nnoo--ccrreeaattee--hhoommee
               Do not create the home directory, even if it doesn't exist.
 
-       ----qquuiieett
+       --qq, ----qquuiieett
               Suppress informational messages, only show warnings and errors.
 
-       ----ddeebbuugg
+       --dd, ----ddeebbuugg
               Be  verbose, most useful if you want to nail down a problem with
-              adduser.
+              aadddduusseerr.
 
        ----ssyysstteemm
               Create a system user or group.
 
-       ----uuiidd IIDD
+       ----uuiidd _I_D
               Force the new userid to be the given number.  aadddduusseerr will  fail
               if the userid is already taken.
 
-       ----ffiirrssttuuiidd IIDD
+       ----ffiirrssttuuiidd _I_D
               Override  the first uid in the range that the uid is chosen from
               (overrides FFIIRRSSTT__UUIIDD specified in the configuration file).
 
-       ----llaassttuuiidd IIDD
-              Override the last uid in the range that the uid is chosen from (
-              LLAASSTT__UUIIDD )
+       ----llaassttuuiidd _I_D
+              Override  the  last uid in the range that the uid is chosen from
+              (LLAASSTT__UUIIDD).
 
        ----aadddd__eexxttrraa__ggrroouuppss
               Add new user to extra groups defined in the configuration file.
 
-       ----vveerrssiioonn
+       --vv , ----vveerrssiioonn
               Display version and copyright information.
 
 
 EEXXIITT VVAALLUUEESS
        00      The  user  exists as specified. This can have 2 causes: The user
-              was created by adduser or the user was already  present  on  the
-              system  before adduser was invoked. If adduser was returning 0 ,
-              invoking adduser a second  time  with  the  same  parameters  as
+              was  created  by aadddduusseerr  or the user was already present on the
+              system before aadddduusseerr  was invoked.  If aadddduusseerr   was  returning
+              0,  invoking  aadddduusseerr  a second time with the same parameters as
               before also returns 0.
 
        11      Creating the user or group failed because it was already present
-              with other UID/GID than specified. The username or groupname was
-              rejected  because  of  a  mismatch  with  the configured regular
-              expressions, see adduser.conf(5). Adduser has been aborted by  a
-              signal.
+              with  other  UID/GID  than specified.  The username or groupname
+              was rejected because of a mismatch with the  configured  regular
+              expressions,  see aadddduusseerr..ccoonnff(5).  aadddduusseerr  has been aborted by
+              a signal.
               Or  for many other yet undocumented reasons which are printed to
               console then. You may then consider to remove  ----qquuiieett  to  make
-              adduser more verbose.
+              aadddduusseerr  more verbose.
 
 
 FFIILLEESS
-       /etc/adduser.conf
-              Default configuration file for adduser and addgroup
+       _/_e_t_c_/_a_d_d_u_s_e_r_._c_o_n_f
+              Default configuration file for aadddduusseerr and aaddddggrroouupp
 
-       /usr/local/sbin/adduser.local
+       _/_u_s_r_/_l_o_c_a_l_/_s_b_i_n_/_a_d_d_u_s_e_r_._l_o_c_a_l
               Optional custom add-ons.
 
 
@@ -261,3 +263,3 @@
 
 
-Debian GNU/Linux                Version VERSION                     ADDUSER(8)
+adduser 3.116                     2017-09-05                        ADDUSER(8)
