Permalink
Browse files

Updated License and Readme

  • Loading branch information...
1 parent 271624d commit 7deb292e1539aec6e8967d2e9bdee2eea16b7f43 @rsalvado rsalvado committed Feb 8, 2012
Showing with 38 additions and 10 deletions.
  1. +20 −0 MIT-LICENSE
  2. +0 −10 README.md
  3. +18 −0 README.rdoc
View
@@ -0,0 +1,20 @@
+Copyright (c) 2009 International Product Design S.L. - gnuine (http://www.gnuine.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -1,10 +0,0 @@
-# ubiquo
-
-ubiquo is a Ruby on Rails based custom CMS development framework.
-Check the website for more information: http://www.ubiquo.me
-
-# License
-
-ubiquo is released under the MIT license:
-
-* http://www.opensource.org/licenses/MIT
View
@@ -0,0 +1,18 @@
+= ubiquo
+
+Ubiquo is a Ruby on Rails based custom CMS development framework.
+Check the website for more information: http://www.ubiquo.me
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+ future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+ (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2009 International Product Design S.L. - gnuine (http://www.gnuine.com)

0 comments on commit 7deb292

Please sign in to comment.