[epiphany/mcatanzaro/cli-pt2: 2/3] Flip -i and -p in help output

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 60e40ab608342f11e8429060d1c7a9e42e46b9da
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Fri Jan 4 13:26:28 2019 -0600

    Flip -i and -p in help output
    
    Incognito mode does not use a private instance, so keep the private
    instance options together.
    
    At least now it should be clearer what the difference between incognito
    mode and private mode is!

 data/epiphany.1 | 6 +++---
 src/ephy-main.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/epiphany.1 b/data/epiphany.1
index 05eede2c0..666f5a3b5 100644
--- a/data/epiphany.1
+++ b/data/epiphany.1
@@ -20,12 +20,12 @@ Open a new browser window instead of a new tab
 \fB\-l\fR, \fB\-\-load\-session\fR=\fIFILE\fR
 Load the given session state file
 .TP
-\fB\-p\fR, \fB\-\-private\-instance\fR
-Start a private instance with separate user data
-.TP
 \fB\-\-incognito\-mode\fR
 Start an instance with user data read-only
 .TP
+\fB\-p\fR, \fB\-\-private\-instance\fR
+Start a private instance with separate user data
+.TP
 \fB\-a\fR, \fB\-\-application\-mode\fR[=\fIBASENAME\fR]
 Start a private instance in web application mode (requires passing either desktop file basename or
 .B \-\-profile)
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 603c536bb..877952075 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -113,10 +113,10 @@ static const GOptionEntry option_entries[] =
     N_("Open a new browser window instead of a new tab"), NULL },
   { "load-session", 'l', 0, G_OPTION_ARG_FILENAME, &session_filename,
     N_("Load the given session state file"), N_("FILE") },
-  { "private-instance", 'p', 0, G_OPTION_ARG_NONE, &private_instance,
-    N_("Start a private instance with separate user data"), NULL },
   { "incognito-mode", 'i', 0, G_OPTION_ARG_NONE, &incognito_mode,
     N_("Start an instance with user data read-only"), NULL },
+  { "private-instance", 'p', 0, G_OPTION_ARG_NONE, &private_instance,
+    N_("Start a private instance with separate user data"), NULL },
   { "application-mode", 'a', G_OPTION_FLAG_FILENAME | G_OPTION_FLAG_OPTIONAL_ARG,
     G_OPTION_ARG_CALLBACK, application_mode_cb,
     N_("Start a private instance in web application mode"), NULL },