Skip to content

Commit b5ffffe

Browse files
committed
Fix broken links, SEO svg2png, and fix code highlighting
1 parent d31f08a commit b5ffffe

File tree

156 files changed

+569
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+569
-529
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
---
2-
build:
3-
tags:
4-
- esphomedocs
5-
script:
6-
- make ../esphomelib
7-
- make html
8-
except:
9-
- current
10-
- rc
11-
122
.deploy: &deploy
133
tags:
144
- esphomedocs
@@ -26,12 +16,13 @@ build:
2616
- git fetch --force git@github.com:${TARGET_REPO}.git gh-pages:gh-pages
2717
- git worktree add _build/html gh-pages
2818
- make ../esphomelib
29-
- touch _build/html/.nojekyll
30-
- echo ${CNAME} >_build/html/CNAME
3119
- make html
3220
- git -C _build/html add --all
3321
- git -C _build/html commit -m "Deploy to gh-pages"
3422
- git -C _build/html push -f git@github.com:${TARGET_REPO}.git gh-pages
23+
cache:
24+
paths:
25+
- _build/doctrees
3526

3627
deploy-release:
3728
<<: *deploy

Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
make \
1111
doxygen \
1212
openssh-client \
13+
software-properties-common \
14+
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*
15+
16+
RUN apt-add-repository ppa:inkscape.dev/stable && \
17+
apt-get update && apt-get install -y --no-install-recommends \
18+
inkscape \
1319
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*
1420

1521
RUN pip3 install --no-cache-dir --no-binary :all: \

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ $(ESPHOMELIB_PATH):
3232
git clone --branch $(ESPHOMELIB_TAG) https://github.com/OttoWinter/esphomelib.git $(ESPHOMELIB_PATH); \
3333
fi
3434

35-
deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH)
36-
touch "$(BUILDDIR)/html/.nojekyll"
37-
echo "$(CNAME)" >"$(BUILDDIR)/html/CNAME"
35+
convertimages:
36+
python3 svg2png.py
37+
38+
deploy: cleanhtml doxyg html $(ESPHOMELIB_PATH) convertimages
3839
git -C "$(BUILDDIR)/html" add --all && git -C "$(BUILDDIR)/html" commit -m "Deploy to gh-pages"
3940
@printf "Run \033[0;36mcd $(BUILDDIR)/html && git push origin gh-pages\033[0m to deploy\n"
4041

conf.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
'disqus',
4646
'github',
4747
'seo',
48+
'githubpages',
4849
'sitemap',
4950
]
5051

@@ -67,6 +68,7 @@
6768
# General information about the project.
6869
project = 'esphomelib'
6970
copyright = '2018, Otto Winter'
71+
html_show_copyright = False
7072
author = 'Otto Winter'
7173

7274
# The version info for the project you're documenting, acts as replacement for
@@ -94,9 +96,9 @@
9496
# default_role = 'cpp:any'
9597

9698
# The name of the Pygments (syntax highlighting) style to use.
97-
pygments_style = 'sphinx'
99+
pygments_style = 'xcode'
98100

99-
# highlight_language = 'yaml'
101+
highlight_language = 'yaml'
100102

101103
primary_domain = None
102104

@@ -210,3 +212,4 @@
210212
'Miscellaneous'),
211213
]
212214
html_baseurl = os.getenv('BASE_URL', 'https://esphomelib.com')
215+
linkcheck_ignore = [r'https://github.com/.*', r'https://discord.gg/.*']

esphomeyaml/changelog/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ New Features
9494
- The current esphomelib version and compilation time are now printed on each boot
9595
(:libpr:`189`, :yamlpr:`159`):
9696

97-
.. code:: bash
97+
.. code-block:: text
9898
9999
[13:57:33][I][application:092]: You're running esphomelib v1.9.0 compiled on Nov 3 2018, 13:55:11
100100

esphomeyaml/changelog/v1.7.0.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Breaking Changes
9494
parameter. The accuracy now defaults to ``HIGH``.
9595
- The ``inverted`` option of binary sensors has been moved into the ``filters:`` section. So instead of
9696

97-
.. code:: yaml
97+
.. code-block:: yaml
9898
9999
binary_sensor:
100100
- platform: ...
@@ -103,7 +103,7 @@ Breaking Changes
103103
104104
you would now write:
105105

106-
.. code:: yaml
106+
.. code-block:: yaml
107107
108108
binary_sensor:
109109
- platform: ...

esphomeyaml/changelog/v1.8.0.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Other notable changes
121121

122122
- In actions, instead of
123123

124-
.. code:: yaml
124+
.. code-block:: yaml
125125
126126
on_...:
127127
then:
@@ -130,15 +130,15 @@ Other notable changes
130130

131131
You can now write:
132132

133-
.. code:: yaml
133+
.. code-block:: yaml
134134
135135
on_...:
136136
then:
137137
- switch.turn_on: my_switch
138138

139139
Or even shorter:
140140

141-
.. code:: yaml
141+
.. code-block:: yaml
142142
143143
on_...:
144144
- switch.turn_on: my_switch

esphomeyaml/components/ads1115.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To use this hub, first setup the :ref:`I²C Bus <i2c>` and connect the sensor to
1919

2020
.. _Adafruit: https://www.adafruit.com/product/1085
2121

22-
.. code:: yaml
22+
.. code-block:: yaml
2323
2424
ads1115:
2525
- address: 0x48

esphomeyaml/components/binary_sensor/esp32_ble_tracker.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ESP32 Bluetooth Low Energy Device
33

44
.. seo::
55
:description: Instructions for setting up BLE binary sensors for the ESP32.
6-
:image: bluetooth.svg
6+
:image: bluetooth.png
77

88
The ``esp32_ble_tracker`` binary sensor platform lets you track the presence of a
99
bluetooth low energy device.
@@ -12,7 +12,7 @@ bluetooth low energy device.
1212
:align: center
1313
:width: 80.0%
1414

15-
.. code:: yaml
15+
.. code-block:: yaml
1616
1717
# Example configuration entry
1818
esp32_ble_tracker:
@@ -44,7 +44,7 @@ to track. Most devices show this screen in some setting menu. If you don't know
4444
however, you can use the ``esp32_ble_tracker`` hub without any binary sensors attached and read through
4545
the logs to see discovered Bluetooth Low Energy devices.
4646

47-
.. code:: yaml
47+
.. code-block:: yaml
4848
4949
# Example configuration entry for finding MAC addresses
5050
esp32_ble_tracker:

esphomeyaml/components/binary_sensor/esp32_touch.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ESP32 Touch Pad Binary Sensor
33

44
.. seo::
55
:description: Instructions for setting up the touch pad on the ESP32.
6-
:image: touch.svg
6+
:image: touch.png
77

88
The ``esp32_touch`` binary sensor platform lets you use the touch peripheral of the
99
ESP32 to detect if a certain pin is being "touched".
@@ -17,7 +17,7 @@ an ``OFF`` state.
1717
:align: center
1818
:width: 80.0%
1919

20-
.. code:: yaml
20+
.. code-block:: yaml
2121
2222
# Example configuration entry
2323
esp32_touch:
@@ -72,7 +72,7 @@ to output measured values using the ``setup_mode:`` configuration option. Next,
7272
for the touch pads you want to observe. Also put some threshold in the configuration as seen below
7373
to make the validator happy, we are going to find good thresholds in a moment anyway.
7474

75-
.. code:: yaml
75+
.. code-block:: yaml
7676
7777
# Example configuration entry for finding threshold values
7878
esp32_touch:

0 commit comments

Comments
 (0)