--- a/doc/manual/source/logging.rst	Fri Sep 26 12:44:13 2014 -0700
+++ b/doc/manual/source/logging.rst	Fri Sep 26 15:51:00 2014 -0700
@@ -320,7 +320,7 @@
 Adding logging to your code is very simple:
 
 1. Invoke the ``NS_LOG_COMPONENT_DEFINE (...);`` macro
-   outside of ``namespace ns3``.
+   inside of ``namespace ns3``.
 
   Create a unique string identifier (usually based on the name of the file
   and/or class defined within the file) and register it with a macro call
@@ -328,9 +328,9 @@
 
   ::
 
+    namespace ns3 {
+    
     NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
-
-    namespace ns3 {
     ...
 
   This registers ``Ipv4L3Protocol`` as a log component.

--- a/examples/energy/energy-model-example.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/energy/energy-model-example.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -31,9 +31,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("EnergyExample");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("EnergyExample");
 
 static inline std::string
 PrintReceivedPacket (Address& from)

--- a/examples/energy/energy-model-with-harvesting-example.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/energy/energy-model-with-harvesting-example.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -60,9 +60,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("EnergyWithHarvestingExample");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("EnergyWithHarvestingExample");
 
 static inline std::string
 PrintReceivedPacket (Address& from)

--- a/examples/ipv6/fragmentation-ipv6.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/ipv6/fragmentation-ipv6.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -41,7 +41,6 @@
 
 NS_LOG_COMPONENT_DEFINE ("FragmentationIpv6Example");
 
-
 int main (int argc, char** argv)
 {
   bool verbose = false;

--- a/examples/ipv6/loose-routing-ipv6.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/ipv6/loose-routing-ipv6.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -44,6 +44,7 @@
 #include "ns3/csma-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/ipv6-header.h"
+
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LooseRoutingIpv6Example");

--- a/examples/ipv6/test-ipv6.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/ipv6/test-ipv6.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -24,9 +24,9 @@
 #include "ns3/node.h"
 #include "ns3/mac48-address.h"
 
-NS_LOG_COMPONENT_DEFINE ("TestIpv6");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("TestIpv6");
 
 int 
 main (int argc, char *argv[])

--- a/examples/stats/wifi-example-sim.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/stats/wifi-example-sim.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -49,9 +49,6 @@
 
 NS_LOG_COMPONENT_DEFINE ("WiFiDistanceExperiment");
 
-
-
-
 void TxCallback (Ptr<CounterCalculator<uint32_t> > datac,
                  std::string path, Ptr<const Packet> packet) {
   NS_LOG_INFO ("Sent frame counted in " <<

--- a/examples/tcp/tcp-large-transfer.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/tcp/tcp-large-transfer.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -44,7 +44,6 @@
 
 NS_LOG_COMPONENT_DEFINE ("TcpLargeTransfer");
 
-
 // The number of bytes to send in this simulation.
 static const uint32_t totalTxBytes = 2000000;
 static uint32_t currentTxBytes = 0;

--- a/examples/tutorial/hello-simulator.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/tutorial/hello-simulator.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -16,9 +16,9 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("HelloSimulator");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("HelloSimulator");
 
 int
 main (int argc, char *argv[])

--- a/examples/wireless/multirate.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/multirate.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -64,9 +64,9 @@
 #include <iostream>
 #include <fstream>
 
-NS_LOG_COMPONENT_DEFINE ("multirate");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("multirate");
 
 class Experiment
 {

--- a/examples/wireless/wifi-adhoc.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-adhoc.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -27,9 +27,9 @@
 
 #include <iostream>
 
-NS_LOG_COMPONENT_DEFINE ("Main");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("Main");
 
 class Experiment
 {

--- a/examples/wireless/wifi-clear-channel-cmu.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-clear-channel-cmu.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -30,9 +30,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("Main");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("Main");
 
 class Experiment
 {

--- a/examples/wireless/wifi-simple-adhoc-grid.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-simple-adhoc-grid.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -84,9 +84,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhocGrid");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhocGrid");
 
 void ReceivePacket (Ptr<Socket> socket)
 {

--- a/examples/wireless/wifi-simple-adhoc.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-simple-adhoc.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -63,9 +63,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc");
 
 void ReceivePacket (Ptr<Socket> socket)
 {

--- a/examples/wireless/wifi-simple-infra.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-simple-infra.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -64,9 +64,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra");
 
 void ReceivePacket (Ptr<Socket> socket)
 {

--- a/examples/wireless/wifi-simple-interference.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-simple-interference.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -92,9 +92,9 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");
 
 static inline std::string PrintReceivedPacket (Ptr<Socket> socket)
 {

--- a/examples/wireless/wifi-sleep.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/examples/wireless/wifi-sleep.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -62,9 +62,9 @@
 #include <string>
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSleep");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("WifiSleep");
 
 template <int node>
 void RemainingEnergyTrace (double oldValue, double newValue)

--- a/scratch/scratch-simulator.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/scratch/scratch-simulator.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -16,9 +16,9 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
 
 int 
 main (int argc, char *argv[])

--- a/scratch/subdir/scratch-simulator-subdir.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/scratch/subdir/scratch-simulator-subdir.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -16,9 +16,9 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
 
 int 
 main (int argc, char *argv[])

--- a/src/antenna/model/angles.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/model/angles.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -24,10 +24,9 @@
 #include "angles.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("Angles");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Angles");
 
 double DegreesToRadians (double degrees)
 {

--- a/src/antenna/model/antenna-model.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/model/antenna-model.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -24,9 +24,9 @@
 #include "antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("AntennaModel");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("AntennaModel");
 
 NS_OBJECT_ENSURE_REGISTERED (AntennaModel);
 

--- a/src/antenna/model/cosine-antenna-model.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/model/cosine-antenna-model.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -27,9 +27,9 @@
 #include "cosine-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel");
 
 NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel);
 

--- a/src/antenna/model/isotropic-antenna-model.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/model/isotropic-antenna-model.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -25,9 +25,9 @@
 #include "isotropic-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel");
 
 NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel);
 

--- a/src/antenna/model/parabolic-antenna-model.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/model/parabolic-antenna-model.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -27,9 +27,9 @@
 #include "parabolic-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel");
 
 NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel);
 

--- a/src/antenna/test/test-cosine-antenna.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/test/test-cosine-antenna.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -29,9 +29,9 @@
 #include <sstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("TestCosineAntennaModel");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("TestCosineAntennaModel");
 
 enum CosineAntennaModelGainTestCondition  {
   EQUAL = 0,

--- a/src/antenna/test/test-parabolic-antenna.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/antenna/test/test-parabolic-antenna.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -29,9 +29,9 @@
 #include <sstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("TestParabolicAntennaModel");
+using namespace ns3;
 
-using namespace ns3;
+NS_LOG_COMPONENT_DEFINE ("TestParabolicAntennaModel");
 
 enum ParabolicAntennaModelGainTestCondition  {
   EQUAL = 0,

--- a/src/aodv/model/aodv-neighbor.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/aodv/model/aodv-neighbor.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -30,10 +30,12 @@
 #include "ns3/log.h"
 #include <algorithm>
 
-NS_LOG_COMPONENT_DEFINE ("AodvNeighbors");
 
 namespace ns3
 {
+  
+NS_LOG_COMPONENT_DEFINE ("AodvNeighbors");
+
 namespace aodv
 {
 Neighbors::Neighbors (Time delay) : 

--- a/src/aodv/model/aodv-routing-protocol.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/aodv/model/aodv-routing-protocol.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -42,10 +42,11 @@
 #include <algorithm>
 #include <limits>
 
+namespace ns3
+{
+
 NS_LOG_COMPONENT_DEFINE ("AodvRoutingProtocol");
 
-namespace ns3
-{
 namespace aodv
 {
 NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);

--- a/src/aodv/model/aodv-rqueue.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/aodv/model/aodv-rqueue.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -32,10 +32,11 @@
 #include "ns3/socket.h"
 #include "ns3/log.h"
 
+namespace ns3
+{
+
 NS_LOG_COMPONENT_DEFINE ("AodvRequestQueue");
 
-namespace ns3
-{
 namespace aodv
 {
 uint32_t

--- a/src/aodv/model/aodv-rtable.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/aodv/model/aodv-rtable.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -32,10 +32,11 @@
 #include "ns3/simulator.h"
 #include "ns3/log.h"
 
+namespace ns3
+{
+
 NS_LOG_COMPONENT_DEFINE ("AodvRoutingTable");
 
-namespace ns3
-{
 namespace aodv
 {
 

--- a/src/applications/helper/radvd-helper.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/helper/radvd-helper.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -26,11 +26,11 @@
 
 #include "radvd-helper.h"
 
-NS_LOG_COMPONENT_DEFINE ("RadvdHelper");
-
 namespace ns3
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdHelper");
+
 RadvdHelper::RadvdHelper ()
 {
   m_factory.SetTypeId (Radvd::GetTypeId ());

--- a/src/applications/model/application-packet-probe.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/application-packet-probe.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -28,9 +28,9 @@
 #include "ns3/config.h"
 #include "ns3/trace-source-accessor.h"
 
-NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe");
 
 NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe);
 

--- a/src/applications/model/bulk-send-application.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/bulk-send-application.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -31,9 +31,9 @@
 #include "ns3/tcp-socket-factory.h"
 #include "bulk-send-application.h"
 
-NS_LOG_COMPONENT_DEFINE ("BulkSendApplication");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("BulkSendApplication");
 
 NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication);
 

--- a/src/applications/model/onoff-application.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/onoff-application.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -42,9 +42,9 @@
 #include "ns3/string.h"
 #include "ns3/pointer.h"
 
-NS_LOG_COMPONENT_DEFINE ("OnOffApplication");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("OnOffApplication");
 
 NS_OBJECT_ENSURE_REGISTERED (OnOffApplication);
 

--- a/src/applications/model/packet-loss-counter.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/packet-loss-counter.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -24,10 +24,9 @@
 #include "ns3/uinteger.h"
 #include "packet-loss-counter.h"
 
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
 
 PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)
   : m_lost (0),

--- a/src/applications/model/packet-sink.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/packet-sink.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -32,9 +32,9 @@
 #include "ns3/udp-socket-factory.h"
 #include "packet-sink.h"
 
-NS_LOG_COMPONENT_DEFINE ("PacketSink");
+namespace ns3 {
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PacketSink");
 
 NS_OBJECT_ENSURE_REGISTERED (PacketSink);
 

--- a/src/applications/model/ping6.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/ping6.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -35,11 +35,11 @@
 
 #include "ping6.h"
 
-NS_LOG_COMPONENT_DEFINE ("Ping6Application");
-
 namespace ns3 
 {
 
+NS_LOG_COMPONENT_DEFINE ("Ping6Application");
+
 NS_OBJECT_ENSURE_REGISTERED (Ping6);
 
 TypeId Ping6::GetTypeId ()

--- a/src/applications/model/radvd-interface.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/radvd-interface.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -21,11 +21,11 @@
 #include "radvd-interface.h"
 #include <ns3/log.h>
 
-NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
-
 namespace ns3 
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
+
 RadvdInterface::RadvdInterface (uint32_t interface)
   : m_interface (interface)
 {

--- a/src/applications/model/radvd-prefix.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/radvd-prefix.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -21,11 +21,11 @@
 #include "radvd-prefix.h"
 #include <ns3/log.h>
 
-NS_LOG_COMPONENT_DEFINE ("RadvdPrefix");
-
 namespace ns3
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdPrefix");
+
 RadvdPrefix::RadvdPrefix (Ipv6Address network, uint8_t prefixLength, uint32_t preferredLifeTime, uint32_t validLifeTime, bool onLinkFlag, bool autonomousFlag, bool routerAddrFlag)
   : m_network (network),
     m_prefixLength (prefixLength),

--- a/src/applications/model/radvd.cc	Fri Sep 26 12:44:13 2014 -0700
+++ b/src/applications/model/radvd.cc	Fri Sep 26 15:51:00 2014 -0700
@@ -37,11 +37,11 @@
 
 #include "radvd.h"
 
-NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
-
 namespace ns3
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (Radvd);
 
 TypeId Radvd::GetTypeId ()