[settings] Match terminology in online documentation

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/core/settings.c b/src/core/settings.c
index 9b924bc8d79aca3d4e2d27473dc945a14263a4fd..0a8c5f68e21b77ebd044a950fa5c5e511beb8992 100644 (file)
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -1714,7 +1714,7 @@ struct setting filename_setting __setting ( SETTING_BOOT ) = {
 /** Root path setting */
 struct setting root_path_setting __setting ( SETTING_SANBOOT ) = {
        .name = "root-path",
-       .description = "iSCSI root path",
+       .description = "SAN root path",
        .tag = DHCP_ROOT_PATH,
        .type = &setting_type_string,
 };
@@ -1738,7 +1738,7 @@ struct setting password_setting __setting ( SETTING_AUTH ) = {
 /** Priority setting */
 struct setting priority_setting __setting ( SETTING_MISC ) = {
        .name = "priority",
-       .description = "Priority of these settings",
+       .description = "Settings priority",
        .tag = DHCP_EB_PRIORITY,
        .type = &setting_type_int8,
 };

diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c
index 3bbca197ce342065abe8822e37b0791126accfaf..f5ab65f0420d6497d574dc79df6711ab25fe9bce 100644 (file)
--- a/src/net/80211/net80211.c
+++ b/src/net/80211/net80211.c
@@ -204,7 +204,7 @@ struct settings_applicator net80211_applicator __settings_applicator = {
  */
 struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = {
        .name = "ssid",
-       .description = "802.11 SSID (network name)",
+       .description = "Wireless SSID",
        .type = &setting_type_string,
        .tag = NET80211_SETTING_TAG_SSID,
 };
@@ -217,7 +217,7 @@ struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = {
  */
 struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = {
        .name = "active-scan",
-       .description = "Use an active scan during 802.11 association",
+       .description = "Actively scan for wireless networks",
        .type = &setting_type_int8,
        .tag = NET80211_SETTING_TAG_ACTIVE_SCAN,
 };
@@ -230,7 +230,7 @@ struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = {
  */
 struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA ) = {
        .name = "key",
-       .description = "Encryption key for protected 802.11 networks",
+       .description = "Wireless encryption key",
        .type = &setting_type_string,
        .tag = NET80211_SETTING_TAG_KEY,
 };

diff --git a/src/net/ipv4.c b/src/net/ipv4.c
index 3d6d738bed4a1d3b2c682013a7c380626075b926..b2d51ada42854b24bd6a32ecd904bf74265f3d7d 100644 (file)
--- a/src/net/ipv4.c
+++ b/src/net/ipv4.c
@@ -556,7 +556,7 @@ struct arp_net_protocol ipv4_arp_protocol __arp_net_protocol = {
 /** IPv4 address setting */
 struct setting ip_setting __setting ( SETTING_IPv4 ) = {
        .name = "ip",
-       .description = "IPv4 address",
+       .description = "IP address",
        .tag = DHCP_EB_YIADDR,
        .type = &setting_type_ipv4,
 };
@@ -564,7 +564,7 @@ struct setting ip_setting __setting ( SETTING_IPv4 ) = {
 /** IPv4 subnet mask setting */
 struct setting netmask_setting __setting ( SETTING_IPv4 ) = {
        .name = "netmask",
-       .description = "IPv4 subnet mask",
+       .description = "Subnet mask",
        .tag = DHCP_SUBNET_MASK,
        .type = &setting_type_ipv4,
 };

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index d4f4ede415e4798503e63b04e15268035768ba4e..a0b74dfe5647804cd495cd709ad767f12d1136b9 100644 (file)
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -95,7 +95,7 @@ FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH );
 /** DHCP server address setting */
 struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
        .name = "dhcp-server",
-       .description = "DHCP server address",
+       .description = "DHCP server",
        .tag = DHCP_SERVER_IDENTIFIER,
        .type = &setting_type_ipv4,
 };
@@ -103,7 +103,7 @@ struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
 /** DHCP user class setting */
 struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
        .name = "user-class",
-       .description = "User class identifier",
+       .description = "DHCP user class",
        .tag = DHCP_USER_CLASS_ID,
        .type = &setting_type_string,
 };
@@ -111,7 +111,7 @@ struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
 /** Use cached network settings */
 struct setting use_cached_setting __setting ( SETTING_MISC ) = {
        .name = "use-cached",
-       .description = "Use cached network settings",
+       .description = "Use cached settings",
        .tag = DHCP_EB_USE_CACHED,
        .type = &setting_type_uint8,
 };

diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c
index 31a355f1b925b7273e36c0a5f3837222c03f1f6d..d1435e769a966edf78297d9360048694fe0f73d3 100644 (file)
--- a/src/net/udp/dns.c
+++ b/src/net/udp/dns.c
@@ -597,7 +597,7 @@ struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
 /** Domain name setting */
 struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
        .name = "domain",
-       .description = "Local domain",
+       .description = "DNS domain",
        .tag = DHCP_DOMAIN_NAME,
        .type = &setting_type_string,
 };

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 760e91c8b44f6a23bded3b357d7a930cd0ef0949..c5c5f3e78d0da45b137ac3bd9930fecdf37bde95 100644 (file)
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -109,7 +109,7 @@ struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
 /** The "skip-san-boot" setting */
 struct setting skip_san_boot_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
        .name = "skip-san-boot",
-       .description = "Do not boot the SAN drive after connecting",
+       .description = "Do not boot from SAN device",
        .tag = DHCP_EB_SKIP_SAN_BOOT,
        .type = &setting_type_int8,
 };