Merge branch 'master' of github.com:cydrobolt/polr

README.md

@@ -26,10 +26,24 @@ Polr is written in PHP and Laravel, using MySQL as its primary database.
 
 
 _Installation TL;DR: clone or download this repository, set document root to `public/`, MySQL create database, go to `yoursite.com/setup`_
+
+#### Demo
+
+Polr operates a demo instance at [demo.polr.me](http://demo.polr.me). You can use the demo instance to develop your API implementation, try out the admin panel, or simply experience the app without needing to install it on your own servers. The demo instance may be periodically reset, so please do not use the demo as a production URL shortener.
+
+Admin username: demo-admin (password is same as username)
+
+Normal user username: demo-user (password is same as username)
+
+#### Browser Extensions
+
+* Safari - [Polr.safariextension](https://github.com/cleverdevil/Polr.safariextension).
+
 ####Versioning
 
 Polr uses [Semantic Versioning](http://semver.org/)
 
+
 ####License
 
 

docs/about/license.md

@@ -4,7 +4,7 @@
 Polr is licensed under the GPLv2+
 
 <pre>
-Copyright (C) 2013-2015 Chaoyi Zha &lt;me [at] cydrobolt [dot] com&gt;
+Copyright (C) 2013-2016 Chaoyi Zha
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

docs/user-guide/installation.md

@@ -131,7 +131,7 @@ server {
             fastcgi_pass    php;
             fastcgi_index   index.php;
             fastcgi_param   SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param   HTTP_HOST       $server_name
+            fastcgi_param   HTTP_HOST       $server_name;
     }
 }