aboutsummaryrefslogtreecommitdiff
path: root/manuals/ponysay.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-09-17 19:24:05 +0200
committerMattias Andrée <maandree@operamail.com>2012-09-17 19:24:05 +0200
commit140d04b2ca532de5447d64747210f9eb496d6b2e (patch)
tree058605b875aa86a8cdc30d6035dcb7391f1e1757 /manuals/ponysay.texinfo
parent3008d6509b61bd0a26af61b0c7e94a06a49bdd94 (diff)
parent9f9298d76c441d9dd18eeb9794d6a25058bf477e (diff)
downloadponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.gz
ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.tar.bz2
ponysay-140d04b2ca532de5447d64747210f9eb496d6b2e.zip
conflict resolve + typo + m
Diffstat (limited to 'manuals/ponysay.texinfo')
-rw-r--r--manuals/ponysay.texinfo22
1 files changed, 13 insertions, 9 deletions
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index 50ac128..6b93bf3 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1160,7 +1160,7 @@ before building and installing.
@menu
* Arch Linux:: Packages for Arch Linux.
-* Chakra GNU/Linux:: Packages for Chakra GNU/Linux.
+* Chakra:: Packages for Chakra.
* Gentoo Linux:: Packages for Gentoo Linux.
* Debian GNU/Linux:: Packages for Debian GNU/Linux and Ubuntu.
@end menu
@@ -1175,12 +1175,12 @@ The official Arch Linux package repositories contains @command{ponysay} as
bleeding edge git version of @command{ponysay} as @code{ponysay-git}.
-@node Chakra Linux
-@subsection Chakra GNU/Linux
-@cindex chakra gnu/linux
+@node Chakra
+@subsection Chakra
+@cindex chakra
-Chakra users can install from (CCR) a stable version named a @code{ponysay}
-optionaly a git verion of ponysay is available as @code{ponysay-git}.
+Chakra users can install from (CCR) a stable version named a @code{ponysay},
+additionally a git verion of ponysay is available as @code{ponysay-git}.
@node Gentoo Linux
@@ -1836,11 +1836,15 @@ New ponies: @file{basil}, @file{cloudkicker}, @file{derpysad}, @file{flowertrio}
@file{turf}, @file{waltercoltchak}
@item
New extraponies: @file{blueballblitz} (Varous fanfics, Shadowbolt), @file{drhooves1},
-@file{drhooves2}, @file{drhooves3}, @file{drhooves4}, @file{drhooves5},
-@file{drhooves6}, @file{drhooves7}, @file{drhooves8}, @file{drhooves9}, @file{drhooves10},
-@file{drhooves11}, @file{pinkaminacupcake} (Fanfic)
+@file{drhooves2}, @file{drhooves3}, @file{drhooves4}, @file{drhooves5}, @file{drhooves6},
+@file{drhooves7}, @file{drhooves8}, @file{drhooves9}, @file{drhooves10}, @file{drhooves11},
+@file{nyx} (Fanfic: Past Sins), @file{nyxdisguised} (Fanfic: Past Sins),
+@file{pinkaminacupcake} (Fanfic)
+@item
+@file{cracky} is renamed to @file{crackle}.
@end itemize
+
@heading Version 2.6
@itemize @bullet