diff --git a/doc/models/source/emulation-overview.rst b/doc/models/source/emulation-overview.rst
index 8877fd412..02d983578 100644
--- a/doc/models/source/emulation-overview.rst
+++ b/doc/models/source/emulation-overview.rst
@@ -11,7 +11,7 @@ By associating this file descriptor with different things on the host
 system, different capabilities can be provided.  For instance, the
 FdNetDevice can be associated with an underlying packet socket to provide
 emulation capabilities.  This allows |ns3| simulations
-to send data on a "real" network. The second kind, called a ``Tap``
+to send data on a "real" network. The second kind, called a ``TapBridge``
 ``NetDevice`` allows a "real" host to participate in an |ns3| simulation as if
 it were one of the simulated nodes. An |ns3| simulation may be constructed with
 any combination of simulated or emulated devices.
@@ -80,7 +80,8 @@ We expect the typical use case for this environment will be to analyze the
 behavior of native applications and protocol suites in the presence of large
 simulated |ns3| networks.
 
-.. toctree::
+For more details:
+
+* :doc:`FdNetDevice <fd-net-device>` chapter.
+* :doc:`TapBridge <tap>` chapter.
 
-  fd-net-device
-  tap
diff --git a/doc/models/source/index.rst b/doc/models/source/index.rst
index f7d12aeb3..260308ddb 100644
--- a/doc/models/source/index.rst
+++ b/doc/models/source/index.rst
@@ -46,6 +46,7 @@ This document is written in `reStructuredText <http://docutils.sourceforge.net/r
    propagation
    spectrum
    sixlowpan
+   tap
    topology
    traffic-control
    uan