From 85d49aca17189e045f3937acb75c73484a378ca2 Mon Sep 17 00:00:00 2001
From: Simon Gomizelj <simongmzlj@gmail.com>
Date: Mon, 17 Jun 2013 02:03:55 -0400
Subject: [PATCH] reorder options in manpage and --help

---
 termite.1  | 21 +++++++++++----------
 termite.cc | 12 ++++++------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/termite.1 b/termite.1
index 4321438..e1e3c4b 100644
--- a/termite.1
+++ b/termite.1
@@ -14,25 +14,26 @@ terminal experience and pleasant array of keyboard-centric features.
 Display help message.
 .IP "\fB\-v\fR, \fB\-\-version\fR"
 Display version information.
-.IP "\fB\-r\fR, \fB\-\-role\fR\fB=\fR\fIROLE\fR"
-The role to set the termite window to report itself with.
-.IP "\fB\-d\fR, \fB\-\-directory\fR\fB=\fR\fIDIRECTORY\fR"
-Tell termite to change to \fIDIRECTORY\fP when launching.
 .IP "\fB\-e\fR, \fB\-\-exec\fR\fB=\fR\fICOMMAND\fR"
 Tell termite start \fICOMMAND\fP instead of the shell.
+.IP "\fB\-r\fR, \fB\-\-role\fR\fB=\fR\fIROLE\fR"
+The role to set the termite window to report itself with.
 .IP "\fB\-t\fR, \fB\-\-title\fR\fB=\fR\fITITLE\fR"
 Set the termite window's title to \fITITLE\fP. This disables dynamic
 titles.
-.IP "\fB\-c\fR, \fB\-\-config\fR\fB=\fR\fICONFIG\fR"
-Specify a path to an alternative config file to use.
-.IP "\fB\-x\fR, \fB\-\-transparency\fR\fB=\fR\fITRANSPARENCY\fR"
-Sets the inital Transparency.
+.IP "\fB\-d\fR, \fB\-\-directory\fR\fB=\fR\fIDIRECTORY\fR"
+Tell termite to change to \fIDIRECTORY\fP when launching.
+.IP "\fB\-x\fR, \fB\-\-transparency\fR\fB=\fR\fILEVEL\fR"
+Sets the window's transparency to \fILEVEL\fP, ranging from \fI0.0\fP
+(fully opaque) to \fI1.0\fP (fully transparent).
 .IP "\fB\-\-geometry\fR\fB=\fR\fIGEOMETRY\fR"
 Override the window geometry in pixels.
-.IP "\fB\-\-display\fR\fB=\fR\fIDISPLAY\fR"
-Launch on \fIDISPLAY\fP X display.
 .IP "\fB\-\-hold\fR"
 Keep termite open after the child process exits.
+.IP "\fB\-\-display\fR\fB=\fR\fIDISPLAY\fR"
+Launch on \fIDISPLAY\fP X display.
+.IP "\fB\-c\fR, \fB\-\-config\fR\fB=\fR\fICONFIG\fR"
+Specify a path to an alternative config file to use.
 .SH KEYBINDINGS
 .SS Insert Mode
 \fBInsert Mode\fP is the default mode common to most terminal emulators.
diff --git a/termite.cc b/termite.cc
index b457697..975f9cd 100644
--- a/termite.cc
+++ b/termite.cc
@@ -1258,15 +1258,15 @@ int main(int argc, char **argv) {
     char *title = nullptr;
     double trans = 0.0;
     const GOptionEntry entries[] = {
-        {"role", 'r', 0, G_OPTION_ARG_STRING, &role, "The role to use", "ROLE"},
-        {"geometry", 0, 0, G_OPTION_ARG_STRING, &geometry, "Window geometry", "GEOMETRY"},
-        {"directory", 'd', 0, G_OPTION_ARG_STRING, &directory, "Change to directory", "DIRECTORY"},
-        {"exec", 'e', 0, G_OPTION_ARG_STRING, &execute, "Command to execute", "COMMAND"},
-        {"title", 't', 0, G_OPTION_ARG_STRING, &title, "Window title", "TITLE"},
         {"version", 'v', 0, G_OPTION_ARG_NONE, &version, "Version info", nullptr},
+        {"exec", 'e', 0, G_OPTION_ARG_STRING, &execute, "Command to execute", "COMMAND"},
+        {"role", 'r', 0, G_OPTION_ARG_STRING, &role, "The role to use", "ROLE"},
+        {"title", 't', 0, G_OPTION_ARG_STRING, &title, "Window title", "TITLE"},
+        {"directory", 'd', 0, G_OPTION_ARG_STRING, &directory, "Change to directory", "DIRECTORY"},
+        {"transparency", 'x', 0, G_OPTION_ARG_DOUBLE, &trans, "Initial transparency", "OPACITY"},
+        {"geometry", 0, 0, G_OPTION_ARG_STRING, &geometry, "Window geometry", "GEOMETRY"},
         {"hold", 0, 0, G_OPTION_ARG_NONE, &hold, "Remain open after child process exits", nullptr},
         {"config", 'c', 0, G_OPTION_ARG_STRING, &config_file, "Path of config file", "CONFIG"},
-        {"transparency", 'x', 0, G_OPTION_ARG_DOUBLE, &trans, "Initial transparency", "TRANSPARENCY"},
         {}
     };
     g_option_context_add_main_entries(context, entries, nullptr);