3 files changed, 52 insertions, 17 deletions
diff --git a/doc/user/basic.rst b/doc/user/basic.rst
index c7d722164a..f946c37a73 100644
--- a/doc/user/basic.rst
+++ b/doc/user/basic.rst
@@ -238,6 +238,17 @@ Basic Config Commands
 
    Set default motd string.
 
+.. index:: banner motd file FILE
+.. clicmd:: banner motd file FILE
+
+   Set motd string from file. The file must be in directory specified
+   under ``--sysconfdir``.
+
+.. index:: banner motd line LINE
+.. clicmd:: banner motd line LINE
+
+   Set motd string from an input.
+
 .. index:: no banner motd
 .. clicmd:: no banner motd
 
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index b916fcf413..4b3113cf3b 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -440,6 +440,9 @@ Route Flap Dampening
    The route-flap damping algorithm is compatible with :rfc:`2439`. The use of
    this command is not recommended nowadays.
 
+   At the moment, route-flap dampening is not working per VRF and is working only
+   for IPv4 unicast and multicast.
+
 .. seealso::
    https://www.ripe.net/publications/docs/ripe-378
 
@@ -836,11 +839,16 @@ Redistribution
 
    Redistribute OSPF route to BGP process.
 
-.. index:: redistribute vpn
-.. clicmd:: redistribute vpn
+.. index:: redistribute vnc
+.. clicmd:: redistribute vnc
 
    Redistribute VNC routes to BGP process.
 
+.. index:: redistribute vnc-direct
+.. clicmd:: redistribute vnc-direct
+
+   Redistribute VNC direct (not via zebra) routes to BGP process.
+
 .. index:: update-delay MAX-DELAY
 .. clicmd:: update-delay MAX-DELAY
 
@@ -1137,6 +1145,14 @@ Peer Filtering
    on reflected routes. This option allows the modifications to be reflected as
    well. Once enabled, it affects all reflected routes.
 
+.. index:: [no] neighbor PEER sender-as-path-loop-detection
+.. clicmd:: [no] neighbor PEER sender-as-path-loop-detection
+
+   Enable the detection of sender side AS path loops and filter the
+   bad routes before they are sent.
+
+   This setting is disabled by default.
+
 .. _bgp-peer-group:
 
 Peer Groups
diff --git a/doc/user/overview.rst b/doc/user/overview.rst
index 24d9ece93b..03d7299bf7 100644
--- a/doc/user/overview.rst
+++ b/doc/user/overview.rst
@@ -64,6 +64,21 @@ The ultimate goal of the FRR project is making a production-grade, high
 quality, featureful and free IP routing software suite.
 
 
+How to get FRR
+==============
+
+The official FRR website is located at |PACKAGE_URL| and contains further
+information, as well as links to additional resources.
+
+Several distributions provide packages for FRR. Check your distribution's
+repositories to find out if a suitable version is available.
+
+Up-to-date Debian packages are available at https://deb.frrouting.org/.
+
+For instructions on installing from source, refer to the
+`developer documentation <http://docs.frrouting.org/projects/dev-guide/en/latest/>`_.
+
+
 System Architecture
 ===================
 
@@ -242,13 +257,15 @@ The indicators have the following semantics:
 * :mark:`N` - daemon/feature not supported by operating system
 
 
-Known Kernel Issues:
-====================
+Known Kernel Issues
+-------------------
+
+- Linux < 4.11
 
-- Linux
-   v6 Route Replacement - Linux kernels before 4.11 can cause issues with v6 route deletion when you
-   have ecmp routes installed into the kernel.  This especially becomes apparent if the route is being
-   transformed from one ecmp path to another.
+  v6 Route Replacement - Linux kernels before 4.11 can cause issues with v6
+  route deletion when you have ECMP routes installed into the kernel. This
+  especially becomes apparent if the route is being transformed from one ECMP
+  path to another.
 
 .. _supported-rfcs:
 
@@ -348,15 +365,6 @@ FRR implements the following RFCs:
 - :rfc:`2741`
   :t:`Agent Extensibility (AgentX) Protocol. M. Daniele, B. Wijnen. January 2000.`
 
-How to get FRR
-==============
-
-The official FRR website is located at |PACKAGE_URL| and contains further
-information, as well as links to additional resources.
-
-Several distributions provide packages for FRR. Check your distribution's
-repositories to find out if a suitable version is available.
-
 Mailing Lists
 =============