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