Merge with ns-3-dev.

src/common/packet.h

@@ -521,7 +521,7 @@ public:
    */
   PacketTagIterator GetPacketTagIterator (void) const;
 
-  /* Note: These function support a temporary solution 
+  /* Note: These functions support a temporary solution 
    * to a specific problem in this generic class, i.e. 
    * how to associate something specific like nix-vector 
    * with a packet.  This design methodology 

src/routing/nix-vector-routing/nix-vector-routing.h

@@ -64,8 +64,8 @@
  * The nix-vector stores an index for each hop along the path, which 
  * corresponds to the neighbor-index.  This index is used to determine 
  * which net-device and gateway should be used.  To route a packet, the 
- * nix-vector must be transmitted with the packet (in the metadata).  
- * At each hop, the current node extracts the appropriate neighbor-index 
- * from the nix-vector and transmits the packet through the corresponding 
+ * nix-vector must be transmitted with the packet. At each hop, the 
+ * current node extracts the appropriate neighbor-index from the 
+ * nix-vector and transmits the packet through the corresponding 
  * net-device.  This continues until the packet reaches the destination.
  * */