Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / man / ganeti-noded.rst

diff --git a/man/ganeti-noded.rst b/man/ganeti-noded.rst
index fcc8b60..3321cb8 100644 (file)
--- a/man/ganeti-noded.rst
+++ b/man/ganeti-noded.rst
@@ -9,7 +9,8 @@ ganeti-noded - Ganeti node daemon
 Synopsis
 --------
 
-**ganeti-noded** [-f] [-d]
+**ganeti-noded** [-f] [-d] [-p *PORT*] [-b *ADDRESS*] [-i *INTERFACE*]
+[--no-mlock] [--syslog] [--no-ssl] [-K *SSL_KEY_FILE*] [-C *SSL_CERT_FILE*]
 
 DESCRIPTION
 -----------
@@ -19,7 +20,7 @@ node functions in the Ganeti system.
 
 By default, in order to be able to support features such as node
 powercycling even on systems with a very damaged root disk,
-**ganeti-noded** locks itself in RAM using **mlockall**(2). You can
+**ganeti-noded** locks itself in RAM using **mlockall**\(2). You can
 disable this feature by passing in the ``--no-mlock`` to the daemon.
 
 For testing purposes, you can give the ``-f`` option and the
@@ -31,10 +32,11 @@ Logging to syslog, rather than its own log file, can be enabled by
 passing in the ``--syslog`` option.
 
 The **ganeti-noded** daemon listens to port 1811 TCP, on all
-interfaces, by default. This can be overridden by an entry the
-services database (usually /etc/services) or by passing the ``-p``
+interfaces, by default. The port can be overridden by an entry in the
+services database (usually ``/etc/services``) or by passing the ``-p``
 option.  The ``-b`` option can be used to specify the address to bind
-to (defaults to ``0.0.0.0``).
+to (defaults to ``0.0.0.0``); alternatively, the ``-i`` option can be
+used to specify the interface to bind do.
 
 Ganeti noded communication is protected via SSL, with a key
 generated at cluster init time. This can be disabled with the