Skip to content

Commit 77c62c9

Browse files
authored
Merge pull request #3093 from squidfunk/docs/restructure-docs
Restructure documentation
2 parents 999fc3d + 47dee18 commit 77c62c9

Some content is hidden

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

62 files changed

+3074
-2677
lines changed

CHANGELOG

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ mkdocs-material-7.1.11+insiders-2.11.1 (2021-07-20)
138138

139139
mkdocs-material-7.1.11+insiders-2.11.0 (2021-07-18)
140140

141-
* Improved Mermaid.js intergration, now stable
141+
* Improved Mermaid.js integration, now stable
142142
* Added support for sequence diagrams
143143
* Added support for entity relationship diagrams
144144
* Added support for cookie consent configuration

docs/blog/2021/excluding-content-from-search.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ __The latest Insiders release brings three new simple ways to exclude
1414
dedicated parts of a document from the search index, allowing for more
1515
fine-grained control.__
1616

17-
<aside class="mdx-author" markdown="1">
17+
<aside class="mdx-author" markdown>
1818
![@squidfunk][1]
1919

2020
<span>__Martin Donath__ · @squidfunk</span>

docs/blog/2021/search-better-faster-smaller.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ __This is the story of how we managed to completely rebuild client-side search,
1414
delivering a significantly better user experience while making it faster and
1515
smaller at the same time.__
1616

17-
<aside class="mdx-author" markdown="1">
17+
<aside class="mdx-author" markdown>
1818
![@squidfunk][1]
1919

2020
<span>__Martin Donath__ · @squidfunk</span>
@@ -230,11 +230,11 @@ search previews appear not to include any occurrence of any of the search
230230
terms. This was due to the fact that search previews were [truncated after a
231231
maximum of 320 characters][15], as can be seen here:
232232
233-
<figure markdown="1">
233+
<figure markdown>
234234
235235
![Search previews][16]
236236
237-
<figcaption markdown="1">
237+
<figcaption markdown>
238238
239239
The first two results look like they're not relevant, as they don't seem to
240240
include the query string the user just searched for. Yet, they are.
@@ -499,7 +499,7 @@ digit `\d`, which leaves version numbers discoverable. Searching for
499499
[:octicons-search-24: 7.2.6][28] brings up the [7.2.6][29] release notes.
500500
501501
[28]: ?q=7.2.6
502-
[29]: ../../changelog.md#726-_-september-1-2021
502+
[29]: ../../changelog/index.md#726-_-september-1-2021
503503
504504
#### HTML/XML tags
505505
@@ -578,7 +578,7 @@ itself, and one with a very massive corpus of Markdown files with more than
578578
800,000 words – a size most documentation projects will likely never
579579
reach:
580580
581-
<figure markdown="1">
581+
<figure markdown>
582582
583583
| | Before | Now | Relative |
584584
| ----------------------- | -------: | -------------: | -----------: |
File renamed without changes.

docs/creating-your-site.md

+48-48
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ template: overrides/main.html
44

55
# Creating your site
66

7-
After you've [installed][1] Material for MkDocs, you can bootstrap your project
7+
After you've [installed] Material for MkDocs, you can bootstrap your project
88
documentation using the `mkdocs` executable. Go to the directory where you want
99
your project to be located and enter:
1010

@@ -35,14 +35,14 @@ This will create the following structure:
3535
└─ mkdocs.yml
3636
```
3737

38-
[1]: getting-started.md
38+
[installed]: getting-started.md
3939

4040
## Configuration
4141

4242
### Minimal configuration
4343

4444
Simply add the following lines to `mkdocs.yml` to enable the theme. Note that
45-
since there are several [installation methods][2], configuration might be
45+
since there are several [installation methods], minimal configuration might be
4646
slightly different:
4747

4848
=== "pip, docker"
@@ -77,53 +77,53 @@ slightly different:
7777
logo: logo
7878
```
7979

80-
_If you cloned Material for MkDocs from GitHub, you must list all of the themes'
81-
defaults, because_ [`mkdocs_theme.yml`][3] _is not loaded automatically as
82-
[described in the official documentation][4]._
80+
When you clone from GitHub, you must list all of the themes' defaults
81+
explicitly, because [`mkdocs_theme.yml`][mkdocs_theme.yml] is not
82+
loaded automatically as described in the [custom theme guide].
8383

84-
[2]: getting-started.md#installation
85-
[3]: https://github.com/squidfunk/mkdocs-material/blob/master/src/mkdocs_theme.yml
86-
[4]: https://www.mkdocs.org/user-guide/custom-themes/#creating-a-custom-theme
84+
[installation methods]: getting-started.md#installation
85+
[mkdocs_theme.yml]: https://github.com/squidfunk/mkdocs-material/blob/master/src/mkdocs_theme.yml
86+
[custom theme guide]: https://www.mkdocs.org/user-guide/custom-themes/#creating-a-custom-theme
8787

