NFD+model+apps+helper+tests: Upgrade NFD and related changes
Based on NFD:commit:2fc649bfc67b93b4191cfbee5bcd70330bfb48f0 (version 0.3.4)
Change-Id: I89f5182600467171797af4f8f83e1edffe14ad95
Refs: #3125
diff --git a/docs/source/examples.rst b/docs/source/examples.rst
index 521b0e2..640625b 100644
--- a/docs/source/examples.rst
+++ b/docs/source/examples.rst
@@ -376,7 +376,7 @@
For every received interest, producer replies with a data packet, containing 1024 bytes of
virtual payload.
-In this scenario, we choose the broadcast strategy to be installed for the name prefix
+In this scenario, we choose the multicast strategy to be installed for the name prefix
"/prefix1" in all the nodes, while for the name prefix "/prefix2", the best-route strategy
will be installed in all the topology nodes.
@@ -396,7 +396,7 @@
---------------------------------------------------------------------
This scenario simulates a grid topology (using PointToPointGrid module). The first six nodes
-use the best route forwarding strategy, whereas the three remaining nodes use the broadcast
+use the best route forwarding strategy, whereas the three remaining nodes use the multicast
forwarding strategy.
Consumer requests data from producer with frequency 100 interests per second (interests