Skip to content

Commit 38bcee4

Browse files
authored
Merge pull request #4300 from thaJeztah/docs_cleanup_glossary
docs: remove deprecated things from glossary
2 parents 1ba91e3 + b222900 commit 38bcee4

1 file changed

Lines changed: 5 additions & 45 deletions

File tree

docs/reference/glossary.md

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,10 @@ keywords: "glossary, docker, terms, definitions"
1616

1717
A list of terms used around the Docker project.
1818

19-
## aufs
20-
21-
aufs (advanced multi layered unification filesystem) is a Linux [filesystem](#filesystem) that
22-
Docker supports as a storage backend. It implements the
23-
[union mount](https://en.wikipedia.org/wiki/Union_mount) for Linux file systems.
24-
2519
## base image
2620

2721
An image that has no parent is a **base image**.
2822

29-
## boot2docker
30-
31-
[boot2docker](https://boot2docker.io/) is a lightweight Linux distribution made
32-
specifically to run Docker containers. The boot2docker management tool for Mac and Windows was deprecated and replaced by [`docker-machine`](#machine) which you can install with the Docker Toolbox.
33-
3423
## bridge
3524

3625
In terms of generic networking, a bridge is a Link Layer device which forwards
@@ -183,7 +172,7 @@ and assign them locations for efficient storage and retrieval.
183172

184173
Examples :
185174

186-
- Linux : ext4, aufs, btrfs, zfs
175+
- Linux : ext4, btrfs, zfs
187176
- Windows : NTFS
188177
- macOS : HFS+
189178

@@ -214,15 +203,6 @@ links provide a legacy interface to connect Docker containers running on the
214203
same host to each other without exposing the hosts' network ports. Use the
215204
Docker networks feature instead.
216205

217-
## Machine
218-
219-
[Machine](https://github.com/docker/machine) is a Docker tool which
220-
makes it really easy to create Docker hosts on your computer, on
221-
cloud providers and inside your own data center. It creates servers,
222-
installs Docker on them, then configures the Docker client to talk to them.
223-
224-
*Also known as : docker-machine*
225-
226206
## node
227207

228208
A [node](https://docs.docker.com/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual
@@ -328,38 +308,18 @@ containers.
328308

329309
![services diagram](https://docs.docker.com/engine/swarm/images/services-diagram.png)
330310

331-
## Toolbox
332-
333-
[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy
334-
installer for Mac and Windows users. It uses Oracle VirtualBox for
335-
virtualization.
336-
337-
For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for
338-
Mac](https://docs.docker.com/docker-for-mac/) is the better solution.
339-
340-
For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise
341-
and Education), [Docker for
342-
Windows](https://docs.docker.com/docker-for-windows/) is the better solution.
343-
344311
## Union file system
345312

346-
Union file systems implement a [union
347-
mount](https://en.wikipedia.org/wiki/Union_mount) and operate by creating
313+
Union file systems implement a [union mount](https://en.wikipedia.org/wiki/Union_mount) and operate by creating
348314
layers. Docker uses union file systems in conjunction with
349315
[copy-on-write](#copy-on-write) techniques to provide the building blocks for
350316
containers, making them very lightweight and fast.
351317

352-
For more on Docker and union file systems, see [Docker and AUFS in
353-
practice](https://docs.docker.com/engine/userguide/storagedriver/aufs-driver/),
354-
[Docker and Btrfs in
355-
practice](https://docs.docker.com/engine/userguide/storagedriver/btrfs-driver/),
356-
and [Docker and OverlayFS in
357-
practice](https://docs.docker.com/engine/userguide/storagedriver/overlayfs-driver/)
318+
For more on Docker and union file systems, see [OverlayFS storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/),
319+
and [Btrfs storage driver](https://docs.docker.com/storage/storagedriver/btrfs-driver/).
358320

359321
Example implementations of union file systems are
360-
[UnionFS](https://en.wikipedia.org/wiki/UnionFS),
361-
[AUFS](https://en.wikipedia.org/wiki/Aufs), and
362-
[Btrfs](https://btrfs.wiki.kernel.org/index.php/Main_Page).
322+
[UnionFS](https://en.wikipedia.org/wiki/UnionFS), and [Btrfs](https://btrfs.wiki.kernel.org/index.php/Main_Page).
363323

364324
## virtual machine
365325

0 commit comments

Comments
 (0)