Skip to content

Commit f187761

Browse files
Remove old documentation source, add README on migration
Signed-off-by: John Mulhausen <john@docker.com>
1 parent 83b2e02 commit f187761

Some content is hidden

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

52 files changed

+9
-5128
lines changed

docs/AVAILABLE_DRIVER_PLUGINS.md

Lines changed: 0 additions & 47 deletions
This file was deleted.

docs/DRIVER_SPEC.md

Lines changed: 0 additions & 149 deletions
This file was deleted.

docs/Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/Makefile

Lines changed: 0 additions & 38 deletions
This file was deleted.

docs/README.md

Lines changed: 9 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,13 @@
1-
<!--[metadata]>
2-
+++
3-
draft = true
4-
title = "Machine README"
5-
description = "Machine README"
6-
keywords = ["Docker, documentation, manual, guide, reference, api"]
7-
+++
8-
<![end-metadata]-->
1+
# The non-reference docs have been moved!
92

10-
# Contributing to the Docker Machine documentation
3+
The non-reference documentation for Docker Machine has been merged into
4+
[the general documentation repo](https://github.com/docker/docker.github.io).
115

12-
The documentation in this directory is part of the [this documentation](https://docs.docker.com). Docker uses [the Hugo static generator](http://gohugo.io/overview/introduction/) to convert project Markdown files to a static HTML site.
6+
The conceptual and guide docs for Docker Machine are now here:
7+
https://github.com/docker/docker.github.io/tree/master/machine
138

14-
You don't need to be a Hugo expert to contribute to the machine documentation. If you are familiar with Markdown, you can modify the content in the `docs` files.
9+
The reference docs remain in this repo, at:
10+
https://github.com/docker/machine/tree/master/docs/reference
1511

16-
If you want to add a new file or change the location of the document in the menu, you do need to know a little more. If you want the detail of contributing, [use our contributor guide](http://docs.docker.com/project/make-a-contribution/).
17-
18-
## Documentation contributing workflow
19-
20-
1. Edit a Markdown file in the tree.
21-
22-
2. Save your changes.
23-
24-
3. Make sure all your changes maintain an 80 character line wrap.
25-
26-
All check lines you've written. Don't wrap content you didn't change material.
27-
28-
4. Make sure you are in the `docs` subdirectory.
29-
30-
5. Build the documentation.
31-
32-
$ make docs
33-
---> ffcf3f6c4e97
34-
Removing intermediate container a676414185e8
35-
Successfully built ffcf3f6c4e97
36-
docker run --rm -it -e AWS_S3_BUCKET -e NOCACHE -p 8000:8000 -e DOCKERHOST "docs-base:test-tooling" hugo server --port=8000 --baseUrl=192.168.59.103 --bind=0.0.0.0
37-
ERROR: 2015/06/13 MenuEntry's .Url is deprecated and will be removed in Hugo 0.15. Use .URL instead.
38-
0 of 4 drafts rendered
39-
0 future content
40-
12 pages created
41-
0 paginator pages created
42-
0 tags created
43-
0 categories created
44-
in 55 ms
45-
Serving pages from /docs/public
46-
Web Server is available at http://0.0.0.0:8000/
47-
Press Ctrl+C to stop
48-
49-
6. Open the available server in your browser.
50-
51-
The documentation server has the complete menu but only the Docker machine
52-
documentation resolves. You can't access the other project docs from this
53-
localized build.
54-
55-
## Tips on Hugo metadata and menu positioning
56-
57-
The top of each Docker machine documentation file contains TOML metadata. The metadata is commented out to prevent it from appearing in GitHub.
58-
59-
<!--[metadata]>
60-
+++
61-
title = "Extending services in machine"
62-
description = "How to use Docker machine's extends keyword to share configuration between files and projects"
63-
keywords = ["fig, composition, machine, docker, orchestration, documentation, docs"]
64-
[menu.main]
65-
parent="workw_machine"
66-
weight=2
67-
+++
68-
<![end-metadata]-->
69-
70-
The metadata alone has this structure:
71-
72-
+++
73-
title = "Extending services in machine"
74-
description = "How to use Docker machine's extends keyword to share configuration between files and projects"
75-
keywords = ["fig, composition, machine, docker, orchestration, documentation, docs"]
76-
[menu.main]
77-
parent="workw_machine"
78-
weight=2
79-
+++
80-
81-
The `[menu.main]` section refers to navigation defined [in the main Docker menu](https://github.com/docker/docs-base/blob/hugo/config.toml). This metadata says _add a menu item called_ Extending services in machine _to the menu with the_ `smn_workdw_machine` _identifier_. If you locate the menu in the configuration, you'll find _Create multi-container applications_ is the menu title.
82-
83-
You can move an article in the tree by specifying a new parent. You can shift the location of the item by changing its weight. Higher numbers are heavier and shift the item to the bottom of menu. Low or no numbers shift it up.
84-
85-
## Other key documentation repositories
86-
87-
The `docker/docs-base` repository contains [the Hugo theme and menu configuration](https://github.com/docker/docs-base). If you open the `Dockerfile` you'll see the `make docs` relies on this as a base image for building the machine documentation.
88-
89-
The `docker/docs.docker.com` repository contains [build system for building the Docker documentation site](https://github.com/docker/docs.docker.com). Fork this repository to build the entire documentation site.
12+
As always, the docs in the general repo remain open-source and we appreciate
13+
your feedback and pull requests!

0 commit comments

Comments
 (0)