Browse Source

[settings] Match terminology in online documentation

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 13 years ago
parent
commit
02a6f46c09
6 changed files with 12 additions and 12 deletions
  1. 2
    2
      src/core/settings.c
  2. 3
    3
      src/net/80211/net80211.c
  3. 2
    2
      src/net/ipv4.c
  4. 3
    3
      src/net/udp/dhcp.c
  5. 1
    1
      src/net/udp/dns.c
  6. 1
    1
      src/usr/autoboot.c

+ 2
- 2
src/core/settings.c View File

@@ -1714,7 +1714,7 @@ struct setting filename_setting __setting ( SETTING_BOOT ) = {
1714 1714
 /** Root path setting */
1715 1715
 struct setting root_path_setting __setting ( SETTING_SANBOOT ) = {
1716 1716
 	.name = "root-path",
1717
-	.description = "iSCSI root path",
1717
+	.description = "SAN root path",
1718 1718
 	.tag = DHCP_ROOT_PATH,
1719 1719
 	.type = &setting_type_string,
1720 1720
 };
@@ -1738,7 +1738,7 @@ struct setting password_setting __setting ( SETTING_AUTH ) = {
1738 1738
 /** Priority setting */
1739 1739
 struct setting priority_setting __setting ( SETTING_MISC ) = {
1740 1740
 	.name = "priority",
1741
-	.description = "Priority of these settings",
1741
+	.description = "Settings priority",
1742 1742
 	.tag = DHCP_EB_PRIORITY,
1743 1743
 	.type = &setting_type_int8,
1744 1744
 };

+ 3
- 3
src/net/80211/net80211.c View File

@@ -204,7 +204,7 @@ struct settings_applicator net80211_applicator __settings_applicator = {
204 204
  */
205 205
 struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = {
206 206
 	.name = "ssid",
207
-	.description = "802.11 SSID (network name)",
207
+	.description = "Wireless SSID",
208 208
 	.type = &setting_type_string,
209 209
 	.tag = NET80211_SETTING_TAG_SSID,
210 210
 };
@@ -217,7 +217,7 @@ struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = {
217 217
  */
218 218
 struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = {
219 219
 	.name = "active-scan",
220
-	.description = "Use an active scan during 802.11 association",
220
+	.description = "Actively scan for wireless networks",
221 221
 	.type = &setting_type_int8,
222 222
 	.tag = NET80211_SETTING_TAG_ACTIVE_SCAN,
223 223
 };
@@ -230,7 +230,7 @@ struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = {
230 230
  */
231 231
 struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA ) = {
232 232
 	.name = "key",
233
-	.description = "Encryption key for protected 802.11 networks",
233
+	.description = "Wireless encryption key",
234 234
 	.type = &setting_type_string,
235 235
 	.tag = NET80211_SETTING_TAG_KEY,
236 236
 };

+ 2
- 2
src/net/ipv4.c View File

@@ -556,7 +556,7 @@ struct arp_net_protocol ipv4_arp_protocol __arp_net_protocol = {
556 556
 /** IPv4 address setting */
557 557
 struct setting ip_setting __setting ( SETTING_IPv4 ) = {
558 558
 	.name = "ip",
559
-	.description = "IPv4 address",
559
+	.description = "IP address",
560 560
 	.tag = DHCP_EB_YIADDR,
561 561
 	.type = &setting_type_ipv4,
562 562
 };
@@ -564,7 +564,7 @@ struct setting ip_setting __setting ( SETTING_IPv4 ) = {
564 564
 /** IPv4 subnet mask setting */
565 565
 struct setting netmask_setting __setting ( SETTING_IPv4 ) = {
566 566
 	.name = "netmask",
567
-	.description = "IPv4 subnet mask",
567
+	.description = "Subnet mask",
568 568
 	.tag = DHCP_SUBNET_MASK,
569 569
 	.type = &setting_type_ipv4,
570 570
 };

+ 3
- 3
src/net/udp/dhcp.c View File

@@ -95,7 +95,7 @@ FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH );
95 95
 /** DHCP server address setting */
96 96
 struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
97 97
 	.name = "dhcp-server",
98
-	.description = "DHCP server address",
98
+	.description = "DHCP server",
99 99
 	.tag = DHCP_SERVER_IDENTIFIER,
100 100
 	.type = &setting_type_ipv4,
101 101
 };
@@ -103,7 +103,7 @@ struct setting dhcp_server_setting __setting ( SETTING_MISC ) = {
103 103
 /** DHCP user class setting */
104 104
 struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
105 105
 	.name = "user-class",
106
-	.description = "User class identifier",
106
+	.description = "DHCP user class",
107 107
 	.tag = DHCP_USER_CLASS_ID,
108 108
 	.type = &setting_type_string,
109 109
 };
@@ -111,7 +111,7 @@ struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = {
111 111
 /** Use cached network settings */
112 112
 struct setting use_cached_setting __setting ( SETTING_MISC ) = {
113 113
 	.name = "use-cached",
114
-	.description = "Use cached network settings",
114
+	.description = "Use cached settings",
115 115
 	.tag = DHCP_EB_USE_CACHED,
116 116
 	.type = &setting_type_uint8,
117 117
 };

+ 1
- 1
src/net/udp/dns.c View File

@@ -597,7 +597,7 @@ struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = {
597 597
 /** Domain name setting */
598 598
 struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = {
599 599
 	.name = "domain",
600
-	.description = "Local domain",
600
+	.description = "DNS domain",
601 601
 	.tag = DHCP_DOMAIN_NAME,
602 602
 	.type = &setting_type_string,
603 603
 };

+ 1
- 1
src/usr/autoboot.c View File

@@ -109,7 +109,7 @@ struct setting keep_san_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
109 109
 /** The "skip-san-boot" setting */
110 110
 struct setting skip_san_boot_setting __setting ( SETTING_SANBOOT_EXTRA ) = {
111 111
 	.name = "skip-san-boot",
112
-	.description = "Do not boot the SAN drive after connecting",
112
+	.description = "Do not boot from SAN device",
113 113
 	.tag = DHCP_EB_SKIP_SAN_BOOT,
114 114
 	.type = &setting_type_int8,
115 115
 };

Loading…
Cancel
Save