From 553f8fb3fcff2e8f4ca8f5941ab25d42d09f6697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com>
Date: Sat, 29 Sep 2012 22:38:14 +0200
Subject: [PATCH] Kerberos is [for some reason] spelled [and pronounced]
 Cerberus in English

---
 CHANGELOG                                  | 4 ++--
 manuals/ponysay.texinfo                    | 2 +-
 ponies/{kerberos.pony => cerberus.pony}    | 0
 ponyquotes/ponies                          | 2 +-
 ttyponies/{kerberos.pony => cerberus.pony} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename ponies/{kerberos.pony => cerberus.pony} (100%)
 rename ttyponies/{kerberos.pony => cerberus.pony} (100%)

diff --git a/CHANGELOG b/CHANGELOG
index 2c8d64d15..cd470d621 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,8 @@
 Version 2.7
 
 	New ponies: basil, cloudkicker, cow, derpysad, flowertrio, frederickhorseshoepin, horsemd,
-	            jeffletroski, jesuspezuna, joe, joetuxedo, kerberos, manticore, meadowsong,
-	            meliot, pinkiegummydisguise, seaswirl, theodoredonaldkerabatsos, turf, 
+	            jeffletroski, jesuspezuna, joe, joetuxedo, cerberus, manticore, meadowsong,
+	            meliot, pinkiegummydisguise, seaswirl, theodoredonaldkerabatsos, turf,
 	            waltercoltchak
 
 	New extraponies: blueballblitz (Various fanfics, Shadowbolt), drhooves1, drhooves2, drhooves3,
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 0b22a1b5f..2bf0b720d 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1847,7 +1847,7 @@ sequences.
 @item
 New ponies: @file{basil}, @file{cloudkicker}, @file{cow}, @file{derpysad},
 @file{flowertrio}, @file{frederickhorseshoepin}, @file{horsemd}, @file{jeffletroski},
-@file{jesuspezuna}, @file{joe}, @file{joetuxedo}, @file{kerberos}, @file{manticore}, 
+@file{jesuspezuna}, @file{joe}, @file{joetuxedo}, @file{cerberus}, @file{manticore}, 
 @file{meadownsong}, @file{meliot}, @file{pinkiegummydisguise}, @file{seaswirl},
 @file{theodoredonaldkerabatsos}, @file{turf}, @file{waltercoltchak}
 @item
diff --git a/ponies/kerberos.pony b/ponies/cerberus.pony
similarity index 100%
rename from ponies/kerberos.pony
rename to ponies/cerberus.pony
diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 90a7a3e87..998e355a8 100644
--- a/ponyquotes/ponies
+++ b/ponyquotes/ponies
@@ -30,6 +30,7 @@ carrot+carrottop+goldenharvest
 celestia+fillistia+fillycelestia+celestiasmall
 changeling
 cheerilee+cheerilee80
+cerberus
 cherryberry
 cherrycola
 chrysalis+changelingqueen
@@ -81,7 +82,6 @@ jeffletroski
 jesuspezuna
 joe+joetuxedo
 junebug
-kerberos
 laflour
 lemonhearts
 lightning
diff --git a/ttyponies/kerberos.pony b/ttyponies/cerberus.pony
similarity index 100%
rename from ttyponies/kerberos.pony
rename to ttyponies/cerberus.pony