From 8883d0dfaf0e60d38ae51a84a89e8fbbdcc35f13 Mon Sep 17 00:00:00 2001 From: benni Date: Sat, 25 Aug 2012 12:24:57 +0200 Subject: [PATCH] Updated READMEs. Recommend using rails3 branch. --- README | 7 ++++++- README_DEVEL | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README b/README index ca1cb320..2a0f3f95 100644 --- a/README +++ b/README @@ -6,6 +6,11 @@ Web-based software to manage a non-profit food coop (product catalog, ordering, Have a look on README_DEVEL. +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. + +git checkout -b rails3 origin/rails3 + == License FoodSoft - a webbased foodcoop management software @@ -21,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) \ No newline at end of file +(See file LICENSE for the full text of the GPL) diff --git a/README_DEVEL b/README_DEVEL index 385a3583..2c18c606 100644 --- a/README_DEVEL +++ b/README_DEVEL @@ -69,7 +69,7 @@ With this, you also get a ready to go user with username 'admin' and password 's --------------- Start the WEBrick server to try it out: - script/server + bundle exec rails s (8) (optional) Get background jobs done @@ -81,4 +81,4 @@ start the workers: or as a daemon process in the background - scrip/delayed_job start # and stop \ No newline at end of file + scrip/delayed_job start # and stop