Use singular in help metavars + update man pages.

https://fedorahosted.org/freeipa/ticket/4695

Reviewed-By: Martin Basti <mbasti@redhat.com>

install/tools/ipa-dns-install

@@ -43,16 +43,16 @@ def parse_options():
                       sensitive=True, help="admin password")
     parser.add_option("-d", "--debug", dest="debug", action="store_true",
                       default=False, help="print debugging information")
-    parser.add_option("--ip-address", dest="ip_addresses",
+    parser.add_option("--ip-address", dest="ip_addresses", metavar="IP_ADDRESS",
                       default=[], action="append",
-                      type="ip", ip_local=True, help="Master Server IP Address")
+                      type="ip", ip_local=True, help="Master Server IP Address. This option can be used multiple times")
     parser.add_option("--forwarder", dest="forwarders", action="append",
                       type="ip", help="Add a DNS forwarder. This option can be used multiple times")
     parser.add_option("--no-forwarders", dest="no_forwarders", action="store_true",
                       default=False, help="Do not add any DNS forwarders, use root servers instead")
     parser.add_option("--reverse-zone", dest="reverse_zones",
-                      default=[], action="append",
-                      help="The reverse DNS zone to use")
+                      default=[], action="append", metavar="REVERSE_ZONE",
+                      help="The reverse DNS zone to use. This option can be used multiple times")
     parser.add_option("--no-reverse", dest="no_reverse", action="store_true",
                       default=False, help="Do not create new reverse DNS zone")
     parser.add_option("--no-dnssec-validation", dest="no_dnssec_validation", action="store_true",

install/tools/ipa-replica-install

@@ -69,7 +69,7 @@ def parse_options():
                       default=False, help="configure a dogtag KRA")
     basic_group.add_option("--ip-address", dest="ip_addresses",
                       type="ip", ip_local=True, action="append", default=[],
-                      help="Replica server IP Address")
+                      help="Replica server IP Address. This option can be used multiple times", metavar="IP_ADDRESS")
     basic_group.add_option("-p", "--password", dest="password", sensitive=True,
                       help="Directory Manager (existing master) password")
     basic_group.add_option("-w", "--admin-password", dest="admin_password", sensitive=True,
@@ -113,7 +113,8 @@ def parse_options():
     dns_group.add_option("--no-forwarders", dest="no_forwarders", action="store_true",
                       default=False, help="Do not add any DNS forwarders, use root servers instead")
     dns_group.add_option("--reverse-zone", dest="reverse_zones", default=[],
-                         action="append", help="The reverse DNS zone to use")
+                         action="append", help="The reverse DNS zone to use. This option can be used multiple times",
+                        metavar="REVERSE_ZONE")
     dns_group.add_option("--no-reverse", dest="no_reverse", action="store_true",
                       default=False, help="Do not create new reverse DNS zone")
     dns_group.add_option("--no-dnssec-validation", dest="no_dnssec_validation", action="store_true",

install/tools/ipa-server-install

@@ -180,7 +180,8 @@ def parse_options():
     basic_group.add_option("--hostname", dest="host_name", help="fully qualified name of server")
     basic_group.add_option("--ip-address", dest="ip_addresses",
                       type="ip", ip_local=True, action="append", default=[],
-                      help="Master Server IP Address")
+                      help="Master Server IP Address. This option can be used multiple times",
+                      metavar="IP_ADDRESS")
     basic_group.add_option("-N", "--no-ntp", dest="conf_ntp", action="store_false",
                       help="do not configure ntp", default=True)
     basic_group.add_option("--idstart", dest="idstart", default=namespace, type=int,
@@ -285,8 +286,9 @@ def parse_options():
                       type="ip", help="Add a DNS forwarder. This option can be used multiple times")
     dns_group.add_option("--no-forwarders", dest="no_forwarders", action="store_true",
                       default=False, help="Do not add any DNS forwarders, use root servers instead")
