Merge branch 'hotfix_doc_oauth' into develop

Author: eschnou

protected/application/admin/controllers/SnsController.php

@@ -73,7 +73,8 @@ public function submitAction()
 	public function connectAction() {
 
 		if (! isset($this->_config->twitter->consumer_key) && !isset($this->_config->twitter->consumer_secret)) {
-			$this->addErrorMessage("Missing OAuth consumer key and secret");
+			$this->addErrorMessage("Missing OAuth consumer key and secret, these should be added to the Storytlr config.ini file.
+			More details <a href='http://github.com/storytlr/core/wiki/How-to-integrate-with-twitter'>here</a>.");
 			$this->_forward('index');
 			return;
 		} 

protected/config/config.ini.sample

@@ -44,6 +44,9 @@ rss.default.hide_content=1
 ;;flickr.api_key=
 
 ;; Twitter settings
+;; In order to integrate storytlr with twitter, you need to obtain OAuth application keys 
+;; from Twitter directly (we are not allowed to redistribute keys). It is a simple process
+;; that you can follow here: http://dev.twitter.com/apps
 ;;twitter.consumer_key=
 ;;twitter.consumer_secret=
 ;;twitter.default.hide_replies=1

protected/install/config.ini.template

@@ -44,8 +44,12 @@ rss.default.hide_content=1
 [:flickr_comment]flickr.api_key=[:flickr_key]
 
 ;; Twitter settings
-;;twitter.username=
-;;twitter.password=
+;; In order to integrate storytlr with twitter, you need to obtain OAuth application keys 
+;; from Twitter directly (we are not allowed to redistribute keys). It is a simple process
+;; that you can follow here: http://dev.twitter.com/apps
+;;
+;;twitter.consumer_key=
+;;twitter.consumer_secret=
 ;;twitter.default.hide_replies=1
 
 ;; Seesmic settings