diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index b960b9a..188ceeb 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -91,7 +91,7 @@
 Prerequisites
 ~~~~~~~~~~~~~
 
-Install the `ndn-cxx library <https://named-data.net/doc/ndn-cxx/current/INSTALL.html>`__
+Install the `ndn-cxx library <https://docs.named-data.net/ndn-cxx/current/INSTALL.html>`__
 and its prerequisites.
 
 On Linux, NFD needs the following dependencies to enable optional features:
@@ -278,7 +278,7 @@
 
 Sample applications:
 
-    + `Simple examples using the ndn-cxx library <https://named-data.net/doc/ndn-cxx/current/examples.html>`__
+    + `Simple examples using the ndn-cxx library <https://docs.named-data.net/ndn-cxx/current/examples.html>`__
     + `Simple examples using the python-ndn library <https://python-ndn.readthedocs.io/en/latest/src/examples/basic_app.html>`__
 
 Real applications and libraries:
diff --git a/docs/index.rst b/docs/index.rst
index f586626..79f8fdc 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,7 +18,7 @@
    releases
 
 **NFD** is a network forwarder that implements and evolves together with the Named Data
-Networking (NDN) `protocol <https://named-data.net/doc/NDN-packet-spec/current/>`__.
+Networking (NDN) `protocol <https://docs.named-data.net/NDN-packet-spec/current/>`__.
 NFD is a core component of the `NDN Platform <https://named-data.net/codebase/platform/>`__.
 
 Documentation
@@ -64,7 +64,7 @@
 Issues
 ------
 
-Please submit any bugs or feature requests to the
+Please submit any bug reports or feature requests to the
 `NFD issue tracker <https://redmine.named-data.net/projects/nfd/issues>`__.
 
 License
diff --git a/docs/named_data_theme/named_data_header.html b/docs/named_data_theme/named_data_header.html
index c058896..9bade40 100644
--- a/docs/named_data_theme/named_data_header.html
+++ b/docs/named_data_theme/named_data_header.html
@@ -32,7 +32,7 @@
 
          <!--top menu-->
          <div class="nine columns" id="menu_container" >
-           <h1><a href="https://named-data.net/doc/NFD/$projectnumber/">$projectname $projectnumber documentation</a></h1>
+           <h1><a href="https://docs.named-data.net/NFD/$projectnumber/">$projectname $projectnumber documentation</a></h1>
          </div>
     </div>
 </div><!--header container end-->
diff --git a/docs/overview.rst b/docs/overview.rst
index e45286a..b13b591 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -1,26 +1,25 @@
 NFD Overview
 ============
 
-NDN Forwarding Daemon (NFD) is a network forwarder that implements and evolves together
-with the Named Data Networking (NDN) `protocol <https://named-data.net/doc/NDN-packet-spec/current/>`__.
+NDN Forwarding Daemon (NFD) is a network forwarder that implements and evolves together with
+the Named Data Networking (NDN) `protocol <https://docs.named-data.net/NDN-packet-spec/current/>`__.
 Since the initial public release in 2014, NFD has been a core component of the
 `NDN Platform <https://named-data.net/codebase/platform/>`__.
 
 NFD is developed by a community effort. Although the first release was mostly done by the
-members of `NSF-sponsored NDN project team
-<https://named-data.net/project/participants/>`__, it already contains significant
-contributions from people outside the project team (for more details, refer to `AUTHORS.md
-<https://github.com/named-data/NFD/blob/master/AUTHORS.md>`__).  We strongly encourage
-participation from all interested parties, since broader community support is key for NDN
-to succeed as a new Internet architecture. Bug reports and feedback are highly
-appreciated and can be made through `Redmine site
+members of `NSF-sponsored NDN project team <https://named-data.net/project/participants/>`__,
+it already contains significant contributions from people outside the project team (for more
+details, refer to `AUTHORS.md <https://github.com/named-data/NFD/blob/master/AUTHORS.md>`__).
+We strongly encourage participation from all interested parties, since broader community
+support is key for NDN to succeed as a new Internet architecture. Bug reports and feedback
+are highly appreciated and can be made through our `Redmine site
 <https://redmine.named-data.net/projects/nfd>`__ and the `ndn-interest mailing list
 <http://www.lists.cs.ucla.edu/mailman/listinfo/ndn-interest>`__.
 
 The main design goal of NFD is to support diverse experimentation of NDN technology. The
 design emphasizes *modularity* and *extensibility* to allow easy experiments with new
 protocol features, algorithms, and applications. We have not fully optimized the code for
