systemctl: fix import-environment description, trim help to 80 cols

diff --git a/man/systemctl.xml b/man/systemctl.xml
index caad13172b197f8e79bfde2afb59a0becb0dc8cb..38c2bbf7ee40e5afb3845c66e1778c60f7312d3e 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1349,7 +1349,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           </listitem>
         </varlistentry>
         <varlistentry>
           </listitem>
         </varlistentry>
         <varlistentry>

-          <term><command>import-environment <replaceable>VARIABLE</replaceable>...</command></term>
+          <term>
+           <command>import-environment</command>
+           <optional><replaceable>VARIABLE...</replaceable></optional>
+         </term>

 
           <listitem>
             <para>Import all, one or more environment variables set on
 
           <listitem>
             <para>Import all, one or more environment variables set on

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d57b577913484866bbdea9cfd56219258481a3f2..00e283c463434f2a0959b7016f067dee9e40d7e8 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6002,8 +6002,8 @@ static void systemctl_help(void) {
                "                      Operate on remote host\n"
                "  -M --machine=CONTAINER\n"
                "                      Operate on local container\n"
                "                      Operate on remote host\n"
                "  -M --machine=CONTAINER\n"
                "                      Operate on local container\n"

-               "  -t --type=TYPE      List only units of a particular type\n"
-               "     --state=STATE    List only units with particular LOAD or SUB or ACTIVE state\n"
+               "  -t --type=TYPE      List units of a particular type\n"
+               "     --state=STATE    List units with particular LOAD or SUB or ACTIVE state\n"

                "  -p --property=NAME  Show only properties by this name\n"
                "  -a --all            Show all loaded units/properties, including dead/empty\n"
                "                      ones. To list all units installed on the system, use\n"
                "  -p --property=NAME  Show only properties by this name\n"
                "  -a --all            Show all loaded units/properties, including dead/empty\n"
                "                      ones. To list all units installed on the system, use\n"


@@ -6021,8 +6021,7 @@ static void systemctl_help(void) {
                "  -q --quiet          Suppress output\n"
                "     --no-block       Do not wait until operation finished\n"
                "     --no-wall        Don't send wall message before halt/power-off/reboot\n"
                "  -q --quiet          Suppress output\n"
                "     --no-block       Do not wait until operation finished\n"
                "     --no-wall        Don't send wall message before halt/power-off/reboot\n"

-               "     --no-reload      When enabling/disabling unit files, don't reload daemon\n"
-               "                      configuration\n"
+               "     --no-reload      Don't reload daemon after en-/dis-abling unit files\n"

                "     --no-legend      Do not print a legend (column headers and hints)\n"
                "     --no-pager       Do not pipe output into a pager\n"
                "     --no-ask-password\n"
                "     --no-legend      Do not print a legend (column headers and hints)\n"
                "     --no-pager       Do not pipe output into a pager\n"
                "     --no-ask-password\n"


@@ -6031,8 +6030,7 @@ static void systemctl_help(void) {
                "     --runtime        Enable unit files only temporarily until next reboot\n"
                "  -f --force          When enabling unit files, override existing symlinks\n"
                "                      When shutting down, execute action immediately\n"
                "     --runtime        Enable unit files only temporarily until next reboot\n"
                "  -f --force          When enabling unit files, override existing symlinks\n"
                "                      When shutting down, execute action immediately\n"

-               "     --preset-mode=   Specifies whether fully apply presets, or only enable,\n"
-               "                      or only disable\n"
+               "     --preset-mode=   Apply only enable, only disable, or all presets\n"

                "     --root=PATH      Enable unit files in the specified root directory\n"
                "  -n --lines=INTEGER  Number of journal entries to show\n"
                "  -o --output=STRING  Change journal output mode (short, short-iso,\n"
                "     --root=PATH      Enable unit files in the specified root directory\n"
                "  -n --lines=INTEGER  Number of journal entries to show\n"
                "  -o --output=STRING  Change journal output mode (short, short-iso,\n"


@@ -6100,7 +6098,7 @@ static void systemctl_help(void) {
                "  show-environment                Dump environment\n"
                "  set-environment NAME=VALUE...   Set one or more environment variables\n"
                "  unset-environment NAME...       Unset one or more environment variables\n"
                "  show-environment                Dump environment\n"
                "  set-environment NAME=VALUE...   Set one or more environment variables\n"
                "  unset-environment NAME...       Unset one or more environment variables\n"

-               "  import-environment NAME...      Import all, one or more environment variables\n\n"
+               "  import-environment [NAME...]    Import all or some environment variables\n\n"

                "Manager Lifecycle Commands:\n"
                "  daemon-reload                   Reload systemd manager configuration\n"
                "  daemon-reexec                   Reexecute systemd manager\n\n"
                "Manager Lifecycle Commands:\n"
                "  daemon-reload                   Reload systemd manager configuration\n"
                "  daemon-reexec                   Reexecute systemd manager\n\n"