Merge branch 'current' into next

source/_components/camera.generic.markdown

@@ -16,7 +16,7 @@ ha_iot_class: "depends"
 
 The `generic` camera platform allows you to integrate any IP camera or other URL into Home Assistant. Templates can be used to generate the URLs on the fly.
 
-Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]`.
+Home Assistant will serve the images via its server, making it possible to view your IP cameras while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]`.
 
 To enable this camera in your installation, add the following to your `configuration.yaml` file:
 

source/_components/media_player.aquostv.markdown

@@ -53,5 +53,6 @@ Currently known supported models:
 - LC-60LE925UN
 - LC-60LE857U
 - LC-60EQ10U
+- LC-60SQ15U
 
 If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/media_player.aquostv.markdown).

source/_components/nest.markdown

@@ -34,7 +34,7 @@ The Nest component is the main component to integrate all [Nest](https://nest.co
 9. Once the new product page opens the "Product ID" and "Product Secret" are located on the right side. These will be used as `client_id` and `client_secret` below.
 10. Once Home Assistant is started, a configurator will pop up asking you to log into your Nest account and copy a PIN code into Home Assistant.
 
-Connecting to the Nest Developer API requires outbound port 8553 on your firewall. The configuration will fail if this is not accessible.
+Connecting to the Nest Developer API requires outbound port 9553 on your firewall. The configuration will fail if this is not accessible.
 
 ### {% linkable_title Configuration %}
 

source/_components/netatmo.markdown

@@ -55,6 +55,3 @@ That's it. You can copy and paste your new `client id` and `client secret` in yo
 <img src='/images/screenshots/netatmo_api.png' />
 </p>
 
-<p class='note'>
-The Home Assistant Netatmo platform has only be tested with the classic indoor, outdoor module and rain meter. There is no support for the wind meter module at this time because developers does not own these modules.
-</p>

source/_components/sensor.coinmarketcap.markdown

@@ -28,12 +28,12 @@ sensor:
 currency:
   description: The cryptocurrency to use.
   required: false
-  type: string, list
+  type: string
   default: Bitcoin
 display_currency:
   description: The currency to display.
   required: false
-  type: string, list
+  type: string
   default: USD
 {% endconfiguration %}
 

source/_components/sensor.openweathermap.markdown

@@ -30,7 +30,7 @@ sensor:
 ```
 
 {% configuration %}
-  apk_key:
+  api_key:
     description: Your API key for OpenWeatherMap.
     required: true
     type: string