Author: emap
Date: Sun Nov 6 12:34:51 2011
New Revision: 66719
URL: http://svn.opensuse.org/viewcvs/yast?rev=66719&view=rev
Log:
edited by emap
Modified:
trunk/autoinstallation/doc/xml/NetworkSection.xml
Modified: trunk/autoinstallation/doc/xml/NetworkSection.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/NetworkSection.xml?rev=66719&r1=66718&r2=66719&view=diff
==============================================================================
--- trunk/autoinstallation/doc/xml/NetworkSection.xml (original)
+++ trunk/autoinstallation/doc/xml/NetworkSection.xml Sun Nov 6 12:34:51 2011
@@ -18,32 +18,33 @@
]>
<section id="CreateProfile.Network">
<title>
- Network configuration
+ Network Configuration
</title>
<section id="Configuration.Network.Devices">
<title>
- Network devices, DNS and Routing.
+ Network Devices, DNS and Routing.
</title>
<para>
Network configuration is used to connect a single &company-suse; Linux
- workstation to an Ethernet-based LAN or to configure dial-up
- connection. More complex configuration (multiple network cards,
- routing, etc.) is also provided. With this module it's possible to
- configure and setup Ethernet Controllers and Token-Ring Controllers.
+ workstation to an Ethernet-based LAN or to configure a dial-up
+ connection. More complex configurations (multiple network cards,
+ routing, etc.) are also provided. With this module it is possible to
+ configure and setup Ethernet controllers and Token-Ring controllers.
</para>
<para>
- In the networking section, when this option is set to true (default is false, this option is available since openSUSE 11.2 but not SLES11):
+ In the networking section, set this option to "true" (default is
+ "false", available since openSUSE 11.2 but not in SLES11):
</para>
<screen>
<keep_install_network config:type="boolean">true</keep_install_network>
</screen>
<para>
- YaST will keep network settings created during installation (via Linuxrc)
- and/or merge it with network settings from the AutoYaST profile (if these are defined).
- AutoYaST settings have higher priority than already present configuration files.
- YaST will write ifcfg-* files from profile without removing old ones.
- If there is none (or empty) dns and routing section, YaST will keep already present values. Otherwise settings from the profile will be applied.
+ &yast; will keep network settings created during installation (via Linuxrc)
+ and/or merge it with network settings from the &ay; profile (if defined).
+ &ay; settings have higher priority than already present configuration files.
+ &yast; will write ifcfg-* files from profile without removing old ones.
+ If there is an empty or no dns and routing section, &yast; will keep already present values. Otherwise settings from the profile will be applied.
</para>
<para>
To configure network settings and activate networking automatically,
@@ -58,21 +59,20 @@
Proxy
</title>
<para>
- Configure your Internet proxy (caching) settings using this
- resource.
+ Configure your Internet proxy (caching) settings.
</para>
<para>
<emphasis>HTTP proxy</emphasis> is the name of the proxy server for your access to the world wide web (WWW).
<emphasis>FTP proxy</emphasis> is the name of the proxy server for your access to the file transfer services (FTP).
- <emphasis>No proxy</emphasis> domains is a list of domains for
- which the requests should be done directly without caching.
+ <emphasis>No proxy</emphasis> domains<remark>emap 2011-11-06: Does 'domains' belong here? Delete or put within 'emphasis' tag?</remark> is a list of domains for
+ which requests should be carried out directly without caching.
</para>
<para>
If you are using a proxy server with authorization, fill in Proxy user name and Proxy password.
</para>
<example>
<title>
- Netwrok configuration: Proxy
+ Network configuration: Proxy
</title>
<screen>