object_url: be a little bit less aggressive validating url's
Merge remote-tracking branch 'hobodoc/master'
Add marketing type section to the manual.
cookbook: markup fix.
2.0.0.pre9