Merge remote branch 'origin/master'
diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index a05ea6c..64c6810 100644
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -78,7 +78,7 @@
 	  c = com->size -i -1;
 
 	  if (c > 0)
-	    memcpy (com->val + i, com->val + (i + 1), c * sizeof (val));
+	    memcpy (com->val + i, com->val + (i + 1), c * sizeof (*val));
 
 	  com->size--;
 
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 27c3cd6..6b221e2 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -97,7 +97,7 @@
 
 /* This function takes pointer to Extended Communites strucutre then
    create a new Extended Communities structure by uniq and sort each
-   Exteneded Communities value.  */
+   Extended Communities value.  */
 static struct ecommunity *
 ecommunity_uniq_sort (struct ecommunity *ecom)
 {
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 2d4a863..bb9014f 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3321,7 +3321,7 @@
        "set extcommunity rt .ASN:nn_or_IP-address:nn",
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
+       "Route Target extended community\n"
        "VPN extended community\n")
 {
   int ret;
@@ -3340,7 +3340,7 @@
        NO_STR
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n")
+       "Route Target extended community\n")
 {
   return bgp_route_set_delete (vty, vty->index, "extcommunity rt", NULL);
 }
@@ -3351,7 +3351,7 @@
        NO_STR
        SET_STR
        "BGP extended community attribute\n"
-       "Route Target extened communityt\n"
+       "Route Target extended community\n"
        "VPN extended community\n")
 
 DEFUN (set_ecommunity_soo,
diff --git a/doc/bgpd.8 b/doc/bgpd.8
index 658fe0a..8daaefa 100644
--- a/doc/bgpd.8
+++ b/doc/bgpd.8
@@ -116,6 +116,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospf6d.8 b/doc/ospf6d.8
index 44c4fe9..0643226 100644
--- a/doc/ospf6d.8
+++ b/doc/ospf6d.8
@@ -106,6 +106,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospfd.8 b/doc/ospfd.8
index 0614408..63f8c69 100644
--- a/doc/ospfd.8
+++ b/doc/ospfd.8
@@ -111,6 +111,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ripd.8 b/doc/ripd.8
index 12e01a9..8fa9bf2 100644
--- a/doc/ripd.8
+++ b/doc/ripd.8
@@ -109,5 +109,5 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
diff --git a/doc/ripngd.8 b/doc/ripngd.8
index 2ec5563..d9d8201 100644
--- a/doc/ripngd.8
+++ b/doc/ripngd.8
@@ -112,6 +112,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/vtysh.1 b/doc/vtysh.1
index eb960cd..de4913e 100644
--- a/doc/vtysh.1
+++ b/doc/vtysh.1
@@ -95,6 +95,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.
 
diff --git a/doc/zebra.8 b/doc/zebra.8
index 558e27b..38ccf1a 100644
--- a/doc/zebra.8
+++ b/doc/zebra.8
@@ -131,6 +131,6 @@
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.org
+.BI http://www.quagga.net
 or the Info file for an accurate list of authors.