Update help and man page for improved -t / -s options

htop.1.in

@@ -42,7 +42,8 @@ Display a help message and exit
 Show only the given PIDs
 .TP
 \fB\-s \-\-sort\-key COLUMN\fR
-Sort by this column (use \-\-sort\-key help for a column list)
+Sort by this column (use \-\-sort\-key help for a column list).
+This will force a list view unless you specify -t at the same time.
 .TP
 \fB\-u \-\-user=USERNAME\fR
 Show only the processes of a given user
@@ -57,7 +58,8 @@ Disable support of mouse control
 Output version information and exit
 .TP
 \fB\-t \-\-tree
-Show processes in tree view
+Show processes in tree view. This can be used to force a tree view when
+requesting a sort order with -s.
 .TP
 \fB\-H \-\-highlight-changes=DELAY\fR
 Highlight new and old processes

htop.c

@@ -49,8 +49,8 @@ static void printHelpFlag(void) {
          "-H --highlight-changes[=DELAY]  Highlight new and old processes\n"
          "-M --no-mouse                   Disable the mouse\n"
          "-p --pid=PID[,PID,PID...]       Show only the given PIDs\n"
-         "-s --sort-key=COLUMN            Sort by COLUMN (try --sort-key=help for a list)\n"
-         "-t --tree                       Show the tree view by default\n"
+         "-s --sort-key=COLUMN            Sort by COLUMN in list view (try --sort-key=help for a list)\n"
+         "-t --tree                       Show the tree view (can be combined with -s)\n"
          "-u --user[=USERNAME]            Show only processes for a given user (or $USER)\n"
          "-U --no-unicode                 Do not use unicode but plain ASCII\n"
          "-V --version                    Print version info\n"