Permalink
Browse files

Merge remote branch 'oleg/ruote2.1' into ruote2.1

  • Loading branch information...
2 parents 7f0e138 + 0cced1e commit 2ec02dd453f8f74aa23edd3b736b9be2ac451e76 @jmettraux jmettraux committed Jun 4, 2010
Showing with 3 additions and 1 deletion.
  1. +1 −0 CREDITS.txt
  2. +1 −0 examples/web_first_page.rb
  3. +1 −1 lib/ruote/part/engine_participant.rb
View
1 CREDITS.txt
@@ -16,6 +16,7 @@ Torsten Schoenebaum - http://github.com/tosch
Contributors
------------
+Oleg Pudeyev - http://github.com/p
Brett Anthoine - http://github.com/anb
Matt Nichols - http://github.com/mattnichols
Nicholas Faiz - http://github.com/biv
View
1 examples/web_first_page.rb
@@ -9,6 +9,7 @@
# probably be avoided
#
+require 'rubygems'
require 'ruote'
pdef = Ruote.process_definition :name => 'work' do
View
2 lib/ruote/part/engine_participant.rb
@@ -63,7 +63,7 @@ module Ruote
# detail the class and the arguments to the storage of the target engine.
#
# This example is a bit dry / flat. A real world example would perhaps detail
- # a 'master' engine connected to 'departemental' engines, something more
+ # a 'master' engine connected to 'departmental' engines, something more
# hierarchical.
#
# The example also binds reciprocally engines. If the delegated processes

0 comments on commit 2ec02dd

Please sign in to comment.