merge conflicts

Signed-off-by: Pablo Lezaeta Reyes <prflr88@gmail.com>

README.md

@@ -88,8 +88,9 @@ Read the PDF or info manual for more information.
 Installation on Microsoft™ Windows®
 -----------------------------------
 [¯\\\_(ツ)\_/¯](http://fc05.deviantart.net/fs71/i/2011/266/d/e/shrugpony_firefly_by_imaplode-d4aqtvx.png)
-Some users report that ponysay work in cygwing, therefor __maybe__ can work.
-Users has reported that ponysay can run in Windows 10 using the Linux layer built in but it don't display the ponyes correctly (or at all).
+Ponysay runs on Cygwin and GNU/NT (a.k.a. Ubuntu on Windows), 
+however the Windows's Bash on Ubuntu on Windows terminal does
+support xterm-256color colours.
 
 
 Dependencies

manuals/ponysay.texinfo

@@ -2607,12 +2607,15 @@ Mac OS X users can use the @code{ponysay} Homebrew
 @cindex Windows
 @cindex Cygwin
 Ponysay is also reported to be able to run on Windows 8 through Cygwin,
-provided that @code{python3} is installed. It will probabily also run one any
+provided that @code{python3} is installed. It will probably also run on any
 other version of Windows through Cygwin. Additionally among the preinstalled
 fonts in Windows 8; Consolas 10pt, and larger, can be used for almost perfect
 ponies (they may be just a little distorted on the height), however Consolas
 is only able print the ASCII based balloons.
 
+Ponysay also runs on Ubuntu on Windows, but the terminal's colour support
+leaves something to be desired.
+
 
 
 @node Uninstalling