[doc] batman-adv-doc, master: apply mareks comments on pictures (1328f014) - commits - lists.open-mesh.org

14 Dec 2017

Repository : ssh://git@open-mesh.org/doc
On branches: batman-adv-doc,master
...

commit 1328f0140eefdb1634bdcc870c4bb5f114d65315
Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de
Date:   Sat Apr 11 21:21:52 2009 +0200
apply mareks comments on pictures
...

1328f0140eefdb1634bdcc870c4bb5f114d65315
 images/hop_penalty_new1.dia  |  24 ++---
 images/hop_penalty_new2.dia  |  10 +-
 images/multi_interface_1.dia | 213 ++++++++++++++++++++++---------------------
 3 files changed, 126 insertions(+), 121 deletions(-)

diff --git a/images/hop_penalty_new1.dia b/images/hop_penalty_new1.dia
index dfd27f27..5109492a 100644
--- a/images/hop_penalty_new1.dia
+++ b/images/hop_penalty_new1.dia
@@ -68,7 +68,7 @@
         <dia:point val="17,-4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17,-4.55956;21.4021,-2.76837"/>
+        <dia:rectangle val="17,-4.5425;21.385,-2.8025"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -125,7 +125,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="2.11788,2.58432"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.11788,-0.906805;4.7165,5.27157"/>
+        <dia:rectangle val="2.11788,-0.80068;4.61038,5.05932"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -181,7 +181,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="21.2042,2.66615"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.2042,-0.718846;23.7042,5.14115"/>
+        <dia:rectangle val="21.2042,-0.71885;23.7042,5.14115"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -290,7 +290,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="12.5,-2.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.2937,-3.11813;13.7275,-1.88187"/>
+        <dia:rectangle val="11.2937,-3.08625;13.7062,-1.91375"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -304,7 +304,7 @@ TQ = 100 %#</dia:string>
             <dia:real val="1"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.5,-2.41937"/>
+            <dia:point val="12.5,-2.40875"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -326,7 +326,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="3.2871,1.2871"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.23699,-0.0483348;22.3792,1.82826"/>
+        <dia:rectangle val="3.23699,-0.0483365;22.3793,1.82826"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="3.2871,1.2871"/>
@@ -354,14 +354,14 @@ TQ = 100 %#</dia:string>
         <dia:point val="20,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.273,-8.71892;20.0706,0.0706485"/>
+        <dia:rectangle val="11.9263,-8.71892;20.0706,0.0706485"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="20,0"/>
         <dia:point val="12.3282,-8.34369"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
-        <dia:real val="-2.3269140354912046"/>
+        <dia:real val="-1.355830028838052"/>
       </dia:attribute>
       <dia:attribute name="end_arrow">
         <dia:enum val="3"/>
@@ -381,7 +381,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="3.2871,1.2871"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.21706,-11.0133;12.7572,1.35714"/>
+        <dia:rectangle val="3.21706,-11.0132;12.7572,1.35714"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="3.2871,1.2871"/>
@@ -409,7 +409,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="10,3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10,2.44044;14.4021,4.23163"/>
+        <dia:rectangle val="10,2.4575;14.385,4.1975"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -443,7 +443,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="4,-5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4,-5.55956;8.40206,-3.76837"/>
+        <dia:rectangle val="4,-5.5425;8.385,-3.8025"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -477,7 +477,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="16,-12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16,-12.6988;26.5362,-10.4625"/>
+        <dia:rectangle val="16,-12.6775;26.515,-10.505"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
diff --git a/images/hop_penalty_new2.dia b/images/hop_penalty_new2.dia
index 1c5f793a..132fa18c 100644
--- a/images/hop_penalty_new2.dia
+++ b/images/hop_penalty_new2.dia
@@ -68,7 +68,7 @@
         <dia:point val="17,-4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17,-4.55956;26.6121,-2.76837"/>
+        <dia:rectangle val="17,-4.5425;26.595,-2.8025"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -354,14 +354,14 @@ TQ = 96 % (hop penalty applied)#</dia:string>
         <dia:point val="20,0"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.2731,-8.71892;20.0706,0.0706485"/>
+        <dia:rectangle val="11.9263,-8.71892;20.0706,0.0706485"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
         <dia:point val="20,0"/>
         <dia:point val="12.3282,-8.34369"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
-        <dia:real val="-2.3269140354912046"/>
+        <dia:real val="-1.362060805153245"/>
       </dia:attribute>
       <dia:attribute name="end_arrow">
         <dia:enum val="3"/>
@@ -388,7 +388,7 @@ TQ = 96 % (hop penalty applied)#</dia:string>
         <dia:point val="12.3282,-10.6718"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
-        <dia:real val="2.1663871418151657"/>
+        <dia:real val="2.4028529138638737"/>
       </dia:attribute>
       <dia:attribute name="end_arrow">
         <dia:enum val="3"/>
@@ -477,7 +477,7 @@ TQ = 100 %#</dia:string>
         <dia:point val="16,-12"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16,-12.6988;26.5362,-10.4625"/>
+        <dia:rectangle val="16,-12.6775;26.515,-10.505"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
diff --git a/images/multi_interface_1.dia b/images/multi_interface_1.dia
index 573b1831..9704afa5 100644
--- a/images/multi_interface_1.dia
+++ b/images/multi_interface_1.dia
@@ -147,7 +147,7 @@
         <dia:point val="16,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.8939,0.508875;18.5,6.68725"/>
+        <dia:rectangle val="16,0.615;18.5,6.475"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -203,7 +203,7 @@
         <dia:point val="15,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.1312,0.504406;15.8858,1.49559"/>
