Skip to content

Commit 5606b06

Browse files
committed
Updated documentation
1 parent 2174497 commit 5606b06

File tree

22 files changed

+359
-338
lines changed

22 files changed

+359
-338
lines changed

.github/assets/sponsors/basler.png

-15.7 KB
Binary file not shown.

.github/assets/sponsors/cirrus-ci.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.
-22.4 KB
Binary file not shown.

.github/assets/sponsors/kx.svg

Lines changed: 0 additions & 8 deletions
This file was deleted.
-46.7 KB
Binary file not shown.

CONTRIBUTING.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ Have a question? Before you do, please read the following guidelines.
88
### Got a question or problem?
99

1010
For quick questions there's no need to open an issue as you can reach us on
11-
[gitter.im][1].
11+
[gitter.im].
1212

13-
[1]: https://gitter.im/squidfunk/mkdocs-material
13+
[gitter.im]: https://gitter.im/squidfunk/mkdocs-material
1414

1515
### Found a bug?
1616

1717
If you found a bug in the source code, you can help us by submitting an issue
18-
to the [issue tracker][2] in our GitHub repository. Even better, you can submit
18+
to the [issue tracker] in our GitHub repository. Even better, you can submit
1919
a Pull Request with a fix. However, before doing so, please read the
20-
[submission guidelines][3].
20+
[submission guidelines].
2121

22-
[2]: https://github.com/squidfunk/mkdocs-material/issues
23-
[3]: #submission-guidelines
22+
[issue tracker]: https://github.com/squidfunk/mkdocs-material/issues
23+
[submission guidelines]: #submission-guidelines
2424

2525
### Missing a feature?
2626

@@ -62,21 +62,21 @@ Search GitHub for an open or closed PR that relates to your submission. You
6262
don't want to duplicate effort. If you do not find a related issue or PR,
6363
go ahead.
6464

65-
1. **Development**: Fork the project, set up the [development environment][4],
66-
make your changes in a separate git branch and add descriptive messages to
67-
your commits.
65+
1. **Development**: Fork the project, set up the [development environment],
66+
make your changes in a separate git branch and add descriptive messages to
67+
your commits.
6868

69-
2. **Build**: Before submitting a pull requests, [build the theme][5]. This is
70-
a mandatory requirement for your PR to get accepted, as the theme should at
71-
all times be installable through GitHub.
69+
2. **Build**: Before submitting a pull requests, [build the theme]. This is
70+
a mandatory requirement for your PR to get accepted, as the theme should at
71+
all times be installable through GitHub.
7272

73-
3. **Pull Request**: After building the theme, commit the compiled output, push
74-
your branch to GitHub and send a PR to `mkdocs-material:master`. If we
75-
suggest changes, make the required updates, rebase your branch and push the
76-
changes to your GitHub repository, which will automatically update your PR.
73+
3. **Pull Request**: After building the theme, commit the compiled output,
74+
push your branch to GitHub and send a PR to `mkdocs-material:master`. If we
75+
suggest changes, make the required updates, rebase your branch and push the
76+
changes to your GitHub repository, which will automatically update your PR.
7777

7878
After your PR is merged, you can safely delete your branch and pull the changes
7979
from the main (upstream) repository.
8080

81-
[4]: https://squidfunk.github.io/mkdocs-material/customization/#environment-setup
82-
[5]: https://squidfunk.github.io/mkdocs-material/customization/#build-process
81+
[development environment]: https://squidfunk.github.io/mkdocs-material/customization/#environment-setup
82+
[build the theme]: https://squidfunk.github.io/mkdocs-material/customization/#build-process

