This is an automated email from the git hooks/post-receive script.
rharwood pushed a commit to branch master in repository gssproxy.
The following commit(s) were added to refs/heads/master by this push: new 17496c4 Sort options in man pages 17496c4 is described below
commit 17496c4cecc9087bd18efc97590d5111cfb6a0ec Author: Robbie Harwood rharwood@redhat.com AuthorDate: Mon Nov 19 16:38:41 2018 -0500
Sort options in man pages
Signed-off-by: Robbie Harwood rharwood@redhat.com Reviewd-by: Simo Sorce simo@redhat.com Merges: #236 --- man/gssproxy.8.xml | 45 +++++++++++++-------------- man/gssproxy.conf.5.xml | 81 ++++++++++++++++++++++++------------------------- 2 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/man/gssproxy.8.xml b/man/gssproxy.8.xml index 21f7e6a..5038411 100644 --- a/man/gssproxy.8.xml +++ b/man/gssproxy.8.xml @@ -58,16 +58,6 @@ </varlistentry> <varlistentry> <term> - <option>-i</option>,<option>--interactive</option> - </term> - <listitem> - <para> - Run in the foreground, don't become a daemon. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> <option>-c</option>,<option>--config</option> </term> <listitem> @@ -109,18 +99,6 @@ </varlistentry> <varlistentry> <term> - <option>-s</option>,<option>--socket</option> - </term> - <listitem> - <para> - Specify a custom default socket name. This socket will be used - by all sections that do not define an explicit socket. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term> <option>-d</option>,<option>--debug</option> </term> <listitem> @@ -130,7 +108,6 @@ </para> </listitem> </varlistentry> - <varlistentry> <term> <option>--debug-level=</option> @@ -150,7 +127,27 @@ </para> </listitem> </varlistentry> - + <varlistentry> + <term> + <option>-i</option>,<option>--interactive</option> + </term> + <listitem> + <para> + Run in the foreground, don't become a daemon. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>-s</option>,<option>--socket</option> + </term> + <listitem> + <para> + Specify a custom default socket name. This socket will be used + by all sections that do not define an explicit socket. + </para> + </listitem> + </varlistentry> <varlistentry> <term> <option>--version</option> diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml index a6a620b..04059a8 100644 --- a/man/gssproxy.conf.5.xml +++ b/man/gssproxy.conf.5.xml @@ -141,15 +141,6 @@ </varlistentry>
<varlistentry> - <term>cred_usage (string)</term> - <listitem> - <para>Allow to restrict the kind of operations permitted for this service.</para> - <para>The allowed options are: initiate, accept, both</para> - <para>Default: cred_usage = both </para> - </listitem> - </varlistentry> - - <varlistentry> <term>cred_store (string)</term> <listitem> <para>This parameter allows to control in which way gssproxy should use the cred_store interface provided by GSSAPI. The parameter can be defined multiple times per service.</para> @@ -190,6 +181,15 @@ </varlistentry>
<varlistentry> + <term>cred_usage (string)</term> + <listitem> + <para>Allow to restrict the kind of operations permitted for this service.</para> + <para>The allowed options are: initiate, accept, both</para> + <para>Default: cred_usage = both </para> + </listitem> + </varlistentry> + + <varlistentry> <term>debug (boolean)</term> <listitem> <para> @@ -220,18 +220,6 @@ </varlistentry>
<varlistentry> - <term>euid (integer or string)</term> - <listitem> - <para>Either the numeric (e.g., 48) or symbolic (e.g., - apache) effective uid of a running process, - required to identify a service.</para> - <para>The "euid" parameter is imperative, any section - without it will be discarded.</para> - <para>Default: euid =</para> - </listitem> - </varlistentry> - - <varlistentry> <term>enforce_flags (string)</term> <listitem> <para> @@ -258,6 +246,18 @@ </varlistentry>
<varlistentry> + <term>euid (integer or string)</term> + <listitem> + <para>Either the numeric (e.g., 48) or symbolic (e.g., + apache) effective uid of a running process, + required to identify a service.</para> + <para>The "euid" parameter is imperative, any section + without it will be discarded.</para> + <para>Default: euid =</para> + </listitem> + </varlistentry> + + <varlistentry> <term>filter_flags (string)</term> <listitem> <para> @@ -316,7 +316,7 @@ </para> <para>Default: krb5_principal = </para> </listitem> - </varlistentry> + </varlistentry>
<varlistentry> <term>mechs (string)</term> @@ -326,7 +326,21 @@ without it will be discarded.</para> <para>Default: mechs = </para> </listitem> - </varlistentry> + </varlistentry> + + <varlistentry> + <term>program (string)</term> + <listitem> + <para>If specified, this service will only match when + the program being run is the specified string. + </para> + <para>Programs are assumed to be specified as + canonical paths (i.e., no relative paths, no + symlinks). Additionally, the '|' character is + reserved for future use and therefore forbidden. + </para> + </listitem> + </varlistentry>
<varlistentry> <term>run_as_user (string)</term> @@ -344,7 +358,7 @@ or euid instead. </para> </listitem> - </varlistentry> + </varlistentry>
<varlistentry> <term>socket (string)</term> @@ -354,20 +368,6 @@ <para>When this parameter is not set, gssproxy will use a compiled-in default.</para> </listitem> - </varlistentry> - - <varlistentry> - <term>program (string)</term> - <listitem> - <para>If specified, this service will only match when - the program being run is the specified string. - </para> - <para>Programs are assumed to be specified as - canonical paths (i.e., no relative paths, no - symlinks). Additionally, the '|' character is - reserved for future use and therefore forbidden. - </para> - </listitem> </varlistentry>
<varlistentry> @@ -375,7 +375,7 @@ <listitem><para>Defines whether this service is considered trusted. Use with caution, this enables impersonation.</para> <para>Default: trusted = false</para> </listitem> - </varlistentry> + </varlistentry>
<varlistentry> <term>worker threads (integer)</term> @@ -383,8 +383,7 @@ <para>Defines the amount of worker threads gssproxy will create at startup.</para> <para>Default: worker threads = </para> </listitem> - </varlistentry> - + </varlistentry> </variablelist> </para> </refsect1>
gss-proxy@lists.fedorahosted.org
-
git repository hosting