docs: Documentation update, initial preparation for version 2.1 release

Change-Id: I3694a8791b9540fc1b926a83ff55421b47e0f1e2
diff --git a/model/cs/ndn-content-store.hpp b/model/cs/ndn-content-store.hpp
index 36994f8..54c177b 100644
--- a/model/cs/ndn-content-store.hpp
+++ b/model/cs/ndn-content-store.hpp
@@ -115,8 +115,7 @@
   /**
    * \brief Find corresponding CS entry for the given interest
    *
-   * \param interest Interest for which matching content store entry
-   * will be searched
+   * \param interest Interest for which matching content store entry will be searched
    *
    * If an entry is found, it is promoted to the top of most recent
    * used entries index, \see m_contentStore
@@ -126,11 +125,7 @@
 
   /**
    * \brief Add a new content to the content store.
-   *
-   * \param header Fully parsed Data
-   * \param packet Fully formed Ndn packet to add to content store
-   * (will be copied and stripped down of headers)
-   * @returns true if an existing entry was updated, false otherwise
+   * \returns true if an existing entry was updated, false otherwise
    */
   virtual bool
   Add(shared_ptr<const Data> data) = 0;
diff --git a/model/ndn-common.hpp b/model/ndn-common.hpp
index dbb1502..237fc3e 100644
--- a/model/ndn-common.hpp
+++ b/model/ndn-common.hpp
@@ -63,7 +63,10 @@
 using ::ndn::Block;
 using ::ndn::KeyChain;
 
+#ifndef DOXYGEN
+// For python bindings
 namespace nfd = ::nfd;
+#endif // DOXYGEN
 
 } // namespace ndn
 } // namespace ns3