From 2cda36010e4ebe05245bd5772993a8370cfa63fb Mon Sep 17 00:00:00 2001
From: startx2017 <vradu.startx@yandex.com>
Date: Sun, 2 Jun 2019 13:07:10 -0400
Subject: merge: Sort items alphabetically in man firejail

---
 src/man/firejail.txt | 23 ++++++++++++-----------
 status               |  2 --
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index fd1d4a6be..07939b6d5 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -92,34 +92,35 @@ $ firejail --allusers
 .TP
 \fB\-\-apparmor
 Enable AppArmor confinement. For more information, please see \fBAPPARMOR\fR section below.
+
 .TP
-\fB\-\-appimage
-Sandbox an AppImage (https://appimage.org/) application. If the sandbox is started as a
-regular user, default seccomp and capabilities filters are enabled.
+\fB\-\-apparmor.print=name|pid
+Print the AppArmor confinement status for the sandbox identified by name or by PID.
 .br
 
 .br
 Example:
 .br
-$ firejail --appimage krita-3.0-x86_64.appimage
+$ firejail \-\-apparmor.print=browser
 .br
-$ firejail --appimage --private krita-3.0-x86_64.appimage
+5074:netblue:/usr/bin/firejail /usr/bin/firefox-esr
 .br
-$ firejail --appimage --net=none --x11 krita-3.0-x86_64.appimage
+  AppArmor: firejail-default enforce
 
 .TP
-\fB\-\-apparmor.print=name|pid
-Print the AppArmor confinement status for the sandbox identified by name or by PID.
+\fB\-\-appimage
+Sandbox an AppImage (https://appimage.org/) application. If the sandbox is started as a
+regular user, default seccomp and capabilities filters are enabled.
 .br
 
 .br
 Example:
 .br
-$ firejail \-\-apparmor.print=browser
+$ firejail --appimage krita-3.0-x86_64.appimage
 .br
-5074:netblue:/usr/bin/firejail /usr/bin/firefox-esr
+$ firejail --appimage --private krita-3.0-x86_64.appimage
 .br
-  AppArmor: firejail-default enforce
+$ firejail --appimage --net=none --x11 krita-3.0-x86_64.appimage
 
 .TP
 \fB\-\-bandwidth=name|pid
diff --git a/status b/status
index 3f1a4e7de..c7d686018 100644
--- a/status
+++ b/status
@@ -16,12 +16,10 @@ todo Mar 23: mount runtime seccomp files read-only
 
 Jan 13: fix parent death signal
 todo: Sort items alphabetically in man firejail #2479, Feb 26
-todo: Alphabetical ordering of firecfg.config #2544, Mar 8
 Mar 13: Fix incorrect parsing of --keep-var-tmp command #2587
 Mar 13: Avoid including globals.local twice, #2586
 Mar 10: fix --list reporting for sandboxes using --x11=none; to be ported Mar 10
 Mar 10: checking for invalid chars in profile filename before any other proce…
-todo: documentation update - Feb 23
 Feb 6: strncmp byte count fixes
 Jan 19: disallow zero seconds timeout
 
-- 
cgit v1.2.3-54-g00ecf