From 1f44204b586592bd7b316ff116bdb8642acc43a4 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Sat, 25 May 2013 15:03:31 +0200
Subject: [PATCH] readme updates

---
 Gemfile                         |  8 ++++----
 MULTI_COOP_INSTALL              |  4 ----
 README => README.md             | 18 +++++++++---------
 README_DEVEL => doc/DEVELOPMENT |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 MULTI_COOP_INSTALL
 rename README => README.md (59%)
 rename README_DEVEL => doc/DEVELOPMENT (99%)

diff --git a/Gemfile b/Gemfile
index 5af84990..6cf4d543 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', :platforms => :ruby
+  gem 'therubyracer', platforms: :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end
@@ -25,7 +25,7 @@ gem 'kaminari'
 gem 'client_side_validations'
 gem 'simple_form'
 gem 'inherited_resources'
-gem 'localize_input', :git => "git://github.com/bennibu/localize_input.git"
+gem 'localize_input', git: "git://github.com/bennibu/localize_input.git"
 gem 'wikicloth'
 gem 'daemons'
 gem 'twitter-bootstrap-rails'
@@ -36,10 +36,10 @@ gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.g
 gem 'acts_as_tree'
 gem 'acts_as_configurable', git: 'git://github.com/bwalding/acts_as_configurable.git'
 gem 'resque'
-gem 'whenever', :require => false # For defining cronjobs, see config/schedule.rb
+gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
 
 group :production do
-  gem 'exception_notification', :require => 'exception_notifier'
+  gem 'exception_notification', require: 'exception_notifier'
 end
 
 group :development do
diff --git a/MULTI_COOP_INSTALL b/MULTI_COOP_INSTALL
deleted file mode 100644
index 843cffa3..00000000
--- a/MULTI_COOP_INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-MULTI_COOP_INSTALL
-------------------
-
-TODO ...
\ No newline at end of file
diff --git a/README b/README.md
similarity index 59%
rename from README
rename to README.md
index 2a0f3f95..e234f7fb 100644
--- a/README
+++ b/README.md
@@ -1,17 +1,17 @@
-== FoodSoft
+FoodSoft
+=========
 
 Web-based software to manage a non-profit food coop (product catalog, ordering, accounting, job scheduling).
 
-== Install
+More information about using this software and contributing can be found on the [wiki](https://github.com/foodcoops/foodsoft/wiki).
 
-Have a look on README_DEVEL.
+Install
+--------
 
-Update, it is highly recommended to checkout the rails3 branch. As soon as possible I will merge this branch
-into master. So for beginnners, better start with the new (I hope much easier) code.
+Have a look at [README_DEVEL](https://github.com/foodcoops/foodsoft/blob/master/doc/DEVELOPMENT) (possibly outdated) and the (more recent) [Developing](https://github.com/foodcoops/foodsoft/wiki/Developing) page on the wiki.
 
-git checkout -b rails3 origin/rails3
-
-== License
+License
+-------
 
 FoodSoft - a webbased foodcoop management software
 Copyright (C) 2011 Benni and Lasse
@@ -26,4 +26,4 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-(See file LICENSE for the full text of the GPL)
+(See file LICENSE for the full text of the GPL)
\ No newline at end of file
diff --git a/README_DEVEL b/doc/DEVELOPMENT
similarity index 99%
rename from README_DEVEL
rename to doc/DEVELOPMENT
index e5e08a6d..5cb4966a 100644
--- a/README_DEVEL
+++ b/doc/DEVELOPMENT
@@ -93,4 +93,4 @@ Just install mailcatcher with gem install mailcatcher and start the service with
 
 From now on you have a smpt server listening on 1025. To see the emails go to
 
-    http://localhost:1080
+    http://localhost:1080
\ No newline at end of file