From 95819f03eab00bb33a4fa7858248b92a83c477fc Mon Sep 17 00:00:00 2001
From: Axel Burri <axel@tty0.ch>
Date: Wed, 17 Apr 2019 17:07:54 +0200
Subject: [PATCH] documentation: btrbk.1: cosmetics: same order for options in
 all docs

---
 btrbk                |  2 ++
 doc/btrbk.1.asciidoc | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/btrbk b/btrbk
index b893af4..0344ec1 100755
--- a/btrbk
+++ b/btrbk
@@ -329,6 +329,8 @@ options:
        --format=FORMAT       change output format, FORMAT=table|long|raw
    -S, --print-schedule      print scheduler details (for the "run" command)
        --progress            show progress bar on send-receive operation
+       --lockfile=FILE       create and check lockfile
+       --override=KEY=VALUE  globally override a configuration option
 
 commands:
    run                   run snapshot and backup operations
diff --git a/doc/btrbk.1.asciidoc b/doc/btrbk.1.asciidoc
index bcfe110..0805cee 100644
--- a/doc/btrbk.1.asciidoc
+++ b/doc/btrbk.1.asciidoc
@@ -21,9 +21,9 @@ btrbk [-h|--help] [--version]
       [-p|--preserve] [--preserve-snapshots] [--preserve-backups]
       [-v|--verbose] [-q|--quiet] [-l|--loglevel <level>]
       [-t|--table] [--format <output-format>]
-      [--progress] [-S|--print-schedule]
-      [--override <config_option>=<value>]
+      [-S|--print-schedule] [--progress]
       [--lockfile <file>]
+      [--override <config_option>=<value>]
       <command> [<args>]
 
 
@@ -72,6 +72,9 @@ OPTIONS
 --version::
     Prints the btrbk version.
 
+-c, --config <file>::
+    Read the configuration from <file>.
+
 -n, --dry-run::
     Don't run anything that would alter the filesystem, just show the
     snapshots and backup subvolumes that would be created/deleted by
@@ -79,9 +82,6 @@ OPTIONS
     commands. Use in conjunction with '-l debug' to see the btrfs
     commands that would be executed.
 
--c, --config <file>::
-    Read the configuration from <file>.
-
 -p, --preserve::
     Preserve all snapshots and backups. Skips deletion of any
     snapshots and backups, even if specified in the configuration file
@@ -122,14 +122,14 @@ OPTIONS
     output format for *run*, *snapshot*, *resume*, *prune*, *archive*
     and *list* commands. Useful for further exporting/scripting.
 
---progress::
-    Show progress bar on send-receive operation.
-
 -S, --print-schedule::
     Print detailed scheduler information on *run*, *snapshot*,
     *resume*, *prune* and *archive* commands. Use the '--format'
     command line option to switch between different output formats.
 
+--progress::
+    Show progress bar on send-receive operation.
+
 --lockfile <file>::
     Create lockfile <file> on startup; checks lockfile before running
     any btrfs commands (using perl "flock"), and exits if the lock is