Merge "Edits for basics-networking for SUSE"

This commit is contained in:
Jenkins 2014-04-11 03:13:26 +00:00 committed by Gerrit Code Review
commit b41966416f

View File

@ -19,12 +19,13 @@
<link os="rhel;centos;fedora"
xlink:href="https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/s1-networkscripts-interfaces.html"
>documentation.</link>
<link os="sles"
<link os="sles;opensuse"
xlink:href="https://www.suse.com/documentation/sles11/book_sle_admin/data/sec_basicnet_manconf.html"
>documentation.</link>
<link os="opensuse"
>SLES 11</link>
<phrase os="sles;opensuse"> or </phrase>
<link os="sles;opensuse"
xlink:href="http://activedoc.opensuse.org/book/opensuse-reference/chapter-13-basic-networking"
>documentation.</link></para>
>openSUSE documentation.</link></para>
<procedure os="fedora">
<title>To disable <systemitem class="service">NetworkManager</systemitem>
and enable the <systemitem class="service">network</systemitem>
@ -37,16 +38,16 @@
</step>
</procedure>
<procedure os="sles;opensuse">
<title>To disable <systemitem class="service">NetworkManager</systemitem>
:</title>
<title>To disable <systemitem class="service">NetworkManager</systemitem>:</title>
<step>
<para>Use the YaST network module:</para>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>yast2 network</userinput></screen>
<para os="sles">For more information, see the
<link xlink:href="https://www.suse.com/documentation/sles11/book_sle_admin/data/sec_nm_activate.html">documentation.</link></para>
<para os="opensuse">For more information, see the
<link xlink:href="http://activedoc.opensuse.org/book/opensuse-reference/chapter-13-basic-networking#sec.basicnet.yast.netcard.global">documentation.
</link></para>
<para>For more information, see the
<link xlink:href="https://www.suse.com/documentation/sles11/book_sle_admin/data/sec_nm_activate.html">SLES </link> or
the
<link xlink:href="http://activedoc.opensuse.org/book/opensuse-reference/chapter-13-basic-networking#sec.basicnet.yast.netcard.global">
openSUSE documentation</link>.
</para>
</step>
</procedure>
<para os="rhel;centos">RHEL and derivatives including CentOS and Scientific