resolve merge conflict

Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-06-01 14:54:49 +02:00
commit 7e3aa7ee91
3 changed files with 83 additions and 82 deletions

View file

@ -4,82 +4,82 @@
<head> <head>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="screen.css" media="screen"/> <link rel="stylesheet" type="text/css" href="screen.css" media="screen"/>
<title>ponysay</title> <title>ponysay</title>
</head> </head>
<body> <body>
<div class="header"> <div class="header">
<table class="header" valign="middle"> <table class="header" valign="middle">
<tr> <tr>
<td class="title">ponysay</td> <td class="title">ponysay</td>
<td class="headspace"></td><td><a target="page" href="./pages/index.html">intro</a></td> <td class="headspace"></td><td><a target="page" href="./pages/index.html">Introduction</a></td>
<td class="headspace"></td><td><a target="page" href="./pages/ponysay/index.html">manual</a></td> <td class="headspace"></td><td><a target="page" href="./pages/ponysay/index.html">Manual</a></td>
<td class="headspace"></td><td><a target="page" href="./pages/ponysay/Ponysay-license.html#Ponysay-license">license</a></td> <td class="headspace"></td><td><a target="page" href="./pages/ponysay/Ponysay-license.html#Ponysay-license">Licence</a></td>
<td class="headspace"></td><td><a target="page" href="./pages/ponysay/Ponysay-contributors.html#Ponysay-contributors">contributors</a></td> <td class="headspace"></td><td><a target="page" href="./pages/ponysay/Ponysay-contributors.html#Ponysay-contributors">Contributors</a></td>
<td class="headspace"></td><td><a target="page" href="./pages/ponysay/Change-log.html#Change-log">change log</a></td> <td class="headspace"></td><td><a target="page" href="./pages/ponysay/Change-log.html#Change-log">Change Log</a></td>
<td class="headspace"></td><td><a href="http://www.github.com/erkin/ponysay">github repository↗</a></td> <td class="headspace"></td><td><a href="http://www.github.com/erkin/ponysay">GitHub Repository↗</a></td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="main"> <div class="main">
<table class="main"> <table class="main">
<col id="left"/> <col id="left"/>
<col id="right"/> <col id="right"/>
<tr> <tr>
<td valign="top"> <td valign="top">
<table> <table>
<cols class="image"/> <cols class="image"/>
<cols class="sep"/> <cols class="sep"/>
<cols/> <cols/>
<tr> <tr>
<td><img alt="ponysay example" src="bonbonlyra.png"/></td> <td><img alt="ponysay example" src="bonbonlyra.png"/></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<br/> <br/>
<table class="fill"> <table class="fill">
<tr> <tr>
<td class="fill"></td> <td class="fill"></td>
<td> <td>
<i>recommended reading:</i><br/> <i>recommended reading:</i><br/>
<a target="page" href="./pages/ponysay/Installing.html">Installing</a><br/> <a target="page" href="./pages/ponysay/Installing.html">Installing</a><br/>
<a target="page" href="./pages/ponysay/Invoking-ponysay.html">Basic usage</a><br/> <a target="page" href="./pages/ponysay/Invoking-ponysay.html">Basic usage</a><br/>
<a target="page" href="./pages/ponysay/Advanced-usage.html">Advanced usage</a><br/> <a target="page" href="./pages/ponysay/Advanced-usage.html">Advanced usage</a><br/>
<a target="page" href="./pages/ponysay/Environment-variables.html">Configurations</a><br/> <a target="page" href="./pages/ponysay/Environment-variables.html">Configurations</a><br/>
<br/> <br/>
<i>external links:</i><br/> <i>external links:</i><br/>
<a target="page" href="./pages/fortune+ponysay.html">ponysay fortunes</a><br/> <a target="page" href="./pages/fortune+ponysay.html">ponysay fortunes</a><br/>
<br/> <br/>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td></td> <td></td>
</tr> </tr>
</table> </table>
</td> </td>
<td valign="top"> <td valign="top">
<div id="text"><iframe id="page" name="page" src="./pages/index.html"></iframe></div> <div id="text"><iframe id="page" name="page" src="./pages/index.html"></iframe></div>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</body> </body>
</html> </html>

