Changeset cf79cd5 in freewrt for docs

Timestamp:

May 19, 2007, 1:09:45 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

19baeed

Parents:

d8a7d94

Message:

resolve conflicts, n0-1 told me not to break this

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2548 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• docs/handbook/user/handbook.tex (modified) (3 diffs)

docs/handbook/user/handbook.tex

@@ -611 +611 @@
 \section{Network Configuration}
 
-<<<<<<< .mine
 The device names for real network interfaces in Linux are named \code{ethx} (\code{x} is
 \code{0--9}). If the device has a switch, the different ports are separated via VLAN
@@ -619 +618 @@
 it in the ADK menue, if you like. 
 
-=======
-The device names for real network interfaces in Linux are named \code{ethx}
-(\code{x} is \code{0--9}). If the device has a switch, the different ports are
-separated via VLAN technology. The vlan interfaces are named \code{ethx.y}.
-The network configuration in FreeWRT is managed via \app{Busybox}'s
-\app{ifupdown} implementation. \app{Busybox}'s builtin \app{ip} command
-configures the network interfaces. There is no \app{ifconfig} or \app{route}.
->>>>>>> .r2546
 To show all configured network interfaces use:
 \begin{Verbatim}[label=show IP address]
@@ -646 +637 @@
 \end{Verbatim}
 
-<<<<<<< .mine
 <b>ATTENTION: Be sure you have no whitespaces at the and of any value!</b>
 
 \code{auto <iface-name>} is optional and, if set, tells the \app{ifup} script to
 start this interface automatically on bootup.
-=======
-\code{auto <iface-name>} is optional and, if set, tells the \app{ifup} script
-to start this interface automatically on bootup.
->>>>>>> .r2546
 
 Each interface needs a unique name which, depending on the method, represents