-performance.  The intention is that performance optimizations are one type of experiments
+performance. The intention is that performance optimizations are one type of experiments
 that developers can conduct by trying out different data structures and different
 algorithms; over time, better implementations may emerge within the same design framework.
 To facilitate such experimentation with the forwarder, the NFD team has also written a
diff --git a/docs/release-notes/release-notes-0.1.0.rst b/docs/release-notes/release-notes-0.1.0.rst
index a6fea30..bd76dfb 100644
--- a/docs/release-notes/release-notes-0.1.0.rst
+++ b/docs/release-notes/release-notes-0.1.0.rst
@@ -7,7 +7,7 @@
 
 - **Packet Format**
 
-  + `NDN-TLV <https://named-data.net/doc/NDN-packet-spec/0.1/>`__
+  + `NDN-TLV <https://docs.named-data.net/NDN-packet-spec/0.1/>`__
   + LocalControlHeader, to allow apps to set outgoing face and learn incoming face
 
 - **Faces**
diff --git a/docs/release-notes/release-notes-0.6.6.rst b/docs/release-notes/release-notes-0.6.6.rst
index 822a8d0..e01fe17 100644
--- a/docs/release-notes/release-notes-0.6.6.rst
+++ b/docs/release-notes/release-notes-0.6.6.rst
@@ -5,8 +5,8 @@
 
 .. note::
    This is the last release to support the `NDN packet format version 0.2.1
-   <https://named-data.net/doc/NDN-packet-spec/0.2.1/>`__. The next release will support
-   only the `v0.3 packet format <https://named-data.net/doc/NDN-packet-spec/0.3/>`__.
+   <https://docs.named-data.net/NDN-packet-spec/0.2.1/>`__. The next release will support
+   only the `v0.3 packet format <https://docs.named-data.net/NDN-packet-spec/0.3/>`__.
 
 New features
 ^^^^^^^^^^^^
diff --git a/docs/release-notes/release-notes-0.7.0.rst b/docs/release-notes/release-notes-0.7.0.rst
index e04ec09..38eaaf7 100644
--- a/docs/release-notes/release-notes-0.7.0.rst
+++ b/docs/release-notes/release-notes-0.7.0.rst
@@ -6,7 +6,7 @@
 New features
 ^^^^^^^^^^^^
 
-- Support only `NDN packet format version 0.3 <https://named-data.net/doc/NDN-packet-spec/0.3/>`__
+- Support only `NDN packet format version 0.3 <https://docs.named-data.net/NDN-packet-spec/0.3/>`__
   (:issue:`4805`, :issue:`4581`, :issue:`4913`)
 
 - Initial support for ``PitToken`` (:issue:`4532`)
