From b5299ebcd3bba0b6fb24435aa78facaa4bcf4ad2 Mon Sep 17 00:00:00 2001
From: Jonathan Lassoff <jof@thejof.com>
Date: Tue, 30 Jan 2024 01:32:24 -0800
Subject: [PATCH] Update neighbor spelling

---
 etc/alice-lg/alice.example.conf              | 18 +++++++++---------
 pkg/sources/birdwatcher/source_multitable.go |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/alice-lg/alice.example.conf b/etc/alice-lg/alice.example.conf
index c63aebb..2c335ba 100644
--- a/etc/alice-lg/alice.example.conf
+++ b/etc/alice-lg/alice.example.conf
@@ -116,7 +116,7 @@ invalid     = 23042:1000:4-*
 0:* = do not redistribute to AS$1
 
 #
-# Define columns for neighbours and routes table,
+# Define columns for neighbors and routes table,
 # with <key> = <Table Header>
 #
 # and <key> := <object.path> Implicitly referencing the object,
@@ -124,19 +124,19 @@ invalid     = 23042:1000:4-*
 #           |= <Widget>      A widget with special rendering features,
 #                            to which the object is applied. E.g.
 #                            Uptime, which will be rendered as
-#                            Uptime(neighbour).
+#                            Uptime(neighbor).
 #
 # As per convention: Widgets are in Uppercase, object properties are
 # in lowercase.
 #
-# Available Widgets for Neighbours:
+# Available Widgets for Neighbors:
 #
-# Uptime        Displays the relative uptime of this neighbour
-# Description   The neighbour's description with link to routes page
+# Uptime        Displays the relative uptime of this neighbor
+# Description   The neighbor's description with link to routes page
 #
 
-[neighbours_columns]
-address = Neighbour
+[neighbors_columns]
+address = Neighbor
 asn = ASN
 state = State
 Uptime = Uptime
@@ -159,8 +159,8 @@ bgp.as_path = AS Path
 flags = 
 network = Network
 gateway = Gateway
-neighbour.asn = ASN
-neighbour.description = Description
+neighbor.asn = ASN
+neighbor.description = Description
 bgp.as_path = AS Path
 routeserver.name = RS
 
diff --git a/pkg/sources/birdwatcher/source_multitable.go b/pkg/sources/birdwatcher/source_multitable.go
index 53f9d08..a8c0b24 100644
--- a/pkg/sources/birdwatcher/source_multitable.go
+++ b/pkg/sources/birdwatcher/source_multitable.go
@@ -534,18 +534,18 @@ func (src *MultiTableBirdwatcher) NeighborsSummary(
 // from the birdwatcher backend.
 func (src *MultiTableBirdwatcher) Routes(
 	ctx context.Context,
-	neighbourID string,
+	neighborID string,
 ) (*api.RoutesResponse, error) {
 	response := &api.RoutesResponse{}
 	// Fetch required routes first (received and filtered)
 	// However: Store in separate cache for faster access
-	required, err := src.fetchRequiredRoutes(ctx, neighbourID)
+	required, err := src.fetchRequiredRoutes(ctx, neighborID)
 	if err != nil {
 		return nil, err
 	}
 
 	// Optional: NoExport
-	_, notExported, err := src.fetchNotExportedRoutes(ctx, neighbourID)
+	_, notExported, err := src.fetchNotExportedRoutes(ctx, neighborID)
 	if err != nil {
 		return nil, err
 	}