diff --git a/doc/manual/source/attributes.rst b/doc/manual/source/attributes.rst
index ae107688f..ddbfd0eac 100644
--- a/doc/manual/source/attributes.rst
+++ b/doc/manual/source/attributes.rst
@@ -856,18 +856,25 @@ presentation.
 To use this feature, one must install libgtk and libgtk-dev; an example
 Ubuntu installation command is:::
 
-    sudo apt-get install libgtk2.0-0 libgtk2.0-dev
+  sudo apt-get install libgtk2.0-0 libgtk2.0-dev
 
 To check whether it is configured or not, check the output of the step:::
-./waf configure --enable-examples --enable-tests 
 
-    ---- Summary of optional NS-3 features:
-    Threading Primitives          : enabled
-    Real Time Simulator           : enabled
-    GtkConfigStore                : not enabled (library 'gtk+-2.0 >= 2.12' not found)
+  ./waf configure --enable-examples --enable-tests
+
+  ---- Summary of optional NS-3 features:
+  Python Bindings               : enabled
+  Python API Scanning Support   : enabled
+  NS-3 Click Integration        : enabled
+  GtkConfigStore                : not enabled (library 'gtk+-2.0 >= 2.12' not found)
 
 In the above example, it was not enabled, so it cannot be used until a suitable
-version is installed and ./waf configure --enable-examples --enable-tests; ./waf is rerun.
+version is installed and::
+
+  ./waf configure --enable-examples --enable-tests
+  ./waf
+
+is rerun.
 
 Usage is almost the same as the non-GTK-based version, but there
 are no ConfigStore attributes involved:::
diff --git a/doc/manual/source/tracing.rst b/doc/manual/source/tracing.rst
index 27ca6f1a4..3e65834c2 100644
--- a/doc/manual/source/tracing.rst
+++ b/doc/manual/source/tracing.rst
@@ -26,7 +26,7 @@ output, as in, ::
   int main ()
   {
     ...
-    std::cout << ``The value of x is `` << x << std::endl;
+    std::cout << "The value of x is " << x << std::endl;
     ...
   } 
 
@@ -109,11 +109,11 @@ The Simplest Example
 
 It will be useful to go walk a quick example just to reinforce what we've
 said.::
-
-  #include ``ns3/object.h''
-  #include ``ns3/uinteger.h''
-  #include ``ns3/traced-value.h''
-  #include ``ns3/trace-source-accessor.h''
+ 
+  #include "ns3/object.h"
+  #include "ns3/uinteger.h"
+  #include "ns3/traced-value.h""
+  #include "ns3/trace-source-accessor.h"
   
   #include <iostream>
   
@@ -167,7 +167,7 @@ callback process.::
   void
   IntTrace (Int oldValue, Int newValue)
   {
-    std::cout << ``Traced `` << oldValue << `` to `` << newValue << std::endl;
+    std::cout << "Traced " << oldValue << " to " << newValue << std::endl;
   }
 
 This is the definition of the trace sink. It corresponds directly to a callback
@@ -199,7 +199,7 @@ context for now since it is not important yet.
 
 Finally, the line,::
 
-   myObject->m_myInt = 1234;
+  myObject->m_myInt = 1234;
 
 should be interpreted as an invocation of ``operator=`` on the member variable
 ``m_myInt`` with the integer :math:`1234` passed as a parameter. It turns out