New upstream version 3.0.5upstream/3.0.5

1 files changed, 51 insertions, 17 deletions

diff --git a/htop.1.in b/htop.1.in
index 0205a99..cd98478 100644
--- a/htop.1.in
+++ b/htop.1.in
@@ -2,11 +2,9 @@
 .SH "NAME"
 htop \- interactive process viewer
 .SH "SYNOPSIS"
-.LP
 .B htop
 .RB [ \-dCFhpustvH ]
 .SH "DESCRIPTION"
-.LP
 .B htop
 is a cross-platform ncurses-based process viewer.
 .LP
@@ -22,9 +20,7 @@ Tasks related to processes (killing, renicing) can be done without
 entering their PIDs.
 .br
 .SH "COMMAND-LINE OPTIONS"
-.LP
 Mandatory arguments to long options are mandatory for short options too.
-.LP
 .TP
 \fB\-d \-\-delay=DELAY\fR
 Delay between updates, in tenths of seconds. If the delay value is
@@ -46,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
@@ -61,15 +58,14 @@ 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
 .SH "INTERACTIVE COMMANDS"
-.LP
 The following commands are supported while in
 .BR htop :
-.LP
 .TP 5
 .B Up, Alt-k
 Select (highlight) the previous process in the process list. Scroll the list
@@ -141,6 +137,7 @@ select which columns are displayed, in which order.
 Incrementally search the command lines of all the displayed processes. The
 currently selected (highlighted) command will update as you type. While in
 search mode, pressing F3 will cycle through matching occurrences.
+Pressing Shift-F3 will cycle backwards.
 
 Alternatively the search can be started by simply typing the command
 you are looking for, although for the first character normal key
@@ -157,11 +154,9 @@ between them as a tree. Toggling the key will switch between tree and
 your previously selected sort view. Selecting a sort view will exit
 tree view.
 .TP
-.B F6
-On sorted view, select a field for sorting, also accessible through < and >.
+.B F6, <, >
+Selects a field for sorting, also accessible through < and >.
 The current sort field is indicated by a highlight in the header.
-On tree view, expand or collapse the current subtree. A "+" indicator in the
-tree node indicates that it is collapsed.
 .TP
 .B F7, ]
 Increase the selected process's priority (subtract from 'nice' value).
@@ -192,6 +187,9 @@ Set CPU affinity: mark which CPUs a process is allowed to use.
 .B u
 Show only processes owned by a specified user.
 .TP
+.B N
+Sort by PID.
+.TP
 .B M
 Sort by memory usage (top compatibility key).
 .TP
@@ -232,7 +230,6 @@ Refresh: redraw screen and recalculate values.
 PID search: type in process ID and the selection highlight will be moved to it.
 .PD
 .SH "COLUMNS"
-.LP
 The following columns can display data about each process. A value of '\-' in
 all the rows indicates that a column is unsupported on your system, or
 currently unimplemented in
@@ -242,7 +239,6 @@ The names below are the ones used in the
 shown in
 .BR htop 's
 main screen, it is shown below in parenthesis.
-.LP
 .TP 5
 .B Command
 The full command line of the process (i.e. program name and arguments). If the
@@ -460,8 +456,48 @@ The executable file of the process as reported by the kernel. Requires CAP_SYS_P
 .TP
 .B All other flags
 Currently unsupported (always displays '-').
+.SH "EXTERNAL LIBRARIES"
+While
+.B htop
+depends on most of the libraries it uses at build time there are two
+noteworthy exceptions to this rule. These exceptions both relate to
+data displayed in meters displayed in the header of
+.B htop
+and were intentionally created as optional runtime dependencies instead.
+These exceptions are described below:
+.TP
+.B libsystemd
+The bindings for libsystemd are used in the SystemD meter to determine
+the number of active services and the overall system state. Looking for
+the functions to determine these information at runtime allows for
+builds to support these meters without forcing the package manager
+to install these libraries on systems that otherwise don't use systemd.
+
+Summary: no build time dependency, optional runtime dependency on
+.B libsystemd
+via dynamic loading, with
+.B systemctl(1)
+fallback.
+.TP
+.B libsensors
+The bindings for libsensors are used for the CPU temperature readings
+in the CPU usage meters if displaying the temperature is enabled through
+the setup screen. In order for
+.B htop
+to show these temperatures correctly though, a proper configuration
+of libsensors through its usual configuration files is assumed and that
+all CPU cores correspond to temperature sensors from the
+.B coretemp
+driver with core 0 corresponding to a sensor labelled "Core 0". The
+package temperature may be given as "Package id 0". If missing it is
+inferred as the maximum value from the available per-core readings.
+
+Summary: build time dependency on
+.B libsensors(3)
+C header files, optional runtime dependency on
+.B libsensors(3)
+via dynamic loading.
 .SH "CONFIG FILE"
-.LP
 By default
 .B htop
 reads its configuration from the XDG-compliant path
@@ -479,7 +515,6 @@ You may override the location of the configuration file using the $HTOPRC
 environment variable (so you can have multiple configurations for different
 machines that share the same home directory, for example).
 .SH "MEMORY SIZES"
-.LP
 Memory sizes in
 .B htop
 are displayed in a human-readable form.
@@ -497,7 +532,6 @@ space and make memory size representations consistent throughout
 and
 .BR limits.conf (5).
 .SH "AUTHORS"
-.LP
 .B htop
 was originally developed by Hisham Muhammad.
 Nowadays it is maintained by the community at <htop@groups.io>.