From 700d5d364c8249b3d714ba978b8b41c42b5448b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Sun, 20 Jan 2013 01:20:44 +0100 Subject: [PATCH] on royality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- manuals/ponysay.texinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index 223b6163..c1aa3c87 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -937,7 +937,8 @@ Wildlife, for example timberwolfs A pony's pet, Spike does not count because Twilight does not play with him during pony–pet play dates. @item @code{royal} -Royal pony, either by birth or conquer (i.e. the old school style). +Royal pony, either by birth, marriage, or conquer (i.e. the old school style). +Shining Armour is royal by marriage, but is biological family does become royal by this. @item @code{villain} Villains, normally minions to antagonists or recurring ponies. Applies to changelings. @item @code{antagonist} (applies to: nightmare moon, gilda, discord, chrysalis)