diff --git a/docs/releases.rst b/docs/releases.rst
index 067e78a..541760e 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -10,127 +10,127 @@
    release-notes/*
 
 * **NFD version 22.12**
-  (:doc:`Release Notes <release-notes/release-notes-22.12>`, `Documentation <https://named-data.net/doc/NFD/22.12/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-22.12>`, `Documentation <https://docs.named-data.net/NFD/22.12/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-22.12>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-22.12.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-22.12.tar.bz2.sha256>`__)
 
 * **NFD version 22.02**
-  (:doc:`Release Notes <release-notes/release-notes-22.02>`, `Documentation <https://named-data.net/doc/NFD/22.02/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-22.02>`, `Documentation <https://docs.named-data.net/NFD/22.02/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-22.02>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-22.02.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-22.02.tar.bz2.sha256>`__)
 
 * **NFD version 0.7.1**
-  (:doc:`Release Notes <release-notes/release-notes-0.7.1>`, `Documentation <https://named-data.net/doc/NFD/0.7.1/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.7.1>`, `Documentation <https://docs.named-data.net/NFD/0.7.1/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.7.1>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.7.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.7.1.tar.bz2.sha256>`__)
 
 * **NFD version 0.7.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.7.0>`, `Documentation <https://named-data.net/doc/NFD/0.7.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.7.0>`, `Documentation <https://docs.named-data.net/NFD/0.7.0/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.7.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.7.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.7.0.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.6**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.6>`, `Documentation <https://named-data.net/doc/NFD/0.6.6/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.6>`, `Documentation <https://docs.named-data.net/NFD/0.6.6/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.6>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.6.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.6.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.5**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.5>`, `Documentation <https://named-data.net/doc/NFD/0.6.5/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.5>`, `Documentation <https://docs.named-data.net/NFD/0.6.5/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.5>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.5.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.5.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.4**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.4>`, `Documentation <https://named-data.net/doc/NFD/0.6.4/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.4>`, `Documentation <https://docs.named-data.net/NFD/0.6.4/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.4>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.4.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.4.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.3**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.3>`, `Documentation <https://named-data.net/doc/NFD/0.6.3/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.3>`, `Documentation <https://docs.named-data.net/NFD/0.6.3/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.3>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.3.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.3.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.2**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.2>`, `Documentation <https://named-data.net/doc/NFD/0.6.2/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.2>`, `Documentation <https://docs.named-data.net/NFD/0.6.2/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.2>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.2.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.2.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.1**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.1>`, `Documentation <https://named-data.net/doc/NFD/0.6.1/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.1>`, `Documentation <https://docs.named-data.net/NFD/0.6.1/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.1>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.1.tar.bz2.sha256>`__)
 
 * **NFD version 0.6.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.6.0>`, `Documentation <https://named-data.net/doc/NFD/0.6.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.6.0>`, `Documentation <https://docs.named-data.net/NFD/0.6.0/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.6.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.6.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.6.0.tar.bz2.sha256>`__)
 
 * **NFD version 0.5.1**
-  (:doc:`Release Notes <release-notes/release-notes-0.5.1>`, `Documentation <https://named-data.net/doc/NFD/0.5.1/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.5.1>`, `Documentation <https://docs.named-data.net/NFD/0.5.1/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.5.1>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.5.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.5.1.tar.bz2.sha256>`__)
 
 * **NFD version 0.5.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.5.0>`, `Documentation <https://named-data.net/doc/NFD/0.5.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.5.0>`, `Documentation <https://docs.named-data.net/NFD/0.5.0/>`__)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.5.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.5.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.5.0.tar.bz2.sha256>`__)
 
 * **NFD version 0.4.1**
-  (:doc:`Release Notes <release-notes/release-notes-0.4.1>`, `Documentation <https://named-data.net/doc/NFD/0.4.1/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.4.1>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.4.1>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.4.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.4.1.tar.bz2.sha256>`__)
 
 * **NFD version 0.4.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.4.0>`, `Documentation <https://named-data.net/doc/NFD/0.4.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.4.0>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.4.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.4.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.4.0.tar.bz2.sha256>`__)
 
 * **NFD version 0.3.4**
-  (:doc:`Release Notes <release-notes/release-notes-0.3.4>`, `Documentation <https://named-data.net/doc/NFD/0.3.4/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.3.4>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.3.4>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.3.4.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.3.4.tar.bz2.sha256>`__)
 
 * **NFD version 0.3.3**
-  (:doc:`Release Notes <release-notes/release-notes-0.3.3>`, `Documentation <https://named-data.net/doc/NFD/0.3.3/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.3.3>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.3.3>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.3.3.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.3.3.tar.bz2.sha256>`__)
 
 * **NFD version 0.3.2**
-  (:doc:`Release Notes <release-notes/release-notes-0.3.2>`, `Documentation <https://named-data.net/doc/NFD/0.3.2/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.3.2>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.3.2>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.3.2.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.3.2.tar.bz2.sha256>`__)
 
 * **NFD version 0.3.1**
-  (:doc:`Release Notes <release-notes/release-notes-0.3.1>`, `Documentation <https://named-data.net/doc/NFD/0.3.1/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.3.1>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.3.1>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.3.1.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.3.1.tar.bz2.sha256>`__)
 
 * **NFD version 0.3.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.3.0>`, `Documentation <https://named-data.net/doc/NFD/0.3.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.3.0>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.3.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.3.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.3.0.tar.bz2.sha256>`__)
 
 * **NFD version 0.2.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.2.0>`, `Documentation <https://named-data.net/doc/NFD/0.2.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.2.0>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.2.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.2.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.2.0.tar.bz2.sha256>`__)
@@ -142,7 +142,7 @@
     `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.2.0-rc2>`__
 
 * **NFD version 0.1.0**
-  (:doc:`Release Notes <release-notes/release-notes-0.1.0>`, `Documentation <https://named-data.net/doc/NFD/0.1.0/>`__)
+  (:doc:`Release Notes <release-notes/release-notes-0.1.0>`)
 
   `src (git) <https://github.com/named-data/NFD/releases/tag/NFD-0.1.0>`__,
   `src (tarball) <https://named-data.net/downloads/nfd-0.1.0.tar.bz2>`__ (`checksum <https://named-data.net/downloads/nfd-0.1.0.tar.bz2.sha256>`__)