aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-09-29 22:38:14 +0200
committerMattias Andrée <maandree@operamail.com>2012-09-29 22:38:14 +0200
commit553f8fb3fcff2e8f4ca8f5941ab25d42d09f6697 (patch)
tree0936d50fcb314400d5105bb3b2808d19e28f1436
parent0870e32f2de77dfc398f0999e2789fd0612a5050 (diff)
downloadponysay-553f8fb3fcff2e8f4ca8f5941ab25d42d09f6697.tar.gz
ponysay-553f8fb3fcff2e8f4ca8f5941ab25d42d09f6697.tar.bz2
ponysay-553f8fb3fcff2e8f4ca8f5941ab25d42d09f6697.zip
Kerberos is [for some reason] spelled [and pronounced] Cerberus in English
-rw-r--r--CHANGELOG4
-rw-r--r--manuals/ponysay.texinfo2
-rw-r--r--ponies/cerberus.pony (renamed from ponies/kerberos.pony)0
-rw-r--r--ponyquotes/ponies2
-rw-r--r--ttyponies/cerberus.pony (renamed from ttyponies/kerberos.pony)0
5 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2c8d64d..cd470d6 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 0b22a1b..2bf0b72 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
index 793d2c0..793d2c0 100644
--- a/ponies/kerberos.pony
+++ b/ponies/cerberus.pony
diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 90a7a3e..998e355 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
index 956c109..956c109 100644
--- a/ttyponies/kerberos.pony
+++ b/ttyponies/cerberus.pony