Merge branch 'gh-pages'

dlech · dlech · commit 9071b8fb052f · 2014-07-25T23:38:57.000-05:00
Conflicts:
	README.md
diff --git a/README.md b/README.md
@@ -1,7 +1,25 @@
 ev3dev.github.io
 ================
 
-This is the web page at <http://ev3dev.github.io>.
+This is the web page at <http://www.ev3dev.org> and also <http://ev3dev.github.io>.
+
+Feel free to fork and make a pull request. 
+
+When forking, you can create a new branch called `gh-pages`, then your changes can be
+viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this though,
+GitHub will send you lots of email like this, which you should ignore.
+
+    The page build completed successfully, but returned the following warning:
+    
+    CNAME already taken: www.ev3dev.org
+    
+    For information on troubleshooting Jekyll see:
+    
+      https://help.github.com/articles/using-jekyll-with-pages#troubleshooting
+    
+    If you have any questions please contact us at https://github.com/contact.
+    
+If it really gets on your nerves, you can rename the `CNAME` file. Just make sure to
+change it back before you submit your pull request.
+
 
-Feel free to make a pull request. When forking, create a new branch called `gh-pages`,
-then your changes can be viewed as `http://<user>.github.io/ev3dev.github.io`.
