README.md in frappuccino-0.2.0 vs README.md in frappuccino-0.3.0

- old
+ new

@@ -7,26 +7,27 @@ ## Installation Add this line to your application's Gemfile: ```ruby -gem 'frappuccino', github: "steveklabnik/frappuccino" +gem 'frappuccino' ``` -(I'm hoping that @yoka will give me the gem name, until then, you -must install from GitHub.) - And then execute: - $ bundle +``` sh +$ bundle +``` Or install it yourself as: - $ git clone https://github.com/steveklabnik/frappuccino - $ cd frappuccino - $ bundle - $ rake install +``` sh +$ git clone https://github.com/steveklabnik/frappuccino +$ cd frappuccino +$ bundle +$ rake install +``` ## Usage Basically, this: @@ -75,10 +76,14 @@ ``` You can combine two streams together: ```ruby -merged_stream = Frappuccino::Stream.merge(stream_one, stream_two) +merged_stream = stream_one.merge(stream_two) + +# or + +merged_stream = Frappuccino::Stream.merge(one_stream , other_stream) # or merged_stream = Frappuccino::Stream.new(button_one, button_two) ```