8888
### Advanced configuration
8989

90-
Material for MkDocs comes with many configuration options. The _setup_ section
90+
Material for MkDocs comes with many configuration options. The setup section
9191
explains in great detail how to configure and customize colors, fonts, icons
9292
and much more:
9393

94-
<div class="mdx-columns" markdown="1">
95-
96-
- [Changing the colors][5]
97-
- [Changing the fonts][6]
98-
- [Changing the language][7]
99-
- [Changing the logo and icons][8]
100-
- [Setting up navigation][9]
101-
- [Setting up site search][10]
102-
- [Setting up site analytics][11]
103-
- [Setting up social cards][12]
104-
- [Setting up tags][13]
105-
- [Setting up versioning][14]
106-
- [Setting up the header][15]
107-
- [Setting up the footer][16]
108-
- [Adding a git repository][17]
109-
- [Adding a comment system][18]
94+
<div class="mdx-columns" markdown>
95+
96+
- [Changing the colors]
97+
- [Changing the fonts]
98+
- [Changing the language]
99+
- [Changing the logo and icons]
100+
- [Setting up navigation]
101+
- [Setting up site search]
102+
- [Setting up site analytics]
103+
- [Setting up social cards]
104+
- [Setting up tags]
105+
- [Setting up versioning]
106+
- [Setting up the header]
107+
- [Setting up the footer]
108+
- [Adding a git repository]
109+
- [Adding a comment system]
110110

111111
</div>
112112

113-
[5]: setup/changing-the-colors.md
114-
[6]: setup/changing-the-fonts.md
115-
[7]: setup/changing-the-language.md
116-
[8]: setup/changing-the-logo-and-icons.md
117-
[9]: setup/setting-up-navigation.md
118-
[10]: setup/setting-up-site-search.md
119-
[11]: setup/setting-up-site-analytics.md
120-
[12]: setup/setting-up-social-cards.md
121-
[13]: setup/setting-up-tags.md
122-
[14]: setup/setting-up-versioning.md
123-
[15]: setup/setting-up-the-header.md
124-
[16]: setup/setting-up-the-footer.md
125-
[17]: setup/adding-a-git-repository.md
126-
[18]: setup/adding-a-comment-system.md
113+
[Changing the colors]: setup/changing-the-colors.md
114+
[Changing the fonts]: setup/changing-the-fonts.md
115+
[Changing the language]: setup/changing-the-language.md
116+
[Changing the logo and icons]: setup/changing-the-logo-and-icons.md
117+
[Setting up navigation]: setup/setting-up-navigation.md
118+
[Setting up site search]: setup/setting-up-site-search.md
119+
[Setting up site analytics]: setup/setting-up-site-analytics.md
120+
[Setting up social cards]: setup/setting-up-social-cards.md
121+
[Setting up tags]: setup/setting-up-tags.md
122+
[Setting up versioning]: setup/setting-up-versioning.md
123+
[Setting up the header]: setup/setting-up-the-header.md
124+
[Setting up the footer]: setup/setting-up-the-footer.md
125+
[Adding a git repository]: setup/adding-a-git-repository.md
126+
[Adding a comment system]: setup/adding-a-comment-system.md
127127

128128
## Previewing as you write
129129

@@ -149,12 +149,12 @@ If you're running Material for MkDocs from within Docker, use:
149149
docker run --rm -it -p 8000:8000 -v "%cd%":/docs squidfunk/mkdocs-material
150150
```
151151

152-
Point your browser to [localhost:8000][19] and you should see:
152+
Point your browser to [localhost:8000][live preview] and you should see:
153153

154-
[![Creating your site][20]][20]
154+
[![Creating your site]][Creating your site]
155155

156-
[19]: http://localhost:8000
157-
[20]: assets/screenshots/creating-your-site.png
156+
[live preview]: http://localhost:8000
157+
[Creating your site]: assets/screenshots/creating-your-site.png
158158

159159
## Building your site
160160

@@ -167,8 +167,8 @@ mkdocs build
167167

168168
The contents of this directory make up your project documentation. There's no
169169
need for operating a database or server, as it is completely self-contained.
170-
The site can be hosted on [GitHub Pages][21], [GitLab Pages][22], a CDN of your
171-
choice or your private web space.
170+
The site can be hosted on [GitHub Pages], [GitLab Pages], a CDN of your choice
171+
or your private web space.
172172

173-
[21]: publishing-your-site.md#github-pages
174-
[22]: publishing-your-site.md#gitlab-pages
173+
[GitHub Pages]: publishing-your-site.md#github-pages
174+
[GitLab pages]: publishing-your-site.md#gitlab-pages

0 commit comments

Comments
 (0)