README.md

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,23 @@
6262
<p id="premium-sponsors" align="center"><strong>Special thanks</strong> to our <strong>premium sponsors</strong>:</p>
6363
<p>&nbsp;</p>
6464
<p align="center">
65-
<a href="https://www.manticoregames.com/" target=_blank><img
66-
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/manticoregames.png" height="40"
67-
/></a>&nbsp;&nbsp;&nbsp;&nbsp;
68-
<a href="https://kx.com/" target=_blank><img
69-
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/kx.svg" height="40"
70-
/></a>&nbsp;&nbsp;
71-
<a href="https://hummingbot.io/" target=_blank><img
72-
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/hummingbot.png" height="40"
73-
/></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
74-
<a href="https://docs.baslerweb.com/" target=_blank><img
75-
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/basler.png" height="40"
76-
/></a>&nbsp;&nbsp;
7765
<a href="https://cirrus-ci.org/" target=_blank><img
78-
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/cirrus-ci.svg" height="40"
66+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-cirrus-ci.png" height="65"
67+
/></a>
68+
<a href="https://docs.baslerweb.com/" target=_blank><img
69+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-basler.png" height="65"
70+
/></a>
71+
<a href="https://hummingbot.io/" target=_blank><img
72+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-hummingbot.png" height="65"
73+
/></a><br />
74+
<a href="https://kx.com/" target=_blank><img
75+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-kx.png" height="65"
76+
/></a>
77+
<a href="https://www.manticoregames.com/" target=_blank><img
78+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-manticore-games.png" height="65"
79+
/></a>
80+
<a href="https://www.accounttechnologies.com/" target=_blank><img
81+
src="https://raw.githubusercontent.com/squidfunk/mkdocs-material/master/.github/assets/sponsors/sponsor-account-technologies.png" height="65"
7982
/></a>
8083
</p>
8184
<p>&nbsp;</p>
@@ -88,7 +91,7 @@
8891

8992
* **... but there's more** — integrates natively with Python Markdown
9093
Extensions, adding callouts, tabbed content containers, mathematical formulas,
91-
critic markup, task lists, and [more than 10k icons and emojis][2].
94+
critic markup, task lists, and [more than 10k icons and emojis][icons-emojis].
9295

9396
* **Responsive by design** — built from the ground up to work on all kinds of
9497
devices – from mobile phones to widescreens. The underlying fluid layout will
@@ -114,15 +117,17 @@
114117
on top of TypeScript, RxJS, and SCSS, bringing excellent possibilities for
115118
theme extension and customization.
116119

