diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 4dbd6f0f4f..686192678a 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -479,16 +479,30 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class)
 	/* ---keyfile---
 	 * property: addresses
 	 * variable: address1, address2, ...
-	 * format: address/plen[,gateway]
+	 * format: address/plen
 	 * description: List of static IP addresses.
-	 * example: address1=192.168.100.100/24,192.168.100.1
-	 *   address2=10.1.1.5/24
+	 * example: address1=192.168.100.100/24 address2=10.1.1.5/24
 	 * ---end---
 	 * ---ifcfg-rh---
 	 * property: addresses
-	 * variable: IPADDR, PREFIX, GATEWAY, IPADDR1, PREFIX1, GATEWAY1, ...
+	 * variable: IPADDR, PREFIX, IPADDR1, PREFIX1, ...
 	 * description: List of static IP addresses.
-	 * example: IPADDR 10.5.5.23 PREFIX=24 GATEWAY=10.5.5.1
+	 * example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16
+	 * ---end---
+	 */
+
+	/* ---keyfile---
+	 * property: gateway
+	 * variable: gateway
+	 * format: string
+	 * description: Gateway IP addresses as a string.
+	 * example: gateway=192.168.100.1
+	 * ---end---
+	 * ---ifcfg-rh---
+	 * property: gateway
+	 * variable: GATEWAY
+	 * description: Gateway IP address.
+	 * example: GATEWAY=10.5.5.1
 	 * ---end---
 	 */
 
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index 1f82ec0dde..6bc85571f3 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -404,14 +404,31 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
 	/* ---keyfile---
 	 * property: addresses
 	 * variable: address1, address2, ...
-	 * format: address/plen[,gateway]
+	 * format: address/plen
 	 * description: List of static IP addresses.
-	 * example: address1=abbe::cafe/96,abbe::1
+	 * example: address1=abbe::cafe/96 address2=2001::1234
 	 * ---end---
 	 * ---ifcfg-rh---
 	 * property: addresses
-	 * variable: IPV6ADDR, IPV6_DEFAULTGW, IPV6ADDR_SECONDARIES
+	 * variable: IPV6ADDR, IPV6ADDR_SECONDARIES
 	 * description: List of static IP addresses.
+	 * example: IPV6ADDR=ab12:9876::1
+	 *   IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3"
+	 * ---end---
+	 */
+
+	/* ---keyfile---
+	 * property: gateway
+	 * variable: gateway
+	 * format: string
+	 * description: Gateway IP addresses as a string.
+	 * example: gateway=abbe::1
+	 * ---end---
+	 * ---ifcfg-rh---
+	 * property: gateway
+	 * variable: IPV6_DEFAULTGW
+	 * description: Gateway IP address.
+	 * example: IPV6_DEFAULTGW=abbe::1
 	 * ---end---
 	 */