Skip to content

Commit

Permalink
Merge pull request #626 from stgraber/streams
Browse files Browse the repository at this point in the history
doc: Update references to mage docs
  • Loading branch information
brauner authored Mar 16, 2024
2 parents c9e9fa8 + f01c976 commit 16ffaac
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/cloud-init.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Rebooting the instance does not re-trigger the actions.

To use `cloud-init`, you must base your instance on an image that has `cloud-init` installed:

* All images from the `ubuntu` and `ubuntu-daily` {ref}`image servers <remote-image-servers>` have `cloud-init` support.
* All images from the `ubuntu` and `ubuntu-daily` {ref}`image servers <image-servers>` have `cloud-init` support.
* Images from the [`images` remote](https://images.linuxcontainers.org/) have `cloud-init`-enabled variants, which are usually bigger in size than the default variant.
The cloud variants use the `/cloud` suffix, for example, `images:ubuntu/22.04/cloud`.

Expand Down
2 changes: 1 addition & 1 deletion doc/howto/images_copy.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ There are several ways of obtaining such image files:

- Exporting an existing image (see {ref}`images-manage-export`)
- Building your own image using `distrobuilder` (see {ref}`images-create-build`)
- Downloading image files from a {ref}`remote image server <remote-image-servers>` (note that it is usually easier to {ref}`use the remote image <images-remote>` directly instead of downloading it to a file and importing it)
- Downloading image files from a {ref}`remote image server <image-servers>` (note that it is usually easier to {ref}`use the remote image <images-remote>` directly instead of downloading it to a file and importing it)

### Import from the local file system

Expand Down
4 changes: 2 additions & 2 deletions doc/howto/images_remote.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# How to use remote images

The [`incus`](incus.md) CLI command is pre-configured with several remote image servers.
See {ref}`remote-image-servers` for an overview.
See {ref}`image-servers` for an overview.

## List configured remotes

Expand All @@ -13,7 +13,7 @@ To see all configured remote servers, enter the following command:

Remote servers that use the [simple streams format](https://git.launchpad.net/simplestreams/tree/) are pure image servers.
Servers that use the `incus` format are Incus servers, which either serve solely as image servers or might provide some images in addition to serving as regular Incus servers.
See {ref}`remote-image-server-types` for more information.
See {ref}`image-server-types` for more information.
<!-- Include end list remotes -->

## List available images on a remote
Expand Down
2 changes: 1 addition & 1 deletion doc/image-handling.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Incus uses an image-based workflow.
Each instance is based on an image, which contains a basic operating system (for example, a Linux distribution) and some Incus-related information.

Images are available from remote image stores (see {ref}`remote-image-servers` for an overview), but you can also create your own images, either based on an existing instances or a rootfs image.
Images are available from remote image stores (see {ref}`image-servers` for an overview), but you can also create your own images, either based on an existing instances or a rootfs image.

You can copy images from remote servers to your local image store, or copy local images to remote servers.
You can also use a local image to create a remote instance.
Expand Down
2 changes: 1 addition & 1 deletion doc/remotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Remote servers are a concept in the Incus command-line client.
By default, the command-line client interacts with the local Incus daemon, but you can add other servers or clusters to interact with.

One use case for remote servers is to distribute images that can be used to create instances on local servers.
See {ref}`remote-image-servers` for more information.
See {ref}`image-servers` for more information.

You can also add a full Incus server as a remote server to your client.
In this case, you can interact with the remote server in the same way as with your local daemon.
Expand Down

0 comments on commit 16ffaac

Please sign in to comment.