Re: New templates related to IPv6 in Debian Installer
Christian PERRIER wrote:
> The templates to review are those marke with "# IPv6" comment.
I've attached a patch and revised versions only touching those
templates, but also a more thoroughgoing patch.
> Template: netcfg/use_autoconfig
> Type: boolean
> Default: true
> # IPv6
> # :sl6:
> _Description: Auto-configure networking?
> Networking can be configured by either manually entering all the
> information, or automatically detecting network settings using DHCP
> or a variety of IPv6-specific methods. If you choose to use
> autoconfiguration and the installer is unable to get a working
> configuration from the network, you will be given the opportunity to
> configure the network manually.
I'm not keen on this phrasing; it isn't a choice between me personally
doing some manual configuring or me personally detecting network
settings. I would prefer:
Networking can be configured either by entering all the information
manually, or by using DHCP (or a variety of IPv6-specific methods) to
detect network settings automatically. If you choose to use
[...]
> Template: netcfg/get_ipaddress
> Type: string
> # IPv6
> # :sl6:
> _Description: IP address:
> The IP address is unique to your computer and is either:
> .
> * Four numbers separated by periods (IPv4);
> * Blocks of hexadecimal characters separated by colons (IPv6).
> .
> You can also optionally specify a CIDR netmask.
(Ah, here we go, dotted quads versus colonic octopoids.)
I think if you're going to use an "either" it needs an "or", or to be
a plain sentence rather than a two-bullet list... though on the other
hand this layout does make it clearer that the part about CIDR
notation is an optional extra rather than a third possibility. How
about:
The IP address is unique to your computer, and may be:
.
* four numbers separated by periods (IPv4);
* blocks of hexadecimal characters separated by colons (IPv6).
.
You can also optionally append a CIDR netmask (such as "/24").
Meanwhile in the templates I'm not meant to be reviewing... there are
some other trivial inconsistencies in spacing/commas/quotes. Plus:
[...]
> Template: netcfg/dhcp_hostname
> Type: string
> # :sl1:
> _Description: DHCP hostname:
> You may need to supply a DHCP host name. If you are using
^
There are uses of "host name" in one or two other templates, but this
is the only one where it looks like an error.
[...]
> Template: netcfg/no_dhcp_client
> Type: error
> # :sl2:
> _Description: No DHCP client found
> No DHCP client was found. This package requires pump or dhcp-client.
> .
> The DHCP configuration process has been aborted.
This *package*? What package? How can this happen, and what is the
reader expected to do about it? Besides, "dhcp-client" is a virtual
package provided by pump and a couple of others, so it's not "pump or
dhcp-client". Maybe it should just say:
No DHCP client was found.
.
The DHCP configuration process has been aborted.
(But that's not in either patch.)
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
diff -ru old/netcfg-common.templates new-ipv6/netcfg-common.templates
--- old/netcfg-common.templates 2012-09-15 10:59:52.008411497 +0100
+++ new-ipv6/netcfg-common.templates 2012-09-15 12:02:36.324733845 +0100
@@ -10,9 +10,9 @@
# IPv6
# :sl6:
_Description: Auto-configure networking?
- Networking can be configured by either manually entering all the
- information, or automatically detecting network settings using DHCP
- or a variety of IPv6-specific methods. If you choose to use
+ Networking can be configured either by entering all the information
+ manually, or by using DHCP (or a variety of IPv6-specific methods) to
+ detect network settings automatically. If you choose to use
autoconfiguration and the installer is unable to get a working
configuration from the network, you will be given the opportunity to
configure the network manually.
diff -ru old/netcfg-static.templates new-ipv6/netcfg-static.templates
--- old/netcfg-static.templates 2012-09-15 10:59:54.616411426 +0100
+++ new-ipv6/netcfg-static.templates 2012-09-15 11:58:30.220411687 +0100
@@ -3,12 +3,12 @@
# IPv6
# :sl6:
_Description: IP address:
- The IP address is unique to your computer and is either:
+ The IP address is unique to your computer and may be:
.
- * Four numbers separated by periods (IPv4);
- * Blocks of hexadecimal characters separated by colons (IPv6).
+ * four numbers separated by periods (IPv4);
+ * blocks of hexadecimal characters separated by colons (IPv6).
.
- You can also optionally specify a CIDR netmask.
+ You can also optionally append a CIDR netmask (such as "/24").
.
If you don't know what to use here, consult your network administrator.
Template: netcfg/enable
Type: boolean
Default: true
Description: for internal use; can be preseeded
Set to false to disable netcfg entirely via preseed.
Template: netcfg/use_autoconfig
Type: boolean
Default: true
# IPv6
# :sl6:
_Description: Auto-configure networking?
Networking can be configured either by entering all the information
manually, or by using DHCP (or a variety of IPv6-specific methods) to
detect network settings automatically. If you choose to use
autoconfiguration and the installer is unable to get a working
configuration from the network, you will be given the opportunity to
configure the network manually.
Template: netcfg/get_domain
Type: string
# :sl1:
_Description: Domain name:
The domain name is the part of your Internet address to the right of your
host name. It is often something that ends in .com, .net, .edu, or .org.
If you are setting up a home network, you can make something up, but make
sure you use the same domain name on all your computers.
Template: netcfg/get_nameservers
Type: string
# :sl1:
_Description: Name server addresses:
The name servers are used to look up host names on the network.
Please enter the IP addresses (not host names) of up to 3 name servers,
separated by spaces. Do not use commas. The first name server in the list
will be the first to be queried. If you don't want to use any name server,
just leave this field blank.
Template: netcfg/choose_interface
Type: select
Choices: ${ifchoices}
# :sl1:
_Description: Primary network interface:
Your system has multiple network interfaces. Choose the one to use as
the primary network interface during the installation. If possible, the
first connected network interface found has been selected.
Template: netcfg/wireless_essid
Type: string
# :sl2:
_Description: Wireless ESSID for ${iface}:
${iface} is a wireless network interface. Please enter the name (the ESSID)
of the wireless network you would like ${iface} to use. If you would like
to use any available network, leave this field blank.
Template: netcfg/wireless_essid_again
Type: string
# :sl6:
_Description: Wireless ESSID for ${iface}:
Attempting to find an available wireless network failed.
.
${iface} is a wireless network interface. Please enter the name (the ESSID)
of the wireless network you would like ${iface} to use. To connect to any
available network, leave this field blank.
Template: netcfg/wireless_security_type
Type: select
Choices-C: wep/open, wpa
__Choices: WEP/Open Network, WPA/WPA2 PSK
# :sl2:
_Description: Wireless network type for ${iface}:
Choose WEP/Open if the network is open or secured with WEP.
Choose WPA/WPA2 if the network is protected with WPA/WPA2 PSK
(Pre-Shared Key).
Template: netcfg/wireless_wep
Type: string
# :sl2:
_Description: WEP key for wireless device ${iface}:
If applicable, please enter the WEP security key for the wireless
device ${iface}. There are two ways to do this:
.
If your WEP key is in the format 'nnnn-nnnn-nn', 'nn:nn:nn:nn:nn:nn:nn:nn',
or 'nnnnnnnn', where n is a number, just enter it as it is into this field.
.
If your WEP key is in the format of a passphrase, prefix it with 's:'
(without quotes).
.
Of course, if there is no WEP key for your wireless network, leave this
field blank.
Template: netcfg/invalid_wep
Type: error
# :sl2:
_Description: Invalid WEP key
The WEP key '${wepkey}' is invalid. Please refer to the instructions on
the next screen carefully on how to enter your WEP key correctly, and try
again.
Template: netcfg/invalid_pass
Type: error
# :sl2:
_Description: Invalid passphrase
The WPA/WPA2 PSK passphrase was either too long (more than 64 characters)
or too short (less than 8 characters).
Template: netcfg/wireless_wpa
Type: string
# :sl2:
_Description: WPA/WPA2 passphrase for wireless device ${iface}:
Enter the passphrase for WPA/WPA2 PSK authentication. This should be the
passphrase defined for the wireless network you are trying to use.
Template: netcfg/invalid_essid
Type: error
# :sl6:
_Description: Invalid ESSID
The ESSID "${essid}" is invalid. ESSIDs may only be up to ${max_essid_len}
characters, but may contain all kinds of characters.
Template: netcfg/wpa_progress
Type: text
# :sl2:
_Description: Attempting to exchange keys with the access point...
Template: netcfg/wpa_progress_note
Type: text
# :sl2:
_Description: This may take some time.
Template: netcfg/wpa_success_note
Type: text
# :sl2:
_Description: WPA/WPA2 connection succeeded
Template: netcfg/wpa_supplicant_failed
Type: note
# :sl2:
_Description: Failure of key exchange and association
The exchange of keys and association with the access point failed.
Please check the WPA/WPA2 parameters you provided.
Template: netcfg/get_hostname
Type: string
Default: debian
# :sl1:
_Description: Hostname:
Please enter the hostname for this system.
.
The hostname is a single word that identifies your system to the network.
If you don't know what your hostname should be, consult your network
administrator. If you are setting up your own home network, you can make
something up here.
Template: netcfg/invalid_hostname
Type: error
# :sl2:
_Description: Invalid hostname
The name "${hostname}" is invalid.
.
A valid hostname may contain only the numbers 0-9, upper and lowercase
letters (A-Z and a-z), and the minus sign. It must be at most
${maxhostnamelen} characters long, and may not begin or end with a minus
sign.
Template: netcfg/error
Type: error
# :sl2:
_Description: Error
An error occurred and the network configuration process has been aborted.
You may retry it from the installation main menu.
Template: netcfg/no_interfaces
Type: error
# :sl2:
_Description: No network interfaces detected
No network interfaces were found. The installation
system was unable to find a network device.
.
You may need to load a specific module for your network card, if you have
one. For this, go back to the network hardware detection step.
Template: netcfg/kill_switch_enabled
Type: note
# A "kill switch" is a physical switch found on some network cards that
# disables the card.
# :sl2:
_Description: Kill switch enabled on ${iface}
${iface} appears to have been disabled by means of a physical "kill
switch". If you intend to use this interface, please switch it on before
continuing.
Template: netcfg/wireless_adhoc_managed
Type: select
Default: Infrastructure (Managed) network
# :sl2:
# Note to translators : Please keep your translations of each choice
# below the 65 columns limit (which means 65 characters for most languages)
# Choices MUST be separated by commas
# You MUST use standard commas not special commas for your language
# You MUST NOT use commas inside choices
__Choices: Infrastructure (Managed) network, Ad-hoc network (Peer to peer)
_Description: Type of wireless network:
Wireless networks are either managed or ad-hoc. If you use a real access
point of some sort, your network is Managed. If another computer is your
'access point', then your network may be Ad-hoc.
Template: netcfg/wifi_progress_title
Type: text
# :sl2:
_Description: Wireless network configuration
Template: netcfg/wifi_progress_info
Type: text
# :sl2:
_Description: Searching for wireless access points...
Template: netcfg/disable_dhcp
Type: boolean
Default: false
Description: for internal use; can be preseeded
Set to true to force static network configuration
Template: netcfg/link_detect_progress
Type: text
_Description: Detecting link on ${interface}; please wait...
Template: netcfg/internal-none
Type: text
# :sl2:
_Description: <none>
Template: netcfg/internal-wifi
Type: text
# :sl2:
_Description: Wireless ethernet (802.11x)
Template: netcfg/internal-wireless
Type: text
# :sl2:
_Description: wireless
Template: netcfg/internal-eth
Type: text
# :sl2:
_Description: Ethernet
Template: netcfg/internal-tr
Type: text
# :sl2:
_Description: Token Ring
Template: netcfg/internal-usb
Type: text
# :sl2:
_Description: USB net
Template: netcfg/internal-arc
Type: text
# Product name, not translatable.
# :sl2:
Description: Arcnet
Template: netcfg/internal-slip
Type: text
# :sl2:
_Description: Serial-line IP
Template: netcfg/internal-plip
Type: text
# :sl2:
_Description: Parallel-port IP
Template: netcfg/internal-ppp
Type: text
# :sl2:
_Description: Point-to-Point Protocol
Template: netcfg/internal-sit
Type: text
# :sl2:
_Description: IPv6-in-IPv4
Template: netcfg/internal-ippp
Type: text
# :sl2:
_Description: ISDN Point-to-Point Protocol
Template: netcfg/internal-ctc
Type: text
# :sl2:
_Description: Channel-to-channel
Template: netcfg/internal-escon
Type: text
# :sl2:
_Description: Real channel-to-channel
Template: netcfg/internal-hsi
Type: text
# Product name, not translatable.
Description: Hipersocket
Template: netcfg/internal-iucv
Type: text
# :sl2:
_Description: Inter-user communication vehicle
Template: netcfg/internal-unknown-iface
Type: text
# :sl2:
_Description: Unknown interface
Template: base-installer/progress/netcfg
Type: text
# base-installer progress bar item
# :sl1:
_Description: Storing network settings...
Template: debian-installer/netcfg/title
Type: text
# Item in the main menu to select this package
# :sl1:
_Description: Configure the network
Template: netcfg/network-manager
Type: boolean
Default: true
Description: for internal use; can be preseeded
Set to false to prevent /etc/network/interfaces being adjusted for use by
network-manager. If you do this, network-manager will probably not work
correctly.
Template: netcfg/link_wait_timeout
Type: string
Default: 3
# :sl6:
_Description: Waiting time (in seconds) for link detection:
Please enter the maximum time you would like to wait for network link
detection.
Template: netcfg/bad_link_wait_timeout
Type: error
# :sl6:
_Description: Invalid network link detection waiting time
The value you have provided is not valid. The maximum waiting time (in
seconds) for network link detection must be a positive integer.
Template: netcfg/wireless_show_essids
Type: select
Choices-C: ${essid_list} manual
# Translators: please do not translate the variable essid_list
# :sl6:
_Choices: ${essid_list} Enter ESSID manually
# :sl6:
_Description: Wireless network:
Select the wireless network to use during the installation process.
Template: netcfg/dhcp_hostname
Type: string
# :sl1:
_Description: DHCP hostname:
You may need to supply a DHCP host name. If you are using
a cable modem, you might need to specify an account number here.
.
Most other users can just leave this blank.
Template: netcfg/dhcp_progress
Type: text
# :sl1:
_Description: Configuring the network with DHCP
Template: netcfg/dhcp_progress_note
Type: text
# :sl1:
_Description: This may take some time.
Template: netcfg/dhcp_success_note
Type: text
# :sl1:
_Description: Network autoconfiguration has succeeded
Template: netcfg/no_dhcp_client
Type: error
# :sl2:
_Description: No DHCP client found
No DHCP client was found. This package requires pump or dhcp-client.
.
The DHCP configuration process has been aborted.
Template: netcfg/dhcp_options
Type: select
# :sl1:
# Note to translators : Please keep your translation
# below a 65 columns limit (which means 65 characters
# in single-byte languages)
#flag:translate!:4
__Choices: Retry network autoconfiguration, Retry network autoconfiguration with a DHCP hostname, Configure network manually, ${wifireconf}, Do not configure the network at this time
Default: Configure network manually
# :sl1:
_Description: Network configuration method:
From here you can choose to retry DHCP network autoconfiguration
(which may succeed if your DHCP server takes a long time to respond)
or to configure the network manually. Some DHCP servers require
a DHCP hostname to be sent by the client, so you can also choose
to retry DHCP network autoconfiguration with a hostname that you
provide.
Template: netcfg/dhcp_failed
Type: note
# :sl1:
_Description: Network autoconfiguration failed
Your network is probably not using the DHCP protocol. Alternatively, the
DHCP server may be slow or some network hardware is not working properly.
Template: netcfg/no_default_route
Type: boolean
# :sl2:
_Description: Continue without a default route?
The network autoconfiguration was successful. However, no default route
was set: the system does not know how to communicate with hosts on the
Internet. This will make it impossible to continue with the installation
unless you have the first installation CD-ROM, a 'Netinst' CD-ROM, or
packages available on the local network.
.
If you are unsure, you should not continue without a default route:
contact your local network administrator about this problem.
Template: netcfg/internal-wifireconf
Type: text
# :sl1:
_Description: Reconfigure the wireless network
Template: netcfg/dhcp_timeout
Type: string
Description: for internal use; can be preseeded
Timeout for trying DHCP
Default: 25
Template: netcfg/dhcp_ntp_servers
Type: text
Description: for internal use
NTP servers provided by DHCP
Template: netcfg/slaac_wait_title
Type: text
# IPv6
# :sl6:
_Description: Attempting IPv6 autoconfiguration...
Template: netcfg/ipv6_link_local_wait_title
Type: text
# IPv6
# :sl6:
_Description: Waiting for link-local address...
Template: netcfg/ipv6_config_flags_wait_title
Type: text
# IPv6
# :sl6:
_Description: Attempting IPv6 autoconfiguration...
Template: netcfg/dhcpv6_timeout
Type: string
Description: for internal use; can be preseeded
Timeout for trying DHCPv6
Default: 15
Template: netcfg/dhcpv6_progress
Type: text
# :sl6:
_Description: Configuring the network with DHCPv6
Template: netcfg/get_ipaddress
Type: string
# IPv6
# :sl6:
_Description: IP address:
The IP address is unique to your computer and may be:
.
* four numbers separated by periods (IPv4);
* blocks of hexadecimal characters separated by colons (IPv6).
.
You can also optionally append a CIDR netmask (such as "/24").
.
If you don't know what to use here, consult your network administrator.
Template: netcfg/bad_ipaddress
Type: error
# IPv6
# :sl6:
_Description: Malformed IP address
The IP address you provided is malformed. It should be in the form
x.x.x.x where each 'x' is no larger than 255 (an IPv4 address), or a
sequence of blocks of hexadecimal digits separated by colons (an IPv6
address). Please try again.
Template: netcfg/get_pointopoint
Type: string
# :sl2:
_Description: Point-to-point address:
The point-to-point address is used to determine the other endpoint of the
point to point network. Consult your network administrator if you do not
know the value. The point-to-point address should be entered as four numbers
separated by periods.
Template: netcfg/get_netmask
Type: string
# :sl1:
_Description: Netmask:
The netmask is used to determine which machines are local to your
network. Consult your network administrator if you do not know the
value. The netmask should be entered as four numbers separated by
periods.
Template: netcfg/get_gateway
Type: string
# :sl1:
_Description: Gateway:
The gateway is an IP address (four numbers separated by periods) that
indicates the gateway router, also known as the default router. All
traffic that goes outside your LAN (for instance, to the Internet) is
sent through this router. In rare circumstances, you may have no
router; in that case, you can leave this blank. If you don't know
the proper answer to this question, consult your network
administrator.
Template: netcfg/gateway_unreachable
Type: error
# :sl2:
_Description: Unreachable gateway
The gateway address you entered is unreachable.
.
You may have made an error entering your IP address, netmask and/or
gateway.
Template: netcfg/no_ipv6_pointopoint
Type: error
# IPv6
# :sl6:
_Description: IPv6 unsupported on point-to-point links
IPv6 addresses cannot be configured on point-to-point links. Please use an
IPv4 address, or go back and select a different network interface.
Template: netcfg/confirm_static
Type: boolean
Default: true
# :sl1:
_Description: Is this information correct?
Currently configured network parameters:
.
interface = ${interface}
ipaddress = ${ipaddress}
netmask = ${netmask}
gateway = ${gateway}
pointopoint = ${pointopoint}
nameservers = ${nameservers}
Template: debian-installer/netcfg-static/title
Type: text
# Item in the main menu to select this package
# :sl1:
_Description: Configure a network using static addressing
diff -ru old/netcfg-common.templates new-all/netcfg-common.templates
--- old/netcfg-common.templates 2012-09-15 10:59:52.008411497 +0100
+++ new-all/netcfg-common.templates 2012-09-15 11:28:49.896411509 +0100
@@ -10,9 +10,9 @@
# IPv6
# :sl6:
_Description: Auto-configure networking?
- Networking can be configured by either manually entering all the
- information, or automatically detecting network settings using DHCP
- or a variety of IPv6-specific methods. If you choose to use
+ Networking can be configured either by entering all the information
+ manually, or by using DHCP (or a variety of IPv6-specific methods) to
+ detect network settings automatically. If you choose to use
autoconfiguration and the installer is unable to get a working
configuration from the network, you will be given the opportunity to
configure the network manually.
@@ -22,7 +22,7 @@
# :sl1:
_Description: Domain name:
The domain name is the part of your Internet address to the right of your
- host name. It is often something that ends in .com, .net, .edu, or .org.
+ host name. It is often something that ends in .com, .net, .edu, or .org.
If you are setting up a home network, you can make something up, but make
sure you use the same domain name on all your computers.
@@ -80,10 +80,10 @@
If applicable, please enter the WEP security key for the wireless
device ${iface}. There are two ways to do this:
.
- If your WEP key is in the format 'nnnn-nnnn-nn', 'nn:nn:nn:nn:nn:nn:nn:nn',
- or 'nnnnnnnn', where n is a number, just enter it as it is into this field.
+ If your WEP key is in the format "nnnn-nnnn-nn", "nn:nn:nn:nn:nn:nn:nn:nn",
+ or "nnnnnnnn", where "n" is a number, just enter it as it is into this field.
.
- If your WEP key is in the format of a passphrase, prefix it with 's:'
+ If your WEP key is in the format of a passphrase, prefix it with "s:"
(without quotes).
.
Of course, if there is no WEP key for your wireless network, leave this
@@ -203,7 +203,7 @@
_Description: Type of wireless network:
Wireless networks are either managed or ad-hoc. If you use a real access
point of some sort, your network is Managed. If another computer is your
- 'access point', then your network may be Ad-hoc.
+ "access point", then your network may be Ad-hoc.
Template: netcfg/wifi_progress_title
Type: text
diff -ru old/netcfg-dhcp.templates new-all/netcfg-dhcp.templates
--- old/netcfg-dhcp.templates 2012-09-15 10:59:53.348411303 +0100
+++ new-all/netcfg-dhcp.templates 2012-09-15 11:27:53.284411343 +0100
@@ -2,7 +2,7 @@
Type: string
# :sl1:
_Description: DHCP hostname:
- You may need to supply a DHCP host name. If you are using
+ You may need to supply a DHCP hostname. If you are using
a cable modem, you might need to specify an account number here.
.
Most other users can just leave this blank.
@@ -62,7 +62,7 @@
The network autoconfiguration was successful. However, no default route
was set: the system does not know how to communicate with hosts on the
Internet. This will make it impossible to continue with the installation
- unless you have the first installation CD-ROM, a 'Netinst' CD-ROM, or
+ unless you have the first installation CD-ROM, a "Netinst" CD-ROM, or
packages available on the local network.
.
If you are unsure, you should not continue without a default route:
diff -ru old/netcfg-static.templates new-all/netcfg-static.templates
--- old/netcfg-static.templates 2012-09-15 10:59:54.616411426 +0100
+++ new-all/netcfg-static.templates 2012-09-15 11:59:38.216411336 +0100
@@ -3,12 +3,12 @@
# IPv6
# :sl6:
_Description: IP address:
- The IP address is unique to your computer and is either:
+ The IP address is unique to your computer and may be:
.
- * Four numbers separated by periods (IPv4);
- * Blocks of hexadecimal characters separated by colons (IPv6).
+ * four numbers separated by periods (IPv4);
+ * blocks of hexadecimal characters separated by colons (IPv6).
.
- You can also optionally specify a CIDR netmask.
+ You can also optionally append a CIDR netmask (such as "/24").
.
If you don't know what to use here, consult your network administrator.
@@ -18,7 +18,7 @@
# :sl6:
_Description: Malformed IP address
The IP address you provided is malformed. It should be in the form
- x.x.x.x where each 'x' is no larger than 255 (an IPv4 address), or a
+ "x.x.x.x" where each "x" is no larger than 255 (an IPv4 address), or a
sequence of blocks of hexadecimal digits separated by colons (an IPv6
address). Please try again.
@@ -27,8 +27,8 @@
# :sl2:
_Description: Point-to-point address:
The point-to-point address is used to determine the other endpoint of the
- point to point network. Consult your network administrator if you do not
- know the value. The point-to-point address should be entered as four numbers
+ point to point network. Consult your network administrator if you do not
+ know the value. The point-to-point address should be entered as four numbers
separated by periods.
Template: netcfg/get_netmask
@@ -36,8 +36,8 @@
# :sl1:
_Description: Netmask:
The netmask is used to determine which machines are local to your
- network. Consult your network administrator if you do not know the
- value. The netmask should be entered as four numbers separated by
+ network. Consult your network administrator if you do not know the
+ value. The netmask should be entered as four numbers separated by
periods.
Template: netcfg/get_gateway
@@ -45,10 +45,10 @@
# :sl1:
_Description: Gateway:
The gateway is an IP address (four numbers separated by periods) that
- indicates the gateway router, also known as the default router. All
+ indicates the gateway router, also known as the default router. All
traffic that goes outside your LAN (for instance, to the Internet) is
- sent through this router. In rare circumstances, you may have no
- router; in that case, you can leave this blank. If you don't know
+ sent through this router. In rare circumstances, you may have no
+ router; in that case, you can leave this blank. If you don't know
the proper answer to this question, consult your network
administrator.
@@ -58,7 +58,7 @@
_Description: Unreachable gateway
The gateway address you entered is unreachable.
.
- You may have made an error entering your IP address, netmask and/or
+ You may have made an error entering your IP address, netmask, and/or
gateway.
Template: netcfg/no_ipv6_pointopoint
@@ -66,7 +66,7 @@
# IPv6
# :sl6:
_Description: IPv6 unsupported on point-to-point links
- IPv6 addresses cannot be configured on point-to-point links. Please use an
+ IPv6 addresses cannot be configured on point-to-point links. Please use an
IPv4 address, or go back and select a different network interface.
Template: netcfg/confirm_static
Reply to: