Hi Daniel, I read through your changes and put some comments. These are mere cosmetic feedback, since I don't have any reliable background in Wi-Fi at the moment. Cheers, -budi- https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst File src/wifi/doc/wifi.rst (right): https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode35 src/wifi/doc/wifi.rst:35: limitation found in ns-2. Presently, however, there is no model for ns-2 -> |ns2| https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode38 src/wifi/doc/wifi.rst:38: The source code for the Wifi NetDevice lives in the directory Wifi NetDevice -> WifiNetDevice (to be consistent with the rest) https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode50 src/wifi/doc/wifi.rst:50: More detailed information will be disscussed later. disscussed -> discussed https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode74 src/wifi/doc/wifi.rst:74: configuration of 802.11e/WMM-style QoS support and an attribute "HtSupported" that allows configuration og 802.11n High Throughput style support. "HtSupported" -> ``HtSupported`` (to be consistent QosSupported) og -> of https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode76 src/wifi/doc/wifi.rst:76: Mac low layers Mac -> MAC layers -> layer https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode96 src/wifi/doc/wifi.rst:96: Mac low layer. A completed list of available rate control algorithms is Mac -> MAC completed -> complete https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode102 src/wifi/doc/wifi.rst:102: The PHY layer implements a single model in the ``ns3::WifiPhy class``: the ``ns3::WifiPhy class`` -> ``ns3::WifiPhy`` class https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode112 src/wifi/doc/wifi.rst:112: Wifi NetDevice architecture. Wifi NetDevice -> WifiNetDevice https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode151 src/wifi/doc/wifi.rst:151: The users configures the wifi architecture (i.e. ad-hoc or ap-sta) and whether QoS configures -> configure https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode196 src/wifi/doc/wifi.rst:196: Physical devices (base class ``ns3::Phy``) connect to ``ns3::Channel`` models in Somehow I can't find a class named ``Phy``. Does this class really exist? https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode233 src/wifi/doc/wifi.rst:233: WifiMacHelper takes care of both the MAC-low model and MAC-high model. Previously, MAC low and MAC high were presented without any dash. https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode260 src/wifi/doc/wifi.rst:260: * a MSDU aggregator for a particular Access Category (AC) in order to use a -> an https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode292 src/wifi/doc/wifi.rst:292: The ``ns3::HtWifiMacHelper``configures an Need a space before "configures". https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode306 src/wifi/doc/wifi.rst:306: This object can be also used to set in the same way as ``ns3::QosWifiMacHelper`` Need a dot at the end. https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode346 src/wifi/doc/wifi.rst:346: The two examples were modified from the two examples in the ``example/wireless`` folder example -> examples https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode348 src/wifi/doc/wifi.rst:348: Users are encouraged to see examples in the ``example/wireless`` folder. Idem. https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode524 src/wifi/doc/wifi.rst:524: The WifiChannel implementation uses the propagation loss and delay models provided within the ns-3 :ref:`Propagation` module. ns-3 -> |ns3| https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode565 src/wifi/doc/wifi.rst:565: * use of the rts/cts protocol, rts/cts -> RTS/CTS https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode570 src/wifi/doc/wifi.rst:570: * msdu aggregation, msdu -> MSDU https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode579 src/wifi/doc/wifi.rst:579: The following rate control algorithms can be used by the Mac low layer: Mac -> MAC https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode583 src/wifi/doc/wifi.rst:583: * ``ArfWifiManager`` How about adding an indication that this algorithm is the default? https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode596 src/wifi/doc/wifi.rst:596: Previously, it was mentioned that we can change the remote station manager using WifiHelper. For me, who have very little knowledge on Wi-Fi, it wasn't clear to me that this is equivalent with changing the rate control algorithm. How about mentioning the SetRemoteStationManager method again here? https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode621 src/wifi/doc/wifi.rst:621: `project wiki <http://www.nsnam.org/wiki>`_ on how to do this. How about linking directly to the article: http://www.nsnam.org/wiki/HOWTO_add_basic_rates_to_802.11 https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode636 src/wifi/doc/wifi.rst:636: When *B* successfully receive the packet sent from *A*, receive -> receives https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode661 src/wifi/doc/wifi.rst:661: In mistrel, roughly 10 percent of transmissions are sent at the so-called lookaround rate. mistrel -> minstrel https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode662 src/wifi/doc/wifi.rst:662: The goal of the lookaround rate is to force minstrel to try higher rate than the currently using rate. using -> used https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode664 src/wifi/doc/wifi.rst:664: For a more detailed information about minstrel, see [linuxminstrel]_ Need a dot at the end. https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode685 src/wifi/doc/wifi.rst:685: station manager simply indicates if fragmentation and RTS are needed Fragmentation is handled by Maybe a dot after "needed"? https://codereview.appspot.com/59740046/diff/1/src/wifi/doc/wifi.rst#newcode687 src/wifi/doc/wifi.rst:687: * Modifying or creating new rate control algorithms can be done by creating a new of Wi-Fi remote Do you mean "... a new child class of Wi-Fi remote..."?