117-
_Material for MkDocs uses the [sponsorware][3] release strategy, which means
118-
that new features are first exclusively released to sponsors as part of Material
119-
for MkDocs Insiders. Read on to learn [how sponsorship works][4], and how you
120-
can [become a sponsor][5]._
120+
Material for MkDocs follows the __sponsorware__ release strategy, which means
121+
that new features are first exclusively released to sponsors as part of
122+
[Insiders]. Read on to learn [what sponsorships achieve],
123+
[how to become a sponsor] to get access to Insiders, and
124+
[what's in for you][available features]!
121125

122-
[2]: https://squidfunk.github.io/mkdocs-material/reference/icons-emojis/#search
123-
[3]: https://github.com/sponsorware/docs
124-
[4]: https://squidfunk.github.io/mkdocs-material/insiders/#how-sponsorship-works
125-
[5]: https://squidfunk.github.io/mkdocs-material/insiders/#how-to-become-a-sponsor
126+
[icons-emojis]: https://squidfunk.github.io/mkdocs-material/reference/icons-emojis/
127+
[Insiders]: https://squidfunk.github.io/mkdocs-material/insiders/#what-is-insiders
128+
[what sponsorships achieve]: https://squidfunk.github.io/mkdocs-material/insiders/#what-sponsorships-achieve
129+
[how to become a sponsor]: https://squidfunk.github.io/mkdocs-material/insiders/#how-to-become-a-sponsor
130+
[available features]: https://squidfunk.github.io/mkdocs-material/insiders/#available-features
126131

127132
## Quick start
128133

@@ -140,9 +145,9 @@ theme:
140145
```
141146
142147
For other installation methods, configuration options, and a demo, visit
143-
[squidfunk.github.io/mkdocs-material][1]
148+
[squidfunk.github.io/mkdocs-material][Material for MkDocs]
144149
145-
[1]: https://squidfunk.github.io/mkdocs-material/
150+
[Material for MkDocs]: https://squidfunk.github.io/mkdocs-material/
146151
147152
## Trusted by ...
148153

docs/creating-your-site.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ and much more:
117117

118118
</div>
119119

120+
Furthermore, see the list of supported [Markdown extensions] that are natively
121+
integrated with Material for MkDocs, delivering a low-effort and unprecedented
122+
technical writing experience.
123+
120124
[Changing the colors]: setup/changing-the-colors.md
121125
[Changing the fonts]: setup/changing-the-fonts.md
122126
[Changing the language]: setup/changing-the-language.md
@@ -131,6 +135,7 @@ and much more:
131135
[Setting up the footer]: setup/setting-up-the-footer.md
132136
[Adding a git repository]: setup/adding-a-git-repository.md
133137
[Adding a comment system]: setup/adding-a-comment-system.md
138+
[Markdown extensions]: setup/extensions/index.md
134139

135140
## Previewing as you write
136141

docs/getting-started.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ The following plugins are bundled with the Docker image:
5858

5959
??? question "How to add plugins to the Docker image?"
6060

61-
Material for MkDocs bundles useful and common plugins while trying not to
62-
blow up the size of the official image. If the plugin you want to use is
63-
not included, create a new `Dockerfile` and extend the official Docker image
64-
with your custom installation routine:
61+
Material for MkDocs only bundles selected plugins in order to keep the size
62+
of the official image small. If the plugin you want to use is not included,
63+
create a new `Dockerfile` and extend the official Docker image:
6564

6665
``` Dockerfile
6766
FROM squidfunk/mkdocs-material

docs/insiders/getting-started.md

Lines changed: 52 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,40 @@ title: Switching to Insiders
55

66
# Switching to Insiders
77

8-
Material for MkDocs Insiders is a fully compatible drop-in replacement for
9-
Material for MkDocs, and can be installed similar to the public version using
10-
[`pip`][pip], [`docker`][docker] or [`git`][git]. When you sponsor @squidfunk,
11-
your account is added to the list of collaborators of the private Insiders
12-
repository.
8+
Material for MkDocs Insiders is a fully compatible drop-in replacement[^1] for
9+
Material for MkDocs, and can be installed similarily using [`pip`][pip],
10+
[`docker`][docker] or [`git`][git]. Note that in order to get access to the
11+
Insiders repository, you need to [become an eligible sponsor] of @squidfunk.
12+
13+
[^1]:
14+
While Insiders always strives for full downward compatibility with Material
15+
for MkDocs, there are some cases which slightly deviate from the non-Insiders,
16+
17+
because
18+
configuration can't be shared due to limitations of MkDocs. This is
19+
particularly true for the `plugins` configuration, as Insiders provides
20+
several built-in plugins.
1321

1422
[pip]: #with-pip
1523
[docker]: #with-docker
1624
[git]: #with-git
25+
[become an eligible sponsor]: index.md#how-to-become-a-sponsor
1726

1827
## Requirements
1928

20-
In order to access the Insiders repository programmatically (from the command
29+
After you've been added to the list of collaborators and accepted the
30+
invitation, the Insiders repository programmatically (from the command
2131
line or GitHub Actions workflows), you need to create a [personal access
22-
token][4]:
32+
token]:
2333

2434
1. Go to https://github.com/settings/tokens
25-
2. Click on [Generate a new token][5]
26-
3. Enter a name and select the [`repo`][6] scope
35+
2. Click on [Generate a new token]
36+
3. Enter a name and select the [`repo`][scopes] scope
2737
4. Generate the token and store it in a safe place
2838

29-
[4]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token
30-
[5]: https://github.com/settings/tokens/new
31-
[6]: https://docs.github.com/en/developers/apps/scopes-for-oauth-apps#available-scopes
39+
[personal access token]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token
40+
[Generate a new token]: https://github.com/settings/tokens/new
41+
[scopes]: https://docs.github.com/en/developers/apps/scopes-for-oauth-apps#available-scopes
3242

3343
## Installation
3444

@@ -49,27 +59,28 @@ private repositories.
4959

5060
In case you want to use Material for MkDocs Insiders from within Docker, some
5161
additional steps are necessary. While we cannot provide a hosted Docker image
52-
for Insiders[^1], [GitHub Container Registry][7] allows for simple and
62+
for Insiders[^2], [GitHub Container Registry] allows for simple and
5363
comfortable self-hosting:
5464

55-
1. [Fork the Insiders repository][8]
56-
2. Enable [GitHub Actions][9] on your fork[^2]
57-
3. Create a new personal access token[^3]
65+
1. [Fork the Insiders repository]
66+
2. Enable [GitHub Actions] on your fork[^3]
67+
3. Create a new personal access token[^4]
5868
1. Go to https://github.com/settings/tokens
59-
2. Click on [Generate a new token][5]
60-
3. Enter a name and select the [`write:packages`][10] scope
69+
2. Click on [Generate a new token]
70+
3. Enter a name and select the [`write:packages`][scopes] scope
6171
4. Generate the token and store it in a safe place
62-
4. Add a [GitHub Actions secret][11] on your fork
72+
4. Add a [GitHub Actions secret] on your fork
6373
1. Set the name to `GHCR_TOKEN`
6474
2. Set the value to the personal access token created in the previous step
65-
5. [Create a new release][12] to build and publish the Docker image
66-
6. Install [Pull App][13] on your fork to stay in-sync with upstream
75+
5. [Create a new release] to build and publish the Docker image
76+
6. Install [Pull App] on your fork to stay in-sync with upstream
6777

68-
The [`publish`][14] workflow[^4] is automatically run when a new tag (release)
69-
is created. When a new Insiders version is released on the upstream repository,
70-
the [Pull App][13] will create a pull request with the changes and pull in the
71-
new tag, which is picked up by the [`publish`][14] workflow that builds and
72-
publishes the Docker image automatically to your private registry.
78+
The [`publish`][publish] workflow[^5] is automatically run when a new tag
79+
(release) is created. When a new Insiders version is released on the upstream
80+
repository, the [Pull App] will create a pull request with the changes and
81+
pull in the new tag, which is picked up by the [`publish`][publish] workflow
82+
that builds and publishes the Docker image automatically to your private
83+
registry.
7384

7485
Now, you should be able to pull the Docker image from your private registry:
7586

@@ -78,23 +89,23 @@ docker login -u ${GH_USERNAME} -p ${GHCR_TOKEN} ghcr.io
7889
docker pull ghcr.io/${GH_USERNAME}/mkdocs-material-insiders
7990
```
8091

81-
[^1]:
92+
[^2]:
8293
Earlier, Insiders provided a dedicated Docker image which was available to
8394
all sponsors. On March 21, 2021, the image was deprecated for the reasons
8495
outlined and discussed in #2442. It was removed on June 1, 2021.
8596

86-
[^2]:
97+
[^3]:
8798
When forking a repository, GitHub will disables all workflows. While this
8899
is a reasonable default setting, you need to enable GitHub Actions to be
89100
able to automatically build and publish a Docker image on
90-
[GitHub Container Registry][7].
101+
[GitHub Container Registry].
91102

92-
[^3]:
103+
[^4]:
93104
While you could just add the `write:packages` scope to the personal access
94105
token created to access the Insiders repository, it's safer to create a
95106
dedicated token which you'll only use for publishing the Docker image.
96107

97-
[^4]:
108+
[^5]:
98109
The Insiders repository contains three GitHub Actions workflows:
99110

100111
- `build.yml` – Build and lint the project (disabled on forks)
@@ -117,11 +128,13 @@ plugins:
117128
pip install -e mkdocs-material
118129
```
119130

120-
[7]: https://docs.github.com/en/packages/guides/about-github-container-registry
121-
[8]: https://github.com/squidfunk/mkdocs-material-insiders/fork
122-
[9]: https://docs.github.com/en/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository
123-
[10]: https://docs.github.com/en/developers/apps/scopes-for-oauth-apps#available-scopes
124-
[11]: https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository
125-
[12]: https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release
126-
[13]: https://github.com/apps/pull
127-
[14]: https://github.com/squidfunk/mkdocs-material-insiders/blob/master/.github/workflows/publish.yml
131+
[GitHub Container Registry]: https://docs.github.com/en/packages/guides/about-github-container-registry
132+
[Fork the Insiders repository]: https://github.com/squidfunk/mkdocs-material-insiders/fork
133+
[GitHub Actions]: https://docs.github.com/en/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository
134+
[packages scope]: https://docs.github.com/en/developers/apps/scopes-for-oauth-apps#available-scopes
135+
[GitHub Actions secret]: https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository
136+
[Create a new release]: https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release
137+
[Pull App]: https://github.com/apps/pull
138+
[publish]: https://github.com/squidfunk/mkdocs-material-insiders/blob/master/.github/workflows/publish.yml
139+
140+
## Caveats

0 commit comments

Comments
 (0)