View file

@ -4,17 +4,17 @@
<head> <head>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="../screen.css" media="screen"/> <link rel="stylesheet" type="text/css" href="../screen.css" media="screen"/>
<title>ponysay</title> <title>ponysay</title>
</head> </head>
<body> <body>
<br/> <br/>
On reddit there is an entry for posting screenshots for fun messages<br/> On reddit there is an entry for posting screenshots for fun messages<br/>
you get with when running <code>fortune | ponysay</code>, naturally you<br/> you get with upon running <code>fortune | ponysay</code>. Naturally you<br/>
should <a href="http://www.github.com/maandree/ponypipe">ponify your messages</a>.<br/> should <a href="http://www.github.com/maandree/ponypipe">ponify your messages</a>.<br/>
<br/> <br/>
Upload your results <a href="http://www.reddit.com/r/mylittlelinux/comments/tzj1f/unofficial_official_fortune_ponysay_thread/">[here]</a>. Upload your results <a href="http://www.reddit.com/r/mylittlelinux/comments/tzj1f/unofficial_official_fortune_ponysay_thread/">here</a>!
</body> </body>
</html> </html>

View file

@ -4,31 +4,32 @@
<head> <head>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="../screen.css" media="screen"/> <link rel="stylesheet" type="text/css" href="../screen.css" media="screen"/>
<title>ponysay</title> <title>ponysay</title>
</head> </head>
<body> <body>
<p> <p>
<code>ponysay</code> — cowsay reimplemention for ponies. <code>ponysay</code> a cowsay reimplemention for ponies
</p> </p>
<p> <p>
ponysay as an awesome program to displays ponies giving messages in your terminal.<br/> ponysay as an awesome terminal application to display ponies speaking messages in your terminal.<br/>
It has a lot of features; you can use its <code>info</code> manual to explore it, the manual is also<br/> It has many features; you can use its <code>info</code> manual to explore them. The manual is <br/>
available <a href="./ponysay/index.html">[here]</a> or <a href="https://github.com/erkin/ponysay/blob/master/ponysay.pdf?raw=true">[here]</a> as an PDF. To the left you will found some recommended<br/> available <b><a href="./ponysay/index.html">here</a></b> and <b><a href="https://github.com/erkin/ponysay/blob/master/ponysay.pdf?raw=true">here</a></b> as PDF. On the left you can find a few recommended<br/>
sections of the manual to read if you are not up for reading the entire manual. sections of the manual to read, if you are not up for reading the entire manual.
</p> </p>
<p> <p>
If you cannot find a package distribute for your OS, take a look <a href="./ponysay/Package-repositories.html#Package-repositories">[here]</a> or build it yourself.<br/> If you cannot find a package for ponysay in your operating system's repositories,<br/>
On most systems with the base packages, base-devel packages and Python 3 installed,<br/> take a look <b><a href="./ponysay/Package-repositories.html#Package-repositories">here</a></b> or build it yourself.<br/>
On most systems with the base and base-devel packages with Python 3 installed,<br/>
downloading the software and running <code>sudo ./setup.py --everything install</code><br/> downloading the software and running <code>sudo ./setup.py --everything install</code><br/>
should install ponysay, with everything it has to offer. If you are not privileged to run as<br/> should suffice to install ponysay, complete with everything it has to offer.<br/>
super user you can install install it for just your user by omitting <code>sudo</code> and adding<br/> If you are not privileged to run as superuser you can install it only for your user<br/>
<code>--private</code>.<br/> by omitting <code>sudo</code> and appending <code>--private</code>.<br/>
</p> </p>
<p> <p>
If you are missing your favourite pony, <a href="https://github.com/erkin/ponysay/issues?direction=desc&sort=created&state=open">[ask]</a> and I we will add it (as soon as possible). If you are missing your favourite pony, <b><a href="https://github.com/erkin/ponysay/issues?direction=desc&sort=created&state=open">ask</a></b> and we shall add it (as soon as possible).
</p> </p>
<p> <p>
<img alt="derpy screenshot" src="../screenshot.png"> <img alt="derpy screenshot" src="../screenshot.png">