build: recommend boost >= 1.65.1
With this commit, Ubuntu 16.04 is no longer officially supported
and may require manual installation of a newer version of Boost.
Refs: #5087
Change-Id: I17197f72ee8f7cd4d0954658fe57c324076f1311
diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index 5272847..9de5b90 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -7,7 +7,6 @@
ndn-cxx is built against a continuous integration system and has been tested on the
following platforms:
-- Ubuntu 16.04 (amd64)
- Ubuntu 18.04 (amd64, armhf, i386)
- Ubuntu 19.10 (amd64)
- macOS 10.13
@@ -18,10 +17,10 @@
ndn-cxx is known to work on the following platforms, although they are not officially
supported:
-- Debian >= 9
+- Debian 10 (Buster)
- Fedora >= 29
- Gentoo Linux
-- Raspbian >= 2017-08-16
+- Raspbian >= 2019-06-20 (Buster)
- FreeBSD >= 11.3
Prerequisites
@@ -31,9 +30,9 @@
~~~~~~~~
- GCC >= 5.3 or clang >= 3.6
-- Python >= 3.5
+- Python >= 3.6
- pkg-config
-- Boost >= 1.58
+- Boost >= 1.65.1
- OpenSSL >= 1.0.2
- SQLite 3.x
diff --git a/docs/examples.rst b/docs/examples.rst
index 729a6c5..33657da 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -18,8 +18,7 @@
.. literalinclude:: ../examples/consumer.cpp
:language: c++
:linenos:
- :emphasize-lines: 24-27,39,43-47,51,58,75
-
+ :emphasize-lines: 39-45,48,59,65,71
Trivial producer
----------------
@@ -42,8 +41,7 @@
.. literalinclude:: ../examples/producer.cpp
:language: c++
:linenos:
- :emphasize-lines: 42,55-58,61,64,67,70,76
-
+ :emphasize-lines: 41,50,57-59,62,70,74
Consumer that uses Scheduler
----------------------------
@@ -52,19 +50,18 @@
events for execution at specific points of time.
The library internally uses `boost::asio::io_service
-<https://www.boost.org/doc/libs/1_58_0/doc/html/boost_asio/reference/io_service.html>`_ to
+<https://www.boost.org/doc/libs/1_65_1/doc/html/boost_asio/reference/io_service.html>`_ to
implement fully asynchronous NDN operations (i.e., sending and receiving Interests and
Data). In addition to network-related operations, ``boost::asio::io_service`` can be used
to execute any arbitrary callback within the processing thread (run either explicitly via
-``io.run`` or implicitly via :ndn-cxx:`Face::processEvents` as in previous examples).
-:ndn-cxx:`Scheduler` is just a wrapper on top of ``boost::asio::io_service``,
-allowing simple interface to schedule tasks at specific times.
+``io_service::run()`` or implicitly via :ndn-cxx:`Face::processEvents` as in previous
+examples). :ndn-cxx:`Scheduler` is just a wrapper on top of ``io_service``, providing a
+simple interface to schedule tasks at specific times.
The highlighted lines in the example demonstrate all that is needed to express a second
-Interest approximately 2 seconds after the first one.
+Interest approximately 3 seconds after the first one.
.. literalinclude:: ../examples/consumer-with-timer.cpp
:language: c++
:linenos:
- :emphasize-lines: 39-40,51-55,59-60,62-63,108-109
-
+ :emphasize-lines: 39-40,56,62,93,106,114-116
diff --git a/docs/tutorials/utils-ndn-regex.rst b/docs/tutorials/utils-ndn-regex.rst
index af107c0..52026ae 100644
--- a/docs/tutorials/utils-ndn-regex.rst
+++ b/docs/tutorials/utils-ndn-regex.rst
@@ -5,8 +5,8 @@
performed at two levels: the name level and the name component level.
A name component matcher, enclosed in ``<`` and ``>``, specifies the pattern of a name component. The
-component pattern is expressed with the `Perl Regular Expression Syntax
-<https://www.boost.org/doc/libs/1_58_0/libs/regex/doc/html/boost_regex/syntax/perl_syntax.html>`__.
+component pattern is expressed using the `Modified ECMAScript Regular Expression Syntax
+<https://en.cppreference.com/w/cpp/regex/ecmascript>`_.
For example, ``<ab*c>`` matches the 1st, 3rd, and 4th components of ``/ac/dc/abc/abbc``, but does
not match the 2nd component. A special case is that ``<>`` denotes a wildcard matcher that can match
**ANY** name component.