Merge branch 'current' into next

source/_components/calendar.todoist.markdown

@@ -109,7 +109,7 @@ Home Assistant does its best to determine what task in each project is "most" im
 
 ### {% linkable_title Services %}
 
-Todoist also comes with access to a service, `todoist.new_task`. This service can be used to create a new Todoist task. You can specify labels and a project, or you can leave them blank, and the task will go to your "Inbox" project.
+Todoist also comes with access to a service, `calendar.todoist_new_task`. This service can be used to create a new Todoist task. You can specify labels and a project, or you can leave them blank, and the task will go to your "Inbox" project.
 
 Here's an example JSON payload:
 

source/_components/history.markdown

@@ -87,6 +87,21 @@ history:
      - sensor.date
 ```
 
+If you'd like the order of display of the sensors to follow the way
+they are listed in the included entity list, you can set the flag
+`use_include_order` to True.
+
+```yaml
+# Example configuration.yaml entry using specified entity display order
+history:
+  use_include_order: True
+  include:
+    entities:
+      - sun.sun
+      - light.front_porch
+```
+
+
 #### {% linkable_title Implementation details %}
 
 The history is stored in a SQLite database `home-assistant_v2.db` within your configuration directory if the `recorder` component is not set up differently.

source/_components/sensor.mopar.markdown

@@ -39,7 +39,7 @@ Configuration options for the Mopar sensor:
 
 ## {% linkable_title Service %}
 
-Call the `mopar.remote_command` service to perform a remote command on your vehicle.
+Call the `sensor.mopar_remote_command` service to perform a remote command on your vehicle.
 
 - **vehicle_index** (*Required*): `vehicle_index` attribute found on sensor.
 - **command** (*Required*): One of `lock/unlock/engineon/engineoff/horn`.

source/_components/switch.broadlink.markdown

@@ -48,7 +48,7 @@ Information about how to install on Windows can be found [here](https://home-ass
 
 ### {% linkable_title How to obtain IR/RF packets? %}
 
-Choose Call Service from the Developer Tools. Choose the service broadlink/learn_command from the list of **Available services:** and hit **CALL SERVICE**. Press the button on your remote with in 20 seconds. The packet will be printed as a persistent notification in the States page of the web interface.
+Choose Call Service from the Developer Tools. Choose the service `switch.broadlink_learn_command` from the list of **Available services:** and hit **CALL SERVICE**. Press the button on your remote with in 20 seconds. The packet will be printed as a persistent notification in the States page of the web interface.
 
 Example config for `rm`, `rm2`, `rm_mini`, `rm_pro_phicomm`, `rm2_home_plus`, `rm2_home_plus_gdt`, `rm2_pro_plus`, `rm2_pro_plus2`, `rm2_pro_plus_bl` and `rm_mini_shate` devices:
 
@@ -126,9 +126,9 @@ switch:
       slot_4: 'Speaker slot'
 ```
 
-### {% linkable_title Service `send_packet` %}
+### {% linkable_title Service `broadlink_send_packet` %}
 
-You can use the service broadlink/send_packet to directly send IR packets without the need to assign a switch entity for each command. 
+You can use the service `switch.broadlink_send_packet` to directly send IR packets without the need to assign a switch entity for each command.
 
 | Service data attribute | Optional | Description |
 | ---------------------- | -------- | ----------- |
@@ -140,7 +140,7 @@ Example:
 script:
   tv_select_source:
     sequence:
-      - service: broadlink.send_packet_192_168_0_107
+      - service: switch.broadlink_send_packet_192_168_0_107
         data:
           packet: 
             - "JgCMAJSSFDYUNhQ2FBEUERQRFBEUERQ2FDYUNhQRFBEUERQRFBEUERQRFDYUERQRFBEUERQRFDYUNhQRFDYUNhQ2FDYUNhQABfWUkhQ2FDYUNhQRFBEUERQRFBEUNhQ2FDYUERQRFBEUERQRFBEUERQ2FBEUERQRFBEUERQ2FDYUERQ2FDYUNhQ2FDYUAA0FAAAAAAAAAAAAAAAA"