+        <dia:rectangle val="14.1312,0.53;15.8688,1.47"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -217,7 +217,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15,1.06397"/>
+            <dia:point val="15,1.0725"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -298,65 +298,6 @@
     </dia:object>
     <dia:object type="Standard - Box" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="4,3.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.95,3.45;6.05,4.55"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="4,3.5"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="2"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="inner_color">
-        <dia:color val="#e5e5e5"/>
-      </dia:attribute>
-      <dia:attribute name="show_background">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O9">
-      <dia:attribute name="obj_pos">
-        <dia:point val="5,4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.13125,3.50441;5.88581,4.49559"/>
-      </dia:attribute>
-      <dia:attribute name="text">
-        <dia:composite type="text">
-          <dia:attribute name="string">
-            dia:string#wlan1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
-          </dia:attribute>
-          <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
-          </dia:attribute>
-          <dia:attribute name="pos">
-            <dia:point val="5,4.06397"/>
-          </dia:attribute>
-          <dia:attribute name="color">
-            <dia:color val="#000000"/>
-          </dia:attribute>
-          <dia:attribute name="alignment">
-            <dia:enum val="1"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="valign">
-        <dia:enum val="2"/>
-      </dia:attribute>
-      dia:connections
-        <dia:connection handle="0" to="O8" connection="8"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - Box" version="0" id="O10">
-      <dia:attribute name="obj_pos">
         <dia:point val="14,3.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
@@ -378,12 +319,12 @@
         <dia:boolean val="true"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O11">
+    <dia:object type="Standard - Text" version="1" id="O9">
       <dia:attribute name="obj_pos">
         <dia:point val="15,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.1312,3.50441;15.8858,4.49559"/>
+        <dia:rectangle val="14.1312,3.53;15.8688,4.47"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -397,7 +338,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15,4.06397"/>
+            <dia:point val="15,4.0725"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -411,10 +352,10 @@
         <dia:enum val="2"/>
       </dia:attribute>
       dia:connections
-        <dia:connection handle="0" to="O10" connection="8"/>
+        <dia:connection handle="0" to="O8" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O12">
+    <dia:object type="Standard - Line" version="0" id="O10">
       <dia:attribute name="obj_pos">
         <dia:point val="6,1"/>
       </dia:attribute>
@@ -442,45 +383,51 @@
         <dia:connection handle="1" to="O4" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O13">
+    <dia:object type="Standard - Text" version="1" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.05011,4"/>
+        <dia:point val="1,6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.00011,3.5;13.9999,4.5"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="6.05011,4"/>
-        <dia:point val="13.9499,4"/>
+        <dia:rectangle val="1,5.6;1,6.8"/>
       </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            dia:string##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="1,6"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
-      <dia:attribute name="end_arrow">
+      <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      dia:connections
-        <dia:connection handle="0" to="O8" connection="8"/>
-        <dia:connection handle="1" to="O10" connection="8"/>
-      </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O14">
+    <dia:object type="Standard - Text" version="1" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,6"/>
+        <dia:point val="6,-0.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.98,5.58;1,6.84"/>
+        <dia:rectangle val="6,-1.15956;13.9796,0.631625"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            dia:string##</dia:string>
+            dia:string#originator = A/wlan0
+outgoing interface = wlan0#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -489,7 +436,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="1,6"/>
+            <dia:point val="6,-0.6"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -503,17 +450,18 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O15">
+    <dia:object type="Standard - Text" version="1" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="7,0"/>
+        <dia:point val="6,5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7,-0.559562;13.0521,0.431625"/>
+        <dia:rectangle val="6,4.44044;13.9796,6.23163"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            dia:string#originator = A/wlan0#</dia:string>
+            dia:string#originator = A/wlan0
+outgoing interface = wlan1#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -522,7 +470,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="7,0"/>
+            <dia:point val="6,5"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -536,17 +484,71 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
+    <dia:object type="Standard - BezierLine" version="0" id="O14">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5,1.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="4.94905,1.44905;14.0582,4.50076"/>
+      </dia:attribute>
+      <dia:attribute name="bez_points">
+        <dia:point val="5,1.5"/>
+        <dia:point val="5.05,4.1"/>
+        <dia:point val="4.9,4.15"/>
+        <dia:point val="14,4"/>
+      </dia:attribute>
+      <dia:attribute name="corner_types">
+        <dia:enum val="0"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="3"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      dia:connections
+        <dia:connection handle="0" to="O6" connection="6"/>
+        <dia:connection handle="3" to="O8" connection="3"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="Standard - Box" version="0" id="O15">
+      <dia:attribute name="obj_pos">
+        <dia:point val="4,3.5"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.95,3.45;6.05,4.55"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="4,3.5"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="2"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="inner_color">
+        <dia:color val="#e5e5e5"/>
+      </dia:attribute>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+    </dia:object>
     <dia:object type="Standard - Text" version="1" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="6,5"/>
+        <dia:point val="5,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6,4.44044;12.0521,5.43163"/>
+        <dia:rectangle val="4.13125,3.53;5.86875,4.47"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            dia:string#originator = A/wlan0#</dia:string>
+            dia:string#wlan1#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -555,26 +557,29 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="6,5"/>
+            <dia:point val="5,4.0725"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
-            <dia:enum val="0"/>
+            <dia:enum val="1"/>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
       <dia:attribute name="valign">
-        <dia:enum val="3"/>
+        <dia:enum val="2"/>
       </dia:attribute>
+      dia:connections
+        <dia:connection handle="0" to="O15" connection="8"/>
+      </dia:connections>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="12,4.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.9575,3.1025;13.1225,5.575"/>
+        <dia:rectangle val="12,3.145;13.1225,5.49"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">

    