update talks

README.md

@@ -2,12 +2,13 @@ Want me to talk at some event? Drop me a note. Presentation code is on [GitHub](
 
 ## Feature Talks
 
+Times are guesstimates for what timeframe I could prepare the talk for. I always improve talks that I already gave.
 
 ### Beyond Ruby
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/beyond_ruby.md)
 
-Gave talk at:
+25 to 45 min
 
 * RubyConf Argentina 2011
 * EuRuKo 2012
@@ -16,14 +17,14 @@ Gave talk at:
 
 [proposal](https://github.com/rkh/proposals/blob/master/proposed_talks/fun_with_rubinius.md)
 
-Have not yet given this talk.
+25 to 30 min
 
 ### Real Time Rack
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/real_time_rack.md),
 [video](http://confreaks.net/videos/727-rockymtnruby2011-real-time-rack)
 
-Gave talk at:
+35 to 45 min
 
 * Scottish Ruby Conf 2011
 * Ruby Lugdunum 2011
@@ -36,34 +37,36 @@ Gave talk at:
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/method_dispatch.md), [video](http://confreaks.net/videos/680-rubyconf2011-message-in-a-bottle)
 
-Gave talk at:
+35 to 45 min
 
 * RubyConf 2011
 
-Was supposed to give talk at MagmaRails 2011, but conference was canceled.
+Note: *advanced* means you have a general understanding of how programming languages are implemented.
 
 ### Message In A Bottle (simpler version)
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/method_dispatch_simple.md)
 
-Gave talk at:
+30 to 45 min
 
+* (MagmaRails 2011)
 * RuLu 2012
 * BaRuCo 2012
+* Aloha Ruby Conference 2012
 
 ### Sinatra in 8 lines, or How to do crazy stuff with Ruby
 
 [proposal](https://github.com/rkh/proposals/blob/master/proposed_talks/almost_sinatra.md)
 
-Gave talk at:
+20 to 30 min
 
 * eurucamp 2012
 
 ### Sinatra: Past, Present, Future
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/sinatra.md)
 
-Gave talke at:
+20 to 30 min
 
 * toster.ru {ruby} 2012
 
@@ -72,27 +75,64 @@ Gave talke at:
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/reak.md),
 [video](http://confreaks.net/videos/645-gogaruco2011-smalltalk-on-rubinius-or-how-to-implement-your-own-programming-language)
 
-Gave talk at:
+30 to 45 min
 
 * GoGaRuCo 2011
 
-### 10k Projects, One CI
+### 20k Projects, One CI
 
 [proposal](https://github.com/rkh/proposals/blob/master/proposed_talks/travis-architecture.md)
 
+30 to 45 min
+
 ### I Hear You Like Pull Requests
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/travis-pull-requests.md)
 
-Gave talk at:
+25 to 50 min
 
 * RailsBerry 2012 (titled "Something About Pull Requests")
+* Øredev 2012
 
 ### We don't know HTTP
 
 [proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/http.md)
 
-Gave talk at:
+25 to 45 min
 
 * NordicRuby 2012
 * Arrrrrcamp 2012
+
+### Ruby: Where Are You Going?
+
+[proposal](https://github.com/rkh/proposals/blob/master/prepared_talks/ruby_future.md)
+
+* Future Of Web Apps Prague 2012
+
+### Reloading Ruby Code
+
+15 to 45 min
+
+* RubyConf 2010
+* Ruby User Group Berlin, September 2010
+
+### Live Sinatra Release
+
+5 to 20 min, has to fit Sinatra release
+
+* Scottish Ruby Conf 2011
+* Ruby User Group Berlin, March 2011
+* RubyConf 2011
+* EuruCamp 2012
+
+### What's new in Ruby 2.0
+
+* Ruby User Group Berlin, December 2010
+
+## Workshops
+
+### Rails Girls Curriculum
+
+* Campus Party EU 2012
+* Rails Girls Berlin (April, May, July 2012)
+* Rails Girls Amsterdam 2012

prepared_talks/ruby_future.md

@@ -0,0 +1,9 @@
+# Ruby: Where Are You Going?
+
+A look at the past, present and future of web development in Ruby. How does
+Rails work internally? What is going to happen in Rails 4? What are the plans
+for Sinatra? Right now, there are at least two replacements for Rack in the
+makings. But it is the underlying technology used by Rails, Sinatra and nearly
+any other Ruby web framework out there. Yet, it's the framework authors pushing
+for the changes. So, what's wrong with Rack? And what does that mean for us as
+web developers? Head to this session for answers!

proposed_talks/travis-architecture.md

@@ -1,6 +1,6 @@
-# 10k Projects, One CI
+# 20k Projects, One CI
 
-Imagine a single CI setup running tests for more than 10.000 projects. What would such a setup look like? How would you deal with all the load?
+Imagine a single CI setup running tests for more than 20.000 projects. What would such a setup look like? How would you deal with all the load?
 
 Those are exactly the issues the Travis CI team had to face when building a Distributed Continous Integrations System for the Open Source community.