From a8a6bc74c3a247fb7420baf95d37dfdf7aea09b5 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 25 Apr 2009 14:56:52 -0700 Subject: [PATCH] fix texinfo errors --- doc/manual/attributes.texi | 2 +- doc/manual/csma.texi | 8 ++++---- doc/manual/emulation.texi | 2 +- doc/manual/manual.texi | 2 ++ doc/manual/new-models.texi | 2 +- doc/manual/point-to-point.texi | 6 +++--- doc/manual/realtime.texi | 4 ++-- doc/manual/tcp.texi | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/manual/attributes.texi b/doc/manual/attributes.texi index 5461d7172..35c29a178 100644 --- a/doc/manual/attributes.texi +++ b/doc/manual/attributes.texi @@ -72,7 +72,7 @@ For most basic usage (syntax), treat a smart pointer like a regular pointer: @node CreateObject @subsection CreateObject -As we discussed above in @ref{Object Creation}, +As we discussed above in @ref{CreateObject and Create}, at the lowest-level API, objects of type @code{ns3::Object} are not instantiated using @code{operator new} as usual but instead by a templated function called @code{CreateObject()}. diff --git a/doc/manual/csma.texi b/doc/manual/csma.texi index 73121817a..055306490 100644 --- a/doc/manual/csma.texi +++ b/doc/manual/csma.texi @@ -5,13 +5,13 @@ This is the introduction to CSMA NetDevice chapter, to complement the Csma model doxygen. @menu -* Overview of the model:: +* Overview of the CSMA model:: * Using the CsmaNetDevice:: * CSMA Tracing:: @end menu -@node Overview of the model -@section Overview of the model +@node Overview of the CSMA model +@section Overview of the CSMA model The ns-3 CSMA device models a simple bus network in the spirit of Ethernet. Although it does not model any real physical network you could ever build @@ -254,7 +254,7 @@ takes just one line of code. NetDeviceContainer csmaDevices = csma.Install (csmaNodes); @end verbatim -@node Csma Tracing +@node CSMA Tracing @section CSMA Tracing Like all ns-3 devices, the CSMA Model provides a number of trace sources. diff --git a/doc/manual/emulation.texi b/doc/manual/emulation.texi index 75b1d551c..2da41b556 100644 --- a/doc/manual/emulation.texi +++ b/doc/manual/emulation.texi @@ -4,7 +4,7 @@ ns-3 has been designed for integration into testbed and virtual machine environments. We have addressed this need by providing two kinds of -net devices. The first kind, which we call an @code{Emu} @code {NetDevice} +net devices. The first kind, which we call an @code{Emu} @code{NetDevice} allows ns-3 simulations to send data on a ``real'' network. The second kind, called a @code{Tap} @code{NetDevice} allows a ``real'' host to participate in an ns-3 simulation as if it were one of the simulated nodes. An ns-3 diff --git a/doc/manual/manual.texi b/doc/manual/manual.texi index e99dbe3b6..c2241c22f 100644 --- a/doc/manual/manual.texi +++ b/doc/manual/manual.texi @@ -65,7 +65,9 @@ along with this program. If not, see @uref{http://www.gnu.org/licenses/}. @c So the toc is printed at the start. @anchor{Full Table of Contents} +@ifnottex @contents +@end ifnottex @ifnottex @node Top, Overview, Full Table of Contents diff --git a/doc/manual/new-models.texi b/doc/manual/new-models.texi index fd8dc29c5..86c9f1901 100644 --- a/doc/manual/new-models.texi +++ b/doc/manual/new-models.texi @@ -399,7 +399,7 @@ LOG_COMPONENT_DEFINE is done outside the namespace ns3 @subsection Object Framework - +@verbatim static const ClassId cid; diff --git a/doc/manual/point-to-point.texi b/doc/manual/point-to-point.texi index 48faf05ae..aef61f4bd 100644 --- a/doc/manual/point-to-point.texi +++ b/doc/manual/point-to-point.texi @@ -5,13 +5,13 @@ This is the introduction to PointToPoint NetDevice chapter, to complement the PointToPoint model doxygen. @menu -* Overview of the model:: +* Overview of the PointToPoint model:: * Using the PointToPointNetDevice:: * PointToPoint Tracing:: @end menu -@node Overview of the model -@section Overview of the model +@node Overview of the PointToPoint model +@section Overview of the PointToPoint model The ns-3 point-to-point model is of a very simple point to point data link connecting exactly two PointToPointNetDevice devices over an diff --git a/doc/manual/realtime.texi b/doc/manual/realtime.texi index e5d3c7d4b..5abcec0cf 100644 --- a/doc/manual/realtime.texi +++ b/doc/manual/realtime.texi @@ -77,8 +77,8 @@ fashion is governed by the attributes explained in the previous section. The implementation is contained in the following files: @itemize @bullet -@item @code{src/simulator/realtime-simulator-impl.{cc,h}} -@item @code{src/simulator/wall-clock-synchronizer.{cc,h}} +@item @code{src/simulator/realtime-simulator-impl.@{cc,h@}} +@item @code{src/simulator/wall-clock-synchronizer.@{cc,h@}} @end itemize In order to create a realtime scheduler, to a first approximation you diff --git a/doc/manual/tcp.texi b/doc/manual/tcp.texi index f21315837..5e9f9ef73 100644 --- a/doc/manual/tcp.texi +++ b/doc/manual/tcp.texi @@ -13,7 +13,7 @@ with minimal changes to the scripts. There are two important abstract base classes: @itemize @bullet -@item @code{class TcpSocket}: This is defined in @code{src/node/tcp-socket.{cc,h}}. This class exists for hosting TcpSocket attributes that can be +@item @code{class TcpSocket}: This is defined in @code{src/node/tcp-socket.@{cc,h@}}. This class exists for hosting TcpSocket attributes that can be reused across different implementations. For instance, @code{TcpSocket::SetInitialCwnd()} can be used for any of the implementations that derive from @code{class TcpSocket}.