-    dns_group.add_option("--reverse-zone", dest="reverse_zones", help="The reverse DNS zone to use",
-                      action="append", default=[])
+    dns_group.add_option("--reverse-zone", dest="reverse_zones",
+                      help="The reverse DNS zone to use. This option can be used multiple times",
+                      action="append", default=[], metavar="REVERSE_ZONE")
     dns_group.add_option("--no-reverse", dest="no_reverse", action="store_true",
                       default=False, help="Do not create reverse DNS zone")
     dns_group.add_option("--no-dnssec-validation", dest="no_dnssec_validation", action="store_true",

install/tools/man/ipa-dns-install.1

@@ -33,6 +33,7 @@ Enable debug logging when more verbose output is needed
 .TP
 \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR
 The IP address of the IPA server. If not provided then this is determined based on the hostname of the server.
+This this option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
 .TP
 \fB\-\-forwarder\fR=\fIFORWARDER\fR
 A forwarder is a DNS server where queries for a specific non\-resolvable address can be directed. To define multiple forwarders use multiple instances of \fB\-\-forwarder\fR
@@ -41,7 +42,7 @@ A forwarder is a DNS server where queries for a specific non\-resolvable address
 Do not add any DNS forwarders, send non\-resolvable addresses to the DNS root servers.
 .TP
 \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR
-The reverse DNS zone to use
+The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones.
 .TP
 \fB\-\-no\-reverse\fR
 Do not create new reverse DNS zone. If used on a replica and a reverse DNS zone already exists for the subnet, it will be used.

install/tools/man/ipa-replica-install.1

@@ -40,6 +40,7 @@ certificate operations will be forwarded to a master with a CA installed.
 .TP
 \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR
 The IP address of this server. If this address does not match the address the host resolves to and \-\-setup\-dns is not selected the installation will fail. If the server hostname is not resolvable, a record for the hostname and IP_ADDRESS is added to /etc/hosts.
+This this option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
 .TP
 \fB\-p\fR \fIDM_PASSWORD\fR, \fB\-\-password\fR=\fIDM_PASSWORD\fR
 Directory Manager (existing master) password
@@ -98,7 +99,7 @@ the \fB\-\-no\-forwarders\fR option is specified.
 Do not add any DNS forwarders. Root DNS servers will be used instead.
 .TP
 \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR
-The reverse DNS zone to use
+The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones.
 .TP
 \fB\-\-no\-reverse\fR
 Do not create new reverse DNS zone. If a reverse DNS zone already exists for the subnet, it will be used.

install/tools/man/ipa-replica-prepare.1

@@ -67,9 +67,10 @@ Directory Manager (existing master) password
 .TP
 \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR
 IP address of the replica server. If you provide this option, the A and PTR records will be added to the DNS.
+This this option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
 .TP
 \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR
-The reverse DNS zone to use
+The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones.
 .TP
 \fB\-\-no\-reverse\fR
 Do not create reverse DNS zone

install/tools/man/ipa-server-install.1

@@ -50,6 +50,7 @@ The fully\-qualified DNS name of this server. If the hostname does not match sys
 .TP
 \fB\-\-ip\-address\fR=\fIIP_ADDRESS\fR
 The IP address of this server. If this address does not match the address the host resolves to and --setup-dns is not selected the installation will fail. If the server hostname is not resolvable, a record for the hostname and IP_ADDRESS is added to /etc/hosts.
+This this option can be used multiple times to specify more IP addresses of the server (e.g. multihomed and/or dualstacked server).
 .TP
 \fB\-N\fR, \fB\-\-no\-ntp\fR
 Do not configure NTP
@@ -153,7 +154,7 @@ the \fB\-\-no\-forwarders\fR option is specified.
 Do not add any DNS forwarders. Root DNS servers will be used instead.
 .TP
 \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR
-The reverse DNS zone to use
+The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones.
 .TP
 \fB\-\-no\-reverse\fR
 Do not create reverse DNS zone

ipaserver/install/ipa_replica_prepare.py

@@ -55,11 +55,11 @@ class ReplicaPrepare(admintool.AdminTool):
         parser.add_option("-p", "--password", dest="password",
             help="Directory Manager password (for the existing master)")
         parser.add_option("--ip-address", dest="ip_addresses", type="ip",
-            action="append", default=[],
-            help="add A and PTR records of the future replica")
+            action="append", default=[], metavar="IP_ADDRESS",
+            help="add A and PTR records of the future replica. This option can be used multiple times")
         parser.add_option("--reverse-zone", dest="reverse_zones",
-            action="append", default=[],
-            help="the reverse DNS zone to use")
+            action="append", default=[], metavar="REVERSE_ZONE",
+            help="the reverse DNS zone to use. This option can be used multiple times")
         parser.add_option("--no-reverse", dest="no_reverse",
             action="store_true", default=False,
             help="do not create reverse DNS zone")