Merge branch 'master' of https://github.com/YOURLS/YOURLS

README.md

@@ -14,7 +14,7 @@ Learn more tweaks in the [Wiki documentation](https://github.com/YOURLS/YOURLS/w
 Community news, tips and tricks
 -------------------------------
 * Read and subscribe to the [The Official YOURLS Blog](http://blog.yourls.org)
-* Follow [@yourls](http://twitter.com/yourls)
+* Follow [@yourls](https://twitter.com/yourls)
 * Subscribe to the [YOURLS User Newsletter](http://yourls.org/newsletter) (infrequent, low volume)
 
 

includes/functions-kses.php

@@ -543,7 +543,7 @@ function yourls_kses_allowed_protocols() {
 		'aim:', 'facetime://', 'gtalk:', 'xmpp:',
 		'irc://', 'ircs://', 'mumble://', 
 		'callto:', 'skype:', 'sip:',
-		'teamspeak://', 'ventrilo://', 'xfire:', 
+		'teamspeak://', 'tel:', 'ventrilo://', 'xfire:', 
 		'ymsgr:', 
 
 		// Misc

readme.html

@@ -328,7 +328,7 @@ <h2 id="credits">Credits</h2>
 
 			<p>YOURLS is made by <a href="https://github.com/YOURLS/YOURLS/graphs/contributors">awesome people</a>.</p>
 
-			<p>Keep up to date: follow <a href="http://twitter.com/yourls">@yourls</a>, <a href="http://twitter.com/ozh">@ozh</a> (lead developper)and read the official <a href="http://blog.yourls.org/">YOURLS Blog</a></p>
+			<p>Keep up to date: follow <a href="http://twitter.com/yourls">@yourls</a>, <a href="http://twitter.com/ozh">@ozh</a> (lead developer)and read the official <a href="http://blog.yourls.org/">YOURLS Blog</a></p>
 		</div>
 
 		<!-- Installation Instructions -->
@@ -342,8 +342,9 @@ <h2 class='first' id="fresh">Fresh Install</h2>
 				<li>Create a new database (see <a href="#Config" onclick="toggle(this);">Configuration</a> &ndash; you can also use an existing one)</li>
 				<li>Point your browser to <code>http://your-own-domain-here.com/admin/</code></li>
 			</ol>
-			<a href="https://www.rosehosting.com/blog/how-to-install-yourls-on-ubuntu-14-04/">How to Install YOURLS on Ubuntu 14.04</a> (Unoficial guide)
-
+			<a href="https://www.rosehosting.com/blog/how-to-install-yourls-on-ubuntu-14-04/">How to Install YOURLS on Ubuntu 14.04</a> (Unoficial guide) <br/>
+			<a href="https://thishosting.rocks/how-to-shorten-your-links-with-your-own-domain/#vps">How to Install YOURLS on CentOS 7</a> (Unoficial guide) <br/>
+			<a href="https://thishosting.rocks/how-to-shorten-your-links-with-your-own-domain/#shared">How to Install YOURLS on Shared hosting (cPanel)</a> (Unoficial guide) 
 			<h2 id="upgrade">Upgrade</h2>
 			<ol>
 				<li><strong>Backup the database!</strong></li>
@@ -649,7 +650,7 @@ <h3 id="sequential">Random versus sequential short URLs</h3>
 
 			<h3 id="noindex">There is no index page at the root of the install</h3>
 			<ul>
-				<li>Indeed. It's intented. It's up to the user to make what they need. Some will redirect the root to a different place, some make a public interface for anyone to shorten links, some make a portfolio. You make it.</li>
+				<li>Indeed. It's intended. It's up to the user to make what they need. Some will redirect the root to a different place, some make a public interface for anyone to shorten links, some make a portfolio. You make it.</li>
 				<li>If you want to make a public interface and run your own little bitly.com, there's a sample file provided as an example: <code>sample-public-front-page.txt</code>. This implies important issues to deal with: spam, performance and security. Read <a href="http://yourls.org/public">Public Shortening</a> for important information.</li>
 			</ul>