*: Cleanup some documentation from quagga->frr

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

8 files changed, 12 insertions, 16 deletions

diff --git a/doc/user/babeld.rst b/doc/user/babeld.rst
index c8015bb7e5..2d9fef13c3 100644
--- a/doc/user/babeld.rst
+++ b/doc/user/babeld.rst
@@ -268,6 +268,6 @@ Babel sample configuration file
    ! babel hello-interval 12000
    ! babel update-interval 36000
 
-   ! log file /var/log/quagga/babeld.log
+   ! log file /var/log/frr/babeld.log
    log stdout
 
diff --git a/gdb/lib.txt b/gdb/lib.txt
index 60a004e1e1..913b455ed1 100644
--- a/gdb/lib.txt
+++ b/gdb/lib.txt
@@ -1,6 +1,6 @@
 # GDB macros for use with Quagga.
 #
-# Macros in this file are not daemon specific. E.g., OS or Quagga library
+# Macros in this file are not daemon specific. E.g., OS or FRR library
 # APIs.
 #
 # The macro file can be loaded with 'source <filename>'. They can then be
@@ -9,7 +9,7 @@
 #
 # E.g.:
 # 
-# (gdb) source ~paul/code/quagga/gdb/lib.txt
+# (gdb) source ~paul/code/frr/gdb/lib.txt
 # (gdb) break bgp_packet.c:613
 # Breakpoint 3 at 0x7fa883033a32: file bgp_packet.c, line 613.
 # (gdb) cont
diff --git a/lib/if.h b/lib/if.h
index 506c14ff59..1012bf5557 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -399,16 +399,12 @@ struct connected {
 	/*
 	   The ZEBRA_IFC_REAL flag should be set if and only if this address
 	   exists in the kernel and is actually usable. (A case where it exists
-	   but
-	   is not yet usable would be IPv6 with DAD)
+	   but is not yet usable would be IPv6 with DAD)
 	   The ZEBRA_IFC_CONFIGURED flag should be set if and only if this
-	   address
-	   was configured by the user from inside quagga.
+	   address was configured by the user from inside frr.
 	   The ZEBRA_IFC_QUEUED flag should be set if and only if the address
-	   exists
-	   in the kernel. It may and should be set although the address might
-	   not be
-	   usable yet. (compare with ZEBRA_IFC_REAL)
+	   exists in the kernel. It may and should be set although the
+	   address might not be usable yet. (compare with ZEBRA_IFC_REAL)
 	   The ZEBRA_IFC_DOWN flag is used to record that an address is
 	   present, but down/unavailable.
 	 */
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 1ebb14f2a0..ede0ad39e6 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -398,7 +398,7 @@ static int ospf_make_md5_digest(struct ospf_interface *oi,
 	/* We do this here so when we dup a packet, we don't have to
 	   waste CPU rewriting other headers.
 
-	   Note that quagga_time /deliberately/ is not used here */
+	   Note that frr_time /deliberately/ is not used here */
 	t = (time(NULL) & 0xFFFFFFFF);
 	if (t > oi->crypt_seqnum)
 		oi->crypt_seqnum = t;
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index a1ea4e45d7..7ec3db7894 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2090,7 +2090,7 @@ static struct ospf_neighbor *ospfNbrLookup(struct variable *v, oid *name,
 	return NULL;
 }
 
-/* map internal quagga neighbor states to official MIB values:
+/* map internal frr neighbor states to official MIB values:
 
 ospfNbrState OBJECT-TYPE
 	SYNTAX   INTEGER    {
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 1e1057dc39..dd0a49c9bc 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -192,7 +192,7 @@ void ospf_process_refresh_data(struct ospf *ospf, bool reset)
 		   hit
 		   asserts in ospf_refresher_unregister_lsa(). This step is
 		   needed
-		   because the current quagga code does look-up for
+		   because the current frr code does look-up for
 		   self-originated LSAs
 		   based on the self router-id alone but expects OSPF_LSA_SELF
 		   to be
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 2db3e6e904..5ff66f7c63 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -61,7 +61,7 @@ extern struct zebra_privs_t zserv_privs;
  * Alignment of zero-sized sockaddrs is nonsensical, but historically
  * BSD defines RT_ROUNDUP(0) to be the alignment interval (rather than
  * 0).  We follow this practice without questioning it, but it is a
- * bug if quagga calls ROUNDUP with 0.
+ * bug if frr calls ROUNDUP with 0.
  */
 #ifdef __APPLE__
 #define ROUNDUP_TYPE	int
diff --git a/zebra/main.c b/zebra/main.c
index 5694a442a2..e4363bd899 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -71,7 +71,7 @@ struct thread_master *master;
 /* Route retain mode flag. */
 int retain_mode = 0;
 
-/* Allow non-quagga entities to delete quagga routes */
+/* Allow non-frr entities to delete frr routes */
 int allow_delete = 0;
 
 int graceful_restart;