Merge branch 'stable-2.7' into stable-2.8

[ganeti-local] / man / gnt-job.rst

diff --git a/man/gnt-job.rst b/man/gnt-job.rst
index 56d3817..3a88326 100644 (file)
--- a/man/gnt-job.rst
+++ b/man/gnt-job.rst
@@ -41,11 +41,28 @@ if the string all is passed.
 CANCEL
 ~~~~~~
 
-**cancel** {*id*}
+| **cancel**
+| {[\--force] {\--pending | \--queued | \--waiting} |
+|  *job-id* ...}
 
-Cancel the job identified by the given *id*. Only jobs that have
+Cancel the job(s) identified by the given *job id*. Only jobs that have
 not yet started to run can be canceled; that is, jobs in either the
-*queued* or *waiting* state.
+*queued* or *waiting* state. To skip a confirmation, pass ``--force``.
+``--queued`` and ``waiting`` can be used to cancel all jobs in the
+respective state, ``--pending`` includes both.
+
+CHANGE-PRIORITY
+~~~~~~~~~~~~~~~
+
+| **change-priority** \--priority {low | normal | high}
+| {[\--force] {\--pending | \--queued | \--waiting} |
+|  *job-id* ...}
+
+Changes the priority of one or multiple pending jobs. Jobs currently
+running have only the priority of remaining opcodes changed.
+``--priority`` must be specified. ``--queued`` and ``waiting`` can be
+used to re-prioritize all jobs in the respective state, ``--pending``
+includes both. To skip a confirmation, pass ``--force``.
 
 INFO
 ~~~~
@@ -96,7 +113,7 @@ The following options can be used to show only specific jobs:
   Show finished jobs only.
 
 If exactly one argument is given and it appears to be a query filter
-(see **ganeti(7)**), the query result is filtered accordingly. For
+(see **ganeti**\(7)), the query result is filtered accordingly. For
 ambiguous cases (e.g. a single field name as a filter) the ``--filter``
 (``-F``) option forces the argument to be treated as a filter.