From e01873b590772a9ea800e99aea019eb22b5ed5ca Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 2 Apr 2014 15:02:53 +0200
Subject: [PATCH] Updated readme's.

---
 README.md                |  6 +++---
 README_Install_Mac.md    | 17 ++++++++++++++---
 README_Install_Ubuntu.md | 16 ++++++++--------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 38b753362..d45ff54df 100644
--- a/README.md
+++ b/README.md
@@ -51,9 +51,9 @@ Getting Started
 
 ```
      zammad@shell> rake assets:precompile
-     zammad@shell> rails server # rails web server
-     zammad@shell> ruby script/websocket-server.rb # non blocking websocket server
-     zammad@shell> rails runner 'Session.jobs' # generate overviews on demand, just send changed data to browser
+     zammad@shell> puma -p 3000 # application web server
+     zammad@shell> script/websocket-server.rb start # non blocking websocket server
+     zammad@shell> script/scheduler.rb start # generate overviews on demand, just send changed data to browser
 ```
 
 6. Go to http://localhost:3000/#getting_started and you'll see:
diff --git a/README_Install_Mac.md b/README_Install_Mac.md
index 8dda40638..26ae55ff9 100644
--- a/README_Install_Mac.md
+++ b/README_Install_Mac.md
@@ -32,13 +32,24 @@ Install Zammad
     rake db:seed
 ````
 
+Database connect
+--------------
+
+````shell
+    cd zammad-latest
+    cp config/database.yml.dist config/database.yml
+    rake db:create
+    rake db:migrate
+    rake db:seed
+````
+
 Start Zammad
 ------------
 
 ````shell
-    rails server # rails web server
-    ruby script/websocket-server.rb # non blocking websocket server
-    rails runner 'Session.jobs' # generate overviews on demand, just send changed data to browser
+    puma -p 3000 # application web server
+    script/websocket-server.rb start # non blocking websocket server
+    script/scheduler.rb start # generate overviews on demand, just send changed data to browser
 ````
 
 Start init page
diff --git a/README_Install_Ubuntu.md b/README_Install_Ubuntu.md
index 622bb86c0..89a89750c 100644
--- a/README_Install_Ubuntu.md
+++ b/README_Install_Ubuntu.md
@@ -15,7 +15,7 @@
 * source /home/zammad/.rvm/scripts/rvm
 * echo "source /home/zammad/.rvm/scripts/rvm" >> /home/zammad/.bashrc
 * rvm install ruby
-* gem install rails therubyracer 
+* gem install rails therubyracer
 
 ### Apache Config
 * vi /etc/apache2/sites-available/zammad
@@ -99,9 +99,9 @@
 
 ### Start Server
 * rake assets:precompile
-* rails server &
-* ruby script/websocket-server.rb start &
-* rails r 'Scheduler.run' &
+* puma -p 3000 # application web server
+* script/websocket-server.rb start # non blocking websocket server
+* script/scheduler.rb start # generate overviews on demand, just send changed data to browser
 
 
 
@@ -122,7 +122,7 @@
 * source /home/zammad/.rvm/scripts/rvm
 * echo "source /home/zammad/.rvm/scripts/rvm" >> /home/zammad/.bashrc
 * rvm install ruby
-* gem install rails therubyracer 
+* gem install rails therubyracer
 
 ### Get Zammad
 * cd /var/www/zammad
@@ -141,7 +141,7 @@
 * rake db:migrate
 * rake db:seed
 * rake assets:precompile
-* rails server &
-* ruby script/websocket-server.rb start &
-* rails r 'Scheduler.run' &
+* puma -p 3000 # application web server
+* script/websocket-server.rb start # non blocking websocket server
+* script/scheduler.rb start # generate overviews on demand, just send changed data to browser