From b77fb7f40c58609fa394aec7736904e7e7fc8291 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 11 May 2013 13:27:05 -0700 Subject: [PATCH] update emulation section to deprecate EmuNetDevice and add FdNetDevice --- doc/models/Makefile | 1 - doc/models/figures/testbed.dia | Bin 2593 -> 2875 bytes doc/models/source/emulation-overview.rst | 19 +++++++++++++++---- doc/models/source/index.rst | 1 - src/emu/doc/emu.rst | 4 ++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index dff986716..70adfcb74 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -36,7 +36,6 @@ SOURCES = \ $(SRC)/dsr/doc/dsr.rst \ $(SRC)/mpi/doc/distributed.rst \ $(SRC)/energy/doc/energy.rst \ - $(SRC)/emu/doc/emu.rst \ $(SRC)/fd-net-device/doc/fd-net-device.rst \ $(SRC)/tap-bridge/doc/tap.rst \ $(SRC)/mesh/doc/mesh.rst \ diff --git a/doc/models/figures/testbed.dia b/doc/models/figures/testbed.dia index f612cc5a7911d9aa6fe590e181ae5180d345b5a4..9409bfee3e7a77e8615f150756083f74df6e5d72 100644 GIT binary patch literal 2875 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 Z1nKQX@xuI0Q-5}Q@qbgr-%x?m008bhrWgPK literal 2593 zcmV++3f}b}iwFP!000003+-K7kE1viey?8voA%M*kH78O^3g!6N&N=7%Y=4*^fBJUtW=~ESxq<&MCkW4H zj=v5zuD^Sj|Muk{ANl;J$GaaluKj~}??U@96W{QoMme z&pn~Yx&NQ-dG@_1bU%N*o6TNVu(4x1xt3qG<2ZCzr`VbK_Q83Wuk7{LT^OAF%{(iW zmsQ%;TS}&C=$OM zFN!qOll*;ECNC9lc_Y5&&tqFXwUT`r=nYvk@icXK^(OC=g=d3HDPe)&z&aAmc>D60L*jog*z)V1FA zV`^i>!jKH{Pls}kk!@*4;$|2j@}&}b|-h^L@jPsF4IucJ}-9PHtN-Kw+>8p zsRGui3D16U!o2#Q&oDj9f8adhyc&gI^&e*)=iU1p+y2H5H?xnkpM!7nGwTqX!`(d0 z|AouLQ|*wbOk}=`@i_*C6X^@R+TF`!(Ny(nRjoM`ZMXfM=VY~O$kG?dpHD=>E z`da;Kz2ozhwmqR=Zv z^%xnS5-X_ZZyF~(Z(%f*GEKi=It471tIQS~=89JcRufwf{J73ga(%Y753ctj+GG3C zd=|wo2@?=$Cj06yj`!rm?%IA$Sh~01A_{6E0V9sfFKw97vahxKTOS)$uxnhDz<8J; zF`L`@2dDmrbo|pHAH*B2)UwHLq41P8sTvIDrm#_R4jYREnfSJ?AOiKc0>dG-wdxe=? zJ!b0D#7qWyk2j#q(hFpok53`Ak- z{KwINVxUACUnd*9(M6nn|IchM@>A}eagd__?EK#vh15l*a#U}FWpBh(Dl#QTp)#fB zC@Rzb9Rist(2mxC8!YJ~T&d8Mn1#}m8l$X?_3sc!O(oLd!MZO>)b1c9^(Si6)DFl^ zf%9It9Oz9asP7_!1zwaY6`T^Qq&TG-C{7_I&2Do>n1D|)Bk2+{lA)9drJB=1a!P3; zIprWZg;Z4aLXezJe`Amg7WYxCR&+|NLUl^DQBWkCj{oR#N3ynQ2eyIA=Kw=n{xeC4!|T11uR*I<>@w`jm;eQfWc zrvRLFE=iFkW|;t-QwC0oWdNtH9yqmEz{y7dPEeqN6hzVKPDBPDP^&;K_&_c}E%*RP zP=O27yCX@ZO#ZY@F`{_LqbL}lro`2gUSjGD$_uN3aO~p3qgbW4z>pe3;h^Xt3hR? z(4aD76bgthGdxe~Q1mpw}Dri9z z5dtcM5U3TQ7JMKVp%#1qM5w?8>fI4Us1p^T3JRb=geu7Ra}a(NY4ERJaN5*SkKxZf z)sViR8d7@`Ol|}lSP&4JeBg+vJ)d!4ziyJG^0zmC_gvp;Yd1!ulHbSxV@YN?U8OwL zeAC6m*7dv_Ol;HFTV_@1Sf!xWoT5rOx$0~n+XI?F8M3(GkW_F5ieY!UFIU)l?s2&f zLifMIqipYL$Zu^g>KXH?83EdfKMpt2aq9HDyZhbV{Zpi!x(Sqw2NYAak6yHdpX2nw zEgIt7NSwYmO9|usGHrZ^F4Y$hjksDww3QhhieU@$0i6;)Tn?;jLDdR3wcqQ~Ci@fz z0!8C8QVa^JUWB}IQ$yQFc8tWvF_UMkXV|cd3>KCrfW?r#iA! zhGwNt^#ydq^{Zt>!#V9(5Mu`6DgCBRDltB(?D(uiW--||B;5H<6(1XCu>>haWNH>q zj*Y`QrpY{*F>Lf*4)*<}<8NAHw9>n}gU&kaO%+b8P-qk|=7W)mG>|G5tFA29V3U{^DwB6o)!@W5VT!d^-GGWPx(d3zr7Sff6 z>G$W5^73;?1=T3;zjrlXPa9gvMHhNe-H8`I&?d{f3Qe~Yjloo-PdjSqMt8!|$MhxX zXmVJ3aav>_dv(O)M(WYWToe6hBOup_PCW_f8b=pI@h`_ for details on the ORBIT @@ -72,5 +83,5 @@ simulated |ns3| networks. .. toctree:: - emu + fd-net-device tap diff --git a/doc/models/source/index.rst b/doc/models/source/index.rst index 25705b97e..02b144448 100644 --- a/doc/models/source/index.rst +++ b/doc/models/source/index.rst @@ -30,7 +30,6 @@ This document is written in `reStructuredText