diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 10:57:56 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-21 10:57:56 +0200 |
commit | 9d54ea9b2d5a4fab5d6702081ad8ceacb71360d1 (patch) | |
tree | c59863616ade5fbe8e33aa764b2ba93f0039239a | |
parent | 16d733bbe58baa9e4dfd1912d13d7fdc59268212 (diff) |
doc: move image builders into new images chapter
-rw-r--r-- | doc/builders/images.xml | 12 | ||||
-rw-r--r-- | doc/builders/images/appimagetools.xml (renamed from doc/functions/appimagetools.xml) | 0 | ||||
-rw-r--r-- | doc/builders/images/dockertools.xml (renamed from doc/functions/dockertools.xml) | 0 | ||||
-rw-r--r-- | doc/builders/images/ocitools.xml (renamed from doc/functions/ocitools.xml) | 0 | ||||
-rw-r--r-- | doc/builders/images/snap/example-firefox.nix (renamed from doc/functions/snap/example-firefox.nix) | 0 | ||||
-rw-r--r-- | doc/builders/images/snap/example-hello.nix (renamed from doc/functions/snap/example-hello.nix) | 0 | ||||
-rw-r--r-- | doc/builders/images/snaptools.xml (renamed from doc/functions/snaptools.xml) | 0 | ||||
-rw-r--r-- | doc/functions.xml | 4 | ||||
-rw-r--r-- | doc/manual.xml | 1 |
9 files changed, 13 insertions, 4 deletions
diff --git a/doc/builders/images.xml b/doc/builders/images.xml new file mode 100644 index 0000000000000..5e042a8ada80a --- /dev/null +++ b/doc/builders/images.xml @@ -0,0 +1,12 @@ +<chapter xmlns="http://docbook.org/ns/docbook" + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="chap-images"> + <title>Images</title> + <para> + This chapter describes tools for creating various types of images. + </para> + <xi:include href="images/appimagetools.xml" /> + <xi:include href="images/dockertools.xml" /> + <xi:include href="images/ocitools.xml" /> + <xi:include href="images/snaptools.xml" /> +</chapter> diff --git a/doc/functions/appimagetools.xml b/doc/builders/images/appimagetools.xml index 37e4251cda2ea..37e4251cda2ea 100644 --- a/doc/functions/appimagetools.xml +++ b/doc/builders/images/appimagetools.xml diff --git a/doc/functions/dockertools.xml b/doc/builders/images/dockertools.xml index 2243453c3e972..2243453c3e972 100644 --- a/doc/functions/dockertools.xml +++ b/doc/builders/images/dockertools.xml diff --git a/doc/functions/ocitools.xml b/doc/builders/images/ocitools.xml index f61075b242f8a..f61075b242f8a 100644 --- a/doc/functions/ocitools.xml +++ b/doc/builders/images/ocitools.xml diff --git a/doc/functions/snap/example-firefox.nix b/doc/builders/images/snap/example-firefox.nix index d58c98a65a2e7..d58c98a65a2e7 100644 --- a/doc/functions/snap/example-firefox.nix +++ b/doc/builders/images/snap/example-firefox.nix diff --git a/doc/functions/snap/example-hello.nix b/doc/builders/images/snap/example-hello.nix index 123da80c54775..123da80c54775 100644 --- a/doc/functions/snap/example-hello.nix +++ b/doc/builders/images/snap/example-hello.nix diff --git a/doc/functions/snaptools.xml b/doc/builders/images/snaptools.xml index 422fcfa37d885..422fcfa37d885 100644 --- a/doc/functions/snaptools.xml +++ b/doc/builders/images/snaptools.xml diff --git a/doc/functions.xml b/doc/functions.xml index 81aef5f3a8306..29b27d7d0dea8 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -12,10 +12,6 @@ <xi:include href="functions/debug.xml" /> <xi:include href="functions/fhs-environments.xml" /> <xi:include href="functions/shell.xml" /> - <xi:include href="functions/dockertools.xml" /> - <xi:include href="functions/snaptools.xml" /> - <xi:include href="functions/appimagetools.xml" /> <xi:include href="functions/prefer-remote-fetch.xml" /> <xi:include href="functions/nix-gitignore.xml" /> - <xi:include href="functions/ocitools.xml" /> </chapter> diff --git a/doc/manual.xml b/doc/manual.xml index d0ded1e2e1673..525373a342729 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -24,6 +24,7 @@ <title>Builders</title> <xi:include href="builders/fetchers.xml" /> <xi:include href="builders/trivial-builders.xml" /> + <xi:include href="builders/images.xml" /> <xi:include href="languages-frameworks/index.xml" /> <xi:include href="packages/index.xml" /> </part> |