Skip to content

Commit 069dddc

Browse files
author
Kingdon Barrett
committed
chore(all): upgrade mkdocs past 1.0
* break absolutely everything ...and fix one thing * follow-up squashed from 9fc541b: seems to be fixed at least mostly? squash b8ba25a squash 9fc541b
1 parent b92b7f3 commit 069dddc

6 files changed

Lines changed: 16 additions & 15 deletions

File tree

mkdocs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ pages:
115115
- v2.2.0: changelogs/v2.2.0.md
116116
- v2.1.0: changelogs/v2.1.0.md
117117
- v2.0.0: changelogs/v2.0.0.md
118-
theme_dir: themes/deis
118+
theme:
119+
name: null
120+
custom_dir: 'themes/deis'
119121
docs_dir: src
120122
markdown_extensions:
121123
- markdown_checklist.extension

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
mkdocs==0.15.3
1+
mkdocs==1.0.3
22
markdown-checklist==0.4.1
33
markdown-include==0.5.1

src/index.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ application configuration, creating and rolling back releases, managing domain n
99
certificates, providing seamless edge routing, aggregating logs, and sharing applications with
1010
teams. All of this is exposed through a simple REST API and command line interface.
1111

12-
Please note that this documentation is for Deis Workflow (v2). For v1 documentation visit
13-
<http://docs.deis.io/en/latest/>.
12+
Please note that this documentation is for Hephy Workflow (v2.19.4). Older versions of Deis and
13+
Hephy Workflow are not supported.
1414

1515
## Getting Started
1616

@@ -24,8 +24,7 @@ Feel like contibuting some code or want to get started as a maintainer? Pick an
2424

2525
## Service and Support
2626

27-
If you are interested in commercial service and support for Deis Workflow, check out the various
28-
[services offerings on deis.com](https://deis.com/services).
27+
Coming soon.
2928

3029

3130
[arch]: understanding-workflow/architecture.md

src/roadmap/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ and then verify `stable` artifacts are available and appropriately updated after
254254
```
255255
$ curl -sSL https://raw.githubusercontent.com/teamhephy/workflow-cli/master/install-v2.sh | bash -s v2.18.0
256256
$ ./deis version
257-
# (Should show $WORKFLOW_RELEASE) # FIXME: builds of CLI should match the current Workflow release.)
257+
# (Should show $WORKFLOW_RELEASE)
258258
```
259259

260260
### Step 10: Let Everyone Know
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<head>
88
<meta charset="utf-8" />
99
<meta http-equiv="x-ua-compatible" content="ie=edge">
10-
<meta name="keywords" content="{{ meta['keywords'] if meta }}" />
10+
<meta name="keywords" content="{{ page.meta['keywords'] if page.meta }}" />
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
12-
<meta name="description" content="{{ page_description if page_description }}" />
13-
{% if canonical_url %}<link rel="canonical" href="{{ canonical_url }}">{% endif %}
12+
<meta name="description" content="{{ config.site_description if config.site_description }}" />
13+
{% if page.canonical_url %}<link rel="canonical" href="{{ page.canonical_url }}">{% endif %}
1414

1515
<meta name="msvalidate.01" content="079E754911917142D42AB2A3694F9267" />
1616
<meta name="msvalidate.01" content="08598E7D936D9217891AE6C1665A645D" />
1717

18-
<title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
18+
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
1919

2020
<script type="text/javascript">var documentationBaseURL = "{{ base_url}}"</script>
2121
<link rel="icon" href="{{ base_url }}/static/img/favicon/favicon.png" type="image/png">
@@ -42,7 +42,7 @@
4242
<div class="container">
4343
<div class="row">
4444
<div class="small-12">
45-
{{ content }}
45+
{{ page.content }}
4646
</div>
4747
</div>
4848
</div>
@@ -62,7 +62,7 @@
6262
<script src="{{ path }}" async></script>
6363
{% endfor %}
6464

65-
{% if google_analytics %}
65+
{% if config.google_analytics %}
6666
<script>
6767
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
6868
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

themes/deis/nav.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% for nav_item in nav %}
22
<li class="toctree-l1{% if nav_item.active %} current{% endif %}">
3-
<a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url }}">{{ nav_item.title }}</a>
3+
<a class="reference internal{% if nav_item.active %} current{% endif %}"{% if nav_item.active %} state="open"{% endif %} href="{{ nav_item.url | url }}">{{ nav_item.title }}</a>
44
{% if nav_item.children %}
55
<ul style="display: none;"{% if nav_item.active %} class="current"{% endif %}>
66
{% for child in nav_item.children %}
77
<li class="toctree-l2{% if child.active %} current{% endif %}">
8-
<a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url }}">{{ child.title }}</a>
8+
<a class="reference internal{% if nav_item.active %} current{% endif %}" id="{{ child.title }}" href="{{ child.url | url }}">{{ child.title }}</a>
99
</li>
1010
{% endfor %}
1111
</ul>

0 commit comments

Comments
 (0)