Merge remote-tracking branch 'upstream/master'

README.md

@@ -31,13 +31,13 @@ configuration the included Kibana logstash interface should work nicely.
 
 
 ### FAQ
 ### FAQ
 __Q__: Why doesnt it work? I have http://localhost:9200 in my config.js, my webserver and elasticsearch
 __Q__: Why doesnt it work? I have http://localhost:9200 in my config.js, my webserver and elasticsearch
-server are on the same machine
+server are on the same machine  
 __A__: Kibana 3 does not work like previous versions of Kibana. To ease deployment, the server side
 __A__: Kibana 3 does not work like previous versions of Kibana. To ease deployment, the server side
 component has been eliminated. Thus __the browser connects directly to Elasticsearch__. The default
 component has been eliminated. Thus __the browser connects directly to Elasticsearch__. The default
 config.js setup works for the webserver+Elasticsearch on the same machine scenario. Do not set it
 config.js setup works for the webserver+Elasticsearch on the same machine scenario. Do not set it
 to http://localhost:9200 unless your browser and elasticsearch are on the same machine
 to http://localhost:9200 unless your browser and elasticsearch are on the same machine
 
 
-__Q__: How do I secure this? I don't want to leave 9200 open.
+__Q__: How do I secure this? I don't want to leave 9200 open.  
 __A__: A simple nginx virtual host and proxy configuration can be found in the sample/nginx.conf
 __A__: A simple nginx virtual host and proxy configuration can be found in the sample/nginx.conf
 
 
 ### Support
 ### Support
@@ -48,4 +48,4 @@ If you have questions or comments the best place to reach me is #logstash or #el
 
 
 Please see [CONTRIBUTING.md](https://github.com/elasticsearch/kibana/blob/master/CONTRIBUTING.md). 
 Please see [CONTRIBUTING.md](https://github.com/elasticsearch/kibana/blob/master/CONTRIBUTING.md). 
 If you have a bugfix or new feature that you would like to contribute to Kibana, **please find or open an issue 
 If you have a bugfix or new feature that you would like to contribute to Kibana, **please find or open an issue 
-about it first.** 
+about it first.** 
\ No newline at end of file