aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-10-10 20:37:43 +0200
committerMattias Andrée <maandree@operamail.com>2012-10-10 20:37:43 +0200
commit1cecddcc948927f3b3b7ea22816d572753d1acf4 (patch)
tree81a37a1d1e0152d1623d09f135aa22608af276bd
parentd6f317b5a5196b65128ffb8c1a4463ccb40db9d8 (diff)
downloadponysay-1cecddcc948927f3b3b7ea22816d572753d1acf4.tar.gz
ponysay-1cecddcc948927f3b3b7ea22816d572753d1acf4.tar.bz2
ponysay-1cecddcc948927f3b3b7ea22816d572753d1acf4.zip
shiningarmor{weding ==> wedding}
-rw-r--r--CHANGELOG2
-rw-r--r--manuals/ponysay.texinfo2
-rw-r--r--ponies/shiningarmorwedding.pony (renamed from ponies/shiningarmorweding.pony)0
-rw-r--r--ponyquotes/ponies2
-rw-r--r--ttyponies/shiningarmorwedding.pony (renamed from ttyponies/shiningarmorweding.pony)0
5 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fb2a24d..2b42c0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
Version 2.8
- New ponies: airheart, bastionyorsets, peppermoon, shiningarmorweding, starlight,
+ New ponies: airheart, bastionyorsets, peppermoon, shiningarmorwedding, starlight,
sunnyrays, tenderheart, tomtherock
Pony symlink added: georgewachingtony → bastionyorsets
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 9913a21..d34b503 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1867,7 +1867,7 @@ sequences.
@heading Version 2.8
@itemize @bullet
@item
-New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{shinngarmorwedingi},
+New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{shiningarmorwedding},
@file{starlight}, @file{sunnyrays}, @file{tenderheart}, @file{tomtherock}
@item
Pony symlink added:
diff --git a/ponies/shiningarmorweding.pony b/ponies/shiningarmorwedding.pony
index 1492a99..1492a99 100644
--- a/ponies/shiningarmorweding.pony
+++ b/ponies/shiningarmorwedding.pony
diff --git a/ponyquotes/ponies b/ponyquotes/ponies
index 59e94c1..151a194 100644
--- a/ponyquotes/ponies
+++ b/ponyquotes/ponies
@@ -149,7 +149,7 @@ screwball
screwloose
seaswirl
shadowbolts
-shiningarmor+shiningarmorguard
+shiningarmor+shiningarmorguard+shiningarmorwedding
silverspeed
silverspoon
silverstar
diff --git a/ttyponies/shiningarmorweding.pony b/ttyponies/shiningarmorwedding.pony
index c739130..c739130 100644
--- a/ttyponies/shiningarmorweding.pony
+++ b/ttyponies/shiningarmorwedding.pony