From 3dfe93cd873f0467e7ee910f5e4463d757c9a718 Mon Sep 17 00:00:00 2001
From: Chiraag Nataraj <chiraag.nataraj@gmail.com>
Date: Thu, 3 May 2018 08:54:44 -0400
Subject: Moved documentation to conform with alphabetical ordering

---
 src/firejail/usage.c         |  2 +-
 src/man/firejail-profile.txt |  6 +++---
 src/man/firejail.txt         | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index be5eb3989..88614298e 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -94,6 +94,7 @@ static char *usage_str =
 	"    --join-network=name|pid - join the network namespace.\n"
 #endif
 	"    --join-or-start=name|pid - join the sandbox or start a new one.\n"
+	"    --keep-var-tmp - /var/tmp directory is untouched.\n"
 	"    --list - list all sandboxes.\n"
 #ifdef HAVE_FILE_TRANSFER
 	"    --ls=name|pid dir_or_filename - list files in sandbox container.\n"
@@ -221,7 +222,6 @@ static char *usage_str =
 	"    --writable-run-user - allow access to /run/user/$UID/systemd and\n"
 	"\t/run/user/$UID/gnupg.\n"
 	"    --writable-var - /var directory is mounted read-write.\n"
-	"    --keep-var-tmp - /var/tmp directory is untouched.\n"
 	"    --writable-var-log - use the real /var/log directory, not a clone.\n"
 #ifdef HAVE_X11
 	"    --x11 - enable X11 sandboxing. The software checks first if Xpra is\n"
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index c73f23b94..f136be510 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -164,6 +164,9 @@ Mount-bind file1 on top of file2. This option is only available when running as
 \fBdisable-mnt
 Disable /mnt, /media, /run/mount and /run/media access.
 .TP
+\fBkeep-var-tmp
+/var/tmp directory is untouched.
+.TP
 \fBmkdir directory
 Create a directory in user home or under /tmp before the sandbox is started.
 The directory is created if it doesn't already exist.
@@ -280,9 +283,6 @@ Disable the default blacklisting of run/user/$UID/systemd and /run/user/$UID/gnu
 \fBwritable-var
 Mount /var directory read-write.
 .TP
-\fBkeep-var-tmp
-/var/tmp directory is untouched.
-.TP
 \fBwritable-var-log
 Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log
 directory, and a skeleton filesystem is created based on the original /var/log.
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 87326a7bd..af9fe4b90 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -677,6 +677,16 @@ Same as "firejail --join=name" if sandbox with specified name exists, otherwise
 .br
 Note that in contrary to other join options there is respective profile option.
 
+.TP
+\fB\-\-keep-var-tmp
+/var/tmp directory is untouched.
+.br
+
+.br
+Example:
+.br
+$ firejail --keep-var-tmp
+
 .TP
 \fB\-\-ls=name|pid dir_or_filename
 List files in sandbox container, see \fBFILE TRANSFER\fR section for more details.
@@ -2128,16 +2138,6 @@ Example:
 .br
 $ sudo firejail --writable-var
 
-.TP
-\fB\-\-keep-var-tmp
-/var/tmp directory is untouched.
-.br
-
-.br
-Example:
-.br
-$ sudo firejail --keep-var-tmp
-
 .TP
 \fB\-\-writable-var-log
 Use the real /var/log directory, not a clone. By default, a tmpfs is mounted on top of /var/log
-- 
cgit v1.2.3-54-g00ecf