diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index a444822757..6504e7d206 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -604,9 +604,8 @@ Defining Peer
 .. index:: neighbor PEER remote-as ASN
 .. clicmd:: neighbor PEER remote-as ASN
 
-
    Creates a new neighbor whose remote-as is ASN. PEER can be an IPv4 address
-   or an IPv6 address.::
+   or an IPv6 address or an interface to use for the connection.::
 
       router bgp 1
        neighbor 10.0.0.1 remote-as 2
@@ -618,6 +617,19 @@ Defining Peer
 
       can't find neighbor 10.0.0.1
 
+.. index:: neighbor PEER remote-as internal
+.. clicmd:: neighbor PEER remote-as internal
+
+   Create a peer as you would when you specify an ASN, except that if the
+   peers ASN is different than mine as specified under the :clicmd:`router bgp ASN`
+   command the connection will be denied.
+
+.. index:: neighbor PEER remote-as external
+.. clicmd:: neighbor PEER remote-as external
+
+   Create a peer as you would when you specify an ASN, except that if the
+   peers ASN is the same as mine as specified under the :clicmd:`router bgp ASN`
+   command the connection will be denied.
 
 .. _bgp-peer-commands:
 
@@ -2076,19 +2088,9 @@ How to set up a 6-Bone connection
 
 ::
 
-   zebra configuration
-   ===================
-   !
-   ! Actually there is no need to configure zebra
-   !
-
    bgpd configuration
    ==================
    !
-   ! This means that routes go through zebra and into the kernel.
-   !
-   router zebra
-   !
    ! MP-BGP configuration
    !
    router bgp 7675
@@ -2112,8 +2114,6 @@ How to set up a 6-Bone connection
     set ipv6 nexthop global 3ffe:1cfa:0:2:2c0:4fff:fe68:a225
     set ipv6 nexthop local fe80::2c0:4fff:fe68:a225
    !
-   ! logfile FILENAME is obsolete. Please use log file FILENAME
-
    log file bgpd.log
    !
 
diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst
index acf63a6122..3e88dee905 100644
--- a/doc/user/routemap.rst
+++ b/doc/user/routemap.rst
@@ -198,7 +198,42 @@ Route Map Set Command
 .. index:: set ip next-hop IPV4_ADDRESS
 .. clicmd:: set ip next-hop IPV4_ADDRESS
 
-   Set the BGP nexthop address.
+   Set the BGP nexthop address to the specified IPV4_ADDRESS.  For both
+   incoming and outgoing route-maps.
+
+.. index:: set ip next-hop peer-address
+.. clicmd:: set ip next-hop peer-address
+
+   Set the BGP nexthop address to the address of the peer.  For an incoming
+   route-map this means the ip address of our peer is used.  For an outgoing
+   route-map this means the ip address of our self is used to establish the
+   peering with our neighbor.
+
+.. index:: set ip next-hop unchanged
+.. clicmd:: set ip next-hop unchanged
+
+   Set the route-map as unchanged.  Pass the route-map through without
+   changing it's value.
+
+.. index:: set ipv6 next-hop peer-address
+.. clicmd:: set ipv6 next-hop peer-address
+
+   Set the BGP nexthop address to the address of the peer.  For an incoming
+   route-map this means the ipv6 address of our peer is used.  For an outgoing
+   route-map this means the ip address of our self is used to establish the
+   peering with our neighbor.
+
+.. index:: set ipv6 next-hop prefer-global
+.. clicmd:: set ipv6 next-hop prefer-global
+
+   For Incoming and Import Route-maps if we receive a v6 global and v6 LL
+   address for the route, then prefer to use the global address as the nexthop.
+
+.. index:: set ipv6 next-hop global IPV6_ADDRESS
+.. clicmd:: set ipv6 next-hop global IPV6_ADDRESS
+
+   Set the next-hop to the specified IPV6_ADDRESS.  For both incoming and
+   outgoing route-maps.
 
 .. index:: set local-preference LOCAL_PREF
 .. clicmd:: set local-preference LOCAL_PREF