Merge branch 'master' of github.com:picocms/Pico

README.md

@@ -1,6 +1,6 @@
 Pico
 ====
 
-Pico is a stupidly simple, blazing fast, flat file CMS. See http://pico.dev7studios.com for more info.
+Pico is a stupidly simple, blazing fast, flat file CMS. See http://picocms.org/ for more info.
 
 [![I Love Open Source](http://www.iloveopensource.io/images/logo-lightbg.png)](http://www.iloveopensource.io/projects/524c55dcca7964c617000756)

composer.json

@@ -1,9 +1,9 @@
 {
-    "name": "gilbitron/pico",
+    "name": "picocms/pico",
     "type": "library",
     "description": "Pico is a flat file CMS, this means there is no administration backend and database to deal with. You simply create .md files in the \"content\" folder and that becomes a page.",
     "keywords": ["cms"],
-    "homepage": "http://pico.dev7studios.com",
+    "homepage": "http://picocms.org/",
     "license": "MIT",
     "authors": [
         {

content/index.md

@@ -5,7 +5,7 @@ Description: This description will go in the meta description tag
 
 ## Welcome to Pico
 
-Congratulations, you have successfully installed [Pico](http://pico.dev7studios.com). Pico is a stupidly simple, blazing fast, flat file CMS.
+Congratulations, you have successfully installed [Pico](http://picocms.org/). Pico is a stupidly simple, blazing fast, flat file CMS.
 
 ### Creating Content
 
@@ -96,7 +96,7 @@ Pages can be used like:
 
 ### Plugins
 
-See [http://pico.dev7studios.com/plugins](http://pico.dev7studios.com/plugins)
+See [http://pico.dev7studios.com/plugins](http://picocms.org/plugins)
 
 ### Config
 
@@ -105,4 +105,4 @@ lists all of the settings and their defaults. To override a setting, simply unco
 
 ### Documentation
 
-For more help have a look at the Pico documentation at [http://pico.dev7studios.com/docs](http://pico.dev7studios.com/docs)
+For more help have a look at the Pico documentation at [http://picocms.org/docs](http://picocms.org/docs)

lib/pico.php

@@ -5,7 +5,7 @@ use \Michelf\MarkdownExtra;
  * Pico
  *
  * @author Gilbert Pellegrom
- * @link http://pico.dev7studios.com
+ * @link http://picocms.org
  * @license http://opensource.org/licenses/MIT
  * @version 0.8
  */

plugins/pico_plugin.php

@@ -4,7 +4,7 @@
  * Example hooks for a Pico plugin
  *
  * @author Gilbert Pellegrom
- * @link http://pico.dev7studios.com
+ * @link http://picocms.org
  * @license http://opensource.org/licenses/MIT
  */
 class Pico_Plugin {
@@ -91,4 +91,4 @@ class Pico_Plugin {
 	
 }
 
-?>
+?>

themes/default/index.html

@@ -36,10 +36,10 @@
 	
 	<footer id="footer">
 		<div class="inner">
-			<a href="http://pico.dev7studios.com">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a> 
+			<a href="http://picocms.org/">Pico</a> was made by <a href="http://gilbert.pellegrom.me">Gilbert Pellegrom</a> 
 			from <a href="http://dev7studios.com">Dev7studios</a>.
 		</div>
 	</footer>
     
 </body>
-</html>
+</html>