diff options
| author | Mattias Andrée <maandree@operamail.com> | 2012-10-04 04:49:50 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2012-10-04 04:49:50 +0200 |
| commit | 01ca2593fec8fbeb39feeb72529544fa3d35b55b (patch) | |
| tree | 9f7e5420ecc5d58f92658a2a3624a88e7e373ac1 /manuals/ponysay.texinfo | |
| parent | c05c81382f956fb80f6d6bede5f312cb15627aa2 (diff) | |
| parent | e6bdf2e5ba92b4f01178a1d1bd1d601da38375da (diff) | |
| download | ponysay-01ca2593fec8fbeb39feeb72529544fa3d35b55b.tar.gz ponysay-01ca2593fec8fbeb39feeb72529544fa3d35b55b.tar.bz2 ponysay-01ca2593fec8fbeb39feeb72529544fa3d35b55b.zip | |
conflict resolve
Diffstat (limited to 'manuals/ponysay.texinfo')
| -rw-r--r-- | manuals/ponysay.texinfo | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo index fb27bad..b9379dd 100644 --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -1873,8 +1873,15 @@ 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. +@item +The word wrapper colours the inserted hyphens in red. @end itemize + @heading Version 2.7 @itemize @bullet @item |