Upstream/esphome-docs
1
0
Fork 0
mirror of https://github.com/esphome/esphome-docs.git synced 2025-01-13 20:11:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next' into rc

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
This commit is contained in:
Otto Winter 2018-10-20 20:15:34 +02:00
commit 00600811ef
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -44,10 +44,10 @@ deploy-beta:
- git worktree prune
- rm -rf ../esphomelib
script:
- git fetch --force git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages:gh-pages
- git fetch --force git@github.com:OttoWinter/esphomedocs-beta.git gh-pages:gh-pages
- git worktree add _build/html gh-pages
- make ../esphomelib
- CNAME="beta.esphomelib.com" make deploy
- git -C _build/html push -f git@github.com:OttoWinter/beta.esphomelib.com.git gh-pages
- git -C _build/html push git@github.com:OttoWinter/esphomedocs-beta.git gh-pages
only:
- rc

8
esphomeyaml/index.rst
View File

@ -638,9 +638,9 @@ Text Sensor Components
----------------------
================================================== ================================================== ==================================================
|Text Sensor Core|_ |MQTT Subscribe|_ |Version|_
|Text Sensor Core|_ |MQTT Subscribe Text|_ |Version|_
-------------------------------------------------- -------------------------------------------------- --------------------------------------------------
`Text Sensor Core`_ `MQTT Subscribe`_ `Version`_
`Text Sensor Core`_ `MQTT Subscribe Text`_ `Version`_
-------------------------------------------------- -------------------------------------------------- --------------------------------------------------
|Template Text Sensor|_
-------------------------------------------------- -------------------------------------------------- --------------------------------------------------
@ -650,9 +650,9 @@ Text Sensor Components
.. |Text Sensor Core| image:: /esphomeyaml/images/folder-open.svg
:class: component-image
.. _Text Sensor Core: /esphomeyaml/components/text_sensor/index.html
.. |MQTT Subscribe| image:: /esphomeyaml/images/mqtt.png
.. |MQTT Subscribe Text| image:: /esphomeyaml/images/mqtt.png
:class: component-image
.. _MQTT Subscribe: /esphomeyaml/components/text_sensor/mqtt_subscribe.html
.. _MQTT Subscribe Text: /esphomeyaml/components/text_sensor/mqtt_subscribe.html
.. |Version| image:: /esphomeyaml/images/new-box.svg
:class: component-image
.. _Version: /esphomeyaml/components/text_sensor/version.html

2
esphomeyaml/text_sensor.csv
View File

@ -1,4 +1,4 @@
Text Sensor Core, components/text_sensor/index, folder-open.svg
MQTT Subscribe, components/text_sensor/mqtt_subscribe, mqtt.png
MQTT Subscribe Text, components/text_sensor/mqtt_subscribe, mqtt.png
Version, components/text_sensor/version, new-box.svg
Template Text Sensor, components/text_sensor/template, description.svg

1 Text Sensor Core components/text_sensor/index folder-open.svg
2 MQTT Subscribe MQTT Subscribe Text components/text_sensor/mqtt_subscribe mqtt.png
3 Version components/text_sensor/version new-box.svg
4 Template Text Sensor components/text_sensor/template description.svg