homectl: move --umask=/--access-mode= help/man sections

These don't really have much to do about resource mgmt, but are more
about security, hence let's move them away from the resource mgmt
section.

diff --git a/man/homectl.xml b/man/homectl.xml
index 243d2b2b81a7456ff8399e66e5e6a1db0bda3598..e83ca6c62a1a186d1f1963dbe49dec32718f4dd4 100644 (file)
--- a/man/homectl.xml
+++ b/man/homectl.xml
@@ -334,6 +334,28 @@
         <xi:include href="version-info.xml" xpointer="v254"/></listitem>
       </varlistentry>
 
+
+      <varlistentry>
+        <term><option>--access-mode=<replaceable>MODE</replaceable></option></term>
+
+        <listitem><para>Takes a UNIX file access mode written in octal. Configures the access mode of the
+        home directory itself. Note that this is only used when the directory is first created, and the user
+        may change this any time afterwards. Example:
+        <option>--access-mode=0700</option></para>
+
+        <xi:include href="version-info.xml" xpointer="v245"/></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--umask=<replaceable>MASK</replaceable></option></term>
+
+        <listitem><para>Takes the access mode mask (in octal syntax) to apply to newly created files and
+        directories of the user ("umask"). If set this controls the initial umask set for all login sessions of
+        the user, possibly overriding the system's defaults.</para>
+
+        <xi:include href="version-info.xml" xpointer="v245"/></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>--skel=<replaceable>PATH</replaceable></option></term>
 
@@ -689,27 +711,6 @@
         <xi:include href="version-info.xml" xpointer="v245"/></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--access-mode=<replaceable>MODE</replaceable></option></term>
-
-        <listitem><para>Takes a UNIX file access mode written in octal. Configures the access mode of the
-        home directory itself. Note that this is only used when the directory is first created, and the user
-        may change this any time afterwards. Example:
-        <option>--access-mode=0700</option></para>
-
-        <xi:include href="version-info.xml" xpointer="v245"/></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>--umask=<replaceable>MASK</replaceable></option></term>
-
-        <listitem><para>Takes the access mode mask (in octal syntax) to apply to newly created files and
-        directories of the user ("umask"). If set this controls the initial umask set for all login sessions of
-        the user, possibly overriding the system's defaults.</para>
-
-        <xi:include href="version-info.xml" xpointer="v245"/></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><option>--nice=<replaceable>NICE</replaceable></option></term>
 

diff --git a/src/home/homectl.c b/src/home/homectl.c
index a056f831a69206f4a6fc46af1c4e20c461249701..825db583b0fbbdccd79a1b31a40456ed5bab73bd 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -2767,6 +2767,8 @@ static int help(int argc, char *argv[], void *userdata) {
                "                               Bounding POSIX capability set\n"
                "     --capability-ambient-set=CAPS\n"
                "                               Ambient POSIX capability set\n"
+               "     --access-mode=MODE        User home directory access mode\n"
+               "     --umask=MODE              Umask for user when logging in\n"
                "     --skel=PATH               Skeleton directory to use\n"
                "     --shell=PATH              Shell for account\n"
                "     --setenv=VARIABLE[=VALUE] Set an environment variable at log-in\n"
@@ -2821,8 +2823,6 @@ static int help(int argc, char *argv[], void *userdata) {
                "                               How much time to block password after expiry\n"
                "\n%4$sResource Management User Record Properties:%5$s\n"
                "     --disk-size=BYTES         Size to assign the user on disk\n"
-               "     --access-mode=MODE        User home directory access mode\n"
-               "     --umask=MODE              Umask for user when logging in\n"
                "     --nice=NICE               Nice level for user\n"
                "     --rlimit=LIMIT=VALUE[:VALUE]\n"
                "                               Set resource limits\n"