Mapgen: Various fixes and improvements

[oweals/minetest.git] / doc / minetest.6

diff --git a/doc/minetest.6 b/doc/minetest.6
index cd818e1d8c86fd3cb0602dc5bec3381d7d48f370..a135e541cfbc4bc7fcd4dccefdeb8140685c3d88 100644 (file)
--- a/doc/minetest.6
+++ b/doc/minetest.6
@@ -1,12 +1,18 @@
-.\" Minetest man page
 .TH minetest 6 "10 September 2013" "" ""
 
 .SH NAME
-minetest \- Multiplayer infinite-world block sandbox
+minetest, minetestserver \- Multiplayer infinite-world block sandbox
 
 .SH SYNOPSIS
 .B minetest
-[ OPTION ... ]
+[\fB--server SERVER OPTIONS\fR | \fBCLIENT OPTIONS\fR]
+[\fBCOMMON OPTIONS\fR]
+[\fBWORLD PATH\fR]
+
+.B minetestserver
+[\fBSERVER OPTIONS\fR]
+[\fBCOMMON OPTIONS\fR]
+[\fBWORLD PATH\fR]
 
 .SH DESCRIPTION
 .B Minetest
@@ -14,79 +20,82 @@ is one of the first InfiniMiner/Minecraft(/whatever) inspired games (started Oct
 .PP
 The main design philosophy is to keep it technically simple, stable and portable. It will be kept lightweight enough to run on fairly old hardware.
 
-.SH OPTIONS
+.SH COMMON OPTIONS
 .TP
-\-\-address <value>
-Address to connect to
+.B \-\-help
+Print allowed options and exit
 .TP
-\-\-config <value>
+.B \-\-version
+Print version information and exit
+.TP
+.B \-\-config <value>
 Load configuration from specified file
 .TP
-\-\-disable\-unittests
-Disable unit tests
+.B \-\-logfile <value>
+Set logfile path (debug.txt)
 .TP
-\-\-enable\-unittests
-Enable unit tests
+.B \-\-info
+Print more information to console
 .TP
-\-\-gameid <value>
-Set gameid
+.B \-\-verbose
+Print even more information to console
 .TP
-\-\-go
-Disable main menu
+.B \-\-trace
+Print enormous amounts of information to console
 .TP
-\-\-help
-Show allowed options
+.B \-\-gameid <value>
+Set gameid
 .TP
-\-\-version
-Show version information
+.B \-\-worldname <value>
+Set world path by name
 .TP
-\-\-logfile <value>
-Set logfile path (debug.txt)
+.B \-\-world <value> | list
+Set world path or list worlds
 .TP
-\-\-map\-dir <value>
+.B \-\-map\-dir <value>
 Same as \-\-world (deprecated)
 .TP
-\-\-name <value>
-Set player name
-.TP
-\-\-password <value>
-Set password
-.TP
-\-\-port <value>
+.B \-\-port <value>
 Set network port (UDP) to use
 .TP
-\-\-random\-input
-Enable random user input, for testing
-.TP
-\-\-server
-Run dedicated server
+.B \-\-run\-unittests
+Run unit tests and exit
+
+.SH CLIENT OPTIONS
 .TP
-\-\-speedtests
-Run speed tests
+.B \-\-address <value>
+Address to connect to
 .TP
-\-\-videomodes
-List available video modes
+.B \-\-go
+Disable main menu
 .TP
-\-\-info
-Print more information to console
+.B \-\-name <value>
+Set player name
 .TP
-\-\-verbose
-Print even more information to console
+.B \-\-password <value>
+Set password
 .TP
-\-\-trace
-Print enormous amounts of information to console
+.B \-\-random\-input
+Enable random user input, for testing (client only)
 .TP
-\-\-world <value>
-Set world path
+.B \-\-videomodes
+List available video modes (client only)
 .TP
-\-\-migrate <value>
-Migrate from current map backend to another. Possible values are sqlite3
-and leveldb. Only works when using \-\-server.
+.B \-\-speedtests
+Run speed tests
 
-.SH ENVIRONMENT VARIABLES
+.SH SERVER OPTIONS
+.TP
+.B \-\-migrate <value>
+Migrate from current map backend to another. Possible values are sqlite3,
+leveldb, redis, and dummy.
+.TP
+.B \-\-terminal
+Display an interactive terminal over ncurses during execution.
 
+.SH ENVIRONMENT
 .TP
-MINETEST_SUBGAME_PATH
+.B MINETEST_SUBGAME_PATH
 Colon delimited list of directories to search for subgames.
 
 .SH BUGS
@@ -103,5 +112,3 @@ Juhani Numminen <juhaninumminen0@gmail.com>.
 .SH WWW
 http://www.minetest.net/
 
-.SH "SEE ALSO"
-.BR minetestserver(6)