Gentoo Archives: gentoo-commits

From: "Vladimir Romanov (blueboar)" <blueboar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in xml/htdocs/doc/ru/handbook: hb-net-advanced.xml
Date: Sat, 30 Aug 2014 16:24:51
Message-Id: 20140830162446.5B7894444@oystercatcher.gentoo.org
1 blueboar 14/08/30 16:24:46
2
3 Modified: hb-net-advanced.xml
4 Log:
5 Sync with English
6
7 Revision Changes Path
8 1.7 xml/htdocs/doc/ru/handbook/hb-net-advanced.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml?rev=1.7&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml?rev=1.7&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml?r1=1.6&r2=1.7
13
14 Index: hb-net-advanced.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml,v
17 retrieving revision 1.6
18 retrieving revision 1.7
19 diff -u -r1.6 -r1.7
20 --- hb-net-advanced.xml 22 May 2014 07:14:32 -0000 1.6
21 +++ hb-net-advanced.xml 30 Aug 2014 16:24:46 -0000 1.7
22 @@ -4,7 +4,7 @@
23 <!-- The content of this document is licensed under the CC-BY-SA license -->
24 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
25
26 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml,v 1.6 2014/05/22 07:14:32 blueboar Exp $ -->
27 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/ru/handbook/hb-net-advanced.xml,v 1.7 2014/08/30 16:24:46 blueboar Exp $ -->
28
29 <sections>
30
31 @@ -13,8 +13,8 @@
32 изучением модульного построения сети.
33 </abstract>
34
35 -<version>11</version>
36 -<date>2014-04-12</date>
37 +<version>12</version>
38 +<date>2014-08-17</date>
39
40 <section>
41 <title>Расширенная настройка</title>
42 @@ -348,9 +348,12 @@
43 ID_OUI_FROM_DATABASE=Quanta Computer Inc.
44
45 # <i>vim /etc/udev/rules.d/70-net-name-use-custom.rules</i>
46 -<comment># Первое правило использует информацию о MAC</comment>
47 -SUBSYSTEM=="net", ACTION=="add", ENV{ID_NET_NAME_MAC}=="enxc80aa9429d76", NAME="lan0"
48 -<comment># Второе правило использует информацию ID_NET_NAME_PATH</comment>
49 +<comment># Первое правило использует информацию о MAC, а номер 70- выполняется до всех других сетевых правил</comment>
50 +SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="c8:0a:a9:42:9d:76", NAME="lan0"
51 +
52 +# <i>vim /etc/udev/rules.d/76-net-name-use-custom.rules</i>
53 +<comment># Второе правило использует информацию ID_NET_NAME_PATH. Правило 76- выполняется между</comment>
54 +<comment># правилами 75-net-*.rules и 80-net-*.rules</comment>
55 SUBSYSTEM=="net", ACTION=="add", ENV{ID_NET_NAME_PATH}=="enp3s0", NAME="wifi0"
56 </pre>
57
58 @@ -372,8 +375,8 @@
59
60 <!-- *$Localization:
61 target-language: Russian
62 -target-date: 2014-04-12
63 -source-cvs-revision: 1.23
64 +target-date: 2014-08-17
65 +source-cvs-revision: 1.24
66 translated-by: Igor Naum [naumi@×××××××××.com]
67 edited-by: Alexey Chumakov [achumakov@g.o]
68 edited-by: Vladimir Romanov [blueboar2@×××××.com]