Merge branch 'master' into develop

3 files changed, 42 insertions, 2 deletions

diff --git a/manuals/manpage.0 b/manuals/manpage.0
index e59a9af..229ad10 100644
--- a/manuals/manpage.0
+++ b/manuals/manpage.0
@@ -81,6 +81,14 @@ the pony will be selected randomly from that set of ponies.
 .TP
 .B \-W, \-\-wrap \fIcolumn\fP
 The screen column where the message should be wrapped.
+.TP
+.B \-A, \-\-all \fIcolumn\fP
+Show all ponies, MLP-FiM and non-MLP-FiM, in this case the first list are MLP:FiM
+and the second are non-MLP-FiM.
+.TP
+.B \+A, \+\+all \fIcolumn\fP
+Show both ponies names, including alternatives, these from MLP:FiM and non-MLP:FiM
+the first list are the MLP:FiM and the second one are non-MLP:FiM.
 .SH ENVIRONMENT
 .TP
 .B PONYSAY_BOTTOM
@@ -131,4 +139,4 @@ Mattias Andrée <maandree@kth.se> for the official ponysay release.
 .PP
 This program is licensed under WTFPL.
 .\" See file COPYING to see the license.
-    
\ No newline at end of file
+    
diff --git a/manuals/manpage.es.0 b/manuals/manpage.es.0
index 2e22a28..f4156ee 100644
--- a/manuals/manpage.es.0
+++ b/manuals/manpage.es.0
@@ -83,6 +83,15 @@ aleatoriamente uno de este conjunto.
 .TP
 .B \-W, \-\-wrap \fIcolumna\fP
 El numero de columnas en el que será impreso el mensaje.
+.TP
+.B \-A. \-\-all \fIcolumn\fP
+Muestra todos los ponis, tanto pertenecientes a MLP:FiM cono no pertenecientes a esta
+la primera lista son los pertenecientes a esta y la subsiguente los no pertenecientes.
+.TP
+.B \+A, \+\+all \fIcolumn\fP
+Muestra todos los ponies incluyendo sus nombres alternativos, estos pertenecientes a
+MLP:FiM cono no pertenecientes, la primera lista seran los pertenecientes y la
+subsiguente los no pertenecientes.
 .SH ENTORNO
 .TP
 .B PONYSAY_BOTTOM
@@ -105,6 +114,7 @@ no desea que la salida sea truncada para que calce en la terminal.
 Exporte \fIPONYSAY_TRUNCATE_HEIGHT\fP con el valor \fIyes\fP, \fIy\fP o \fI1\fP, si
 desea truncar la salida en el largo aun si no se está dentro de una terminal \fIponysay\fP bajo
 TTY.
+.TP
 .B PONYSAY_UCS_ME
 Exportar \fIPONYSAY_UCS_ME\fP con el valor \fIyes\fP, \fIy\fP o \fI1\fP,
 Si es que busca 'simular enlaces simbólicos' a ponis usando 'Universal Character Set' (Set de
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index bbae2a9..b9379dd 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -264,6 +264,22 @@ Just as @option{-L}, except it lists extra (non-MLP:FiM) ponies instead of stand
 @opindex @option{--bubblelist}
 @opindex @option{--balloonlist}
 Prints a list of all balloon styles.
+
+@item -A
+@itemx --balloonlist
+@opindex @option{-A}
+@opindex @option{--all}
+@opindex @option{--all}
+Show all ponies, MLP-FiM and non-MLP-FiM, in this case the first list are MLP:FiM
+and the second are non-MLP-FiM.
+
+@item +A
+@itemx --balloonlist
+@opindex @option{+A}
+@opindex @option{++all}
+@opindex @option{++all}
+Show both ponies names, including alternatives, these from MLP:FiM and non-MLP:FiM
+the first list are the MLP:FiM and the second one are non-MLP:FiM.
 @end table
 
 @opindex @var{message}
@@ -1848,10 +1864,16 @@ sequences.
 @cindex versions
 @cindex previous releases
 
-
 @heading Version 2.8
 @itemize @bullet
 @item
+New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{sunnyrays}
+@item
+Pony symlink added:
+@itemize @bullet
+@item @file{georgewashingtony} @arrow{} @file{bastionyorsets}
+@end itemize
+@item
 Support for explicit hypthenation using soft hyphens had been added to the word wrapper.
 @item
 Support for explicit non-word wrapping using non-breaking space had been added to the word wrapper.