From a45edd9024b8fdbe1ace26d7bd8e39370e96ae52 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 31 May 2018 21:03:37 -0400 Subject: doc: ran `make format` With visual inspection that nothing got worse. --- doc/functions.xml | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'doc/functions.xml') diff --git a/doc/functions.xml b/doc/functions.xml index cdae96703f1..746ef7131f8 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -321,7 +321,8 @@ merge:"diff3" - name + + name @@ -330,7 +331,8 @@ merge:"diff3" - targetPkgs + + targetPkgs @@ -340,7 +342,8 @@ merge:"diff3" - multiPkgs + + multiPkgs @@ -351,7 +354,8 @@ merge:"diff3" - extraBuildCommands + + extraBuildCommands @@ -361,7 +365,8 @@ merge:"diff3" - extraBuildCommandsMulti + + extraBuildCommandsMulti @@ -371,7 +376,8 @@ merge:"diff3" - extraOutputsToInstall + + extraOutputsToInstall @@ -381,7 +387,8 @@ merge:"diff3" - extraInstallCommands + + extraInstallCommands @@ -391,7 +398,8 @@ merge:"diff3" - runScript + + runScript @@ -624,9 +632,9 @@ merge:"diff3" This function is analogous to the docker pull command, - in that can be used to pull a Docker image from a Docker registry. - By default Docker Hub - is used to pull images. + in that can be used to pull a Docker image from a Docker registry. By + default Docker Hub is + used to pull images. @@ -648,15 +656,15 @@ merge:"diff3" - imageName specifies the name of the image to be downloaded, - which can also include the registry namespace (e.g. nixos). - This argument is required. + imageName specifies the name of the image to be + downloaded, which can also include the registry namespace (e.g. + nixos). This argument is required. - imageDigest specifies the digest of the image - to be downloaded. Skopeo can be used to get the digest of an image + imageDigest specifies the digest of the image to be + downloaded. Skopeo can be used to get the digest of an image $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b @@ -666,10 +674,10 @@ merge:"diff3" - finalImageTag, if specified, this is the tag of - the image to be created. Note it is never used to fetch the image - since we prefer to rely on the immutable digest ID. By default - it's latest. + finalImageTag, if specified, this is the tag of the + image to be created. Note it is never used to fetch the image since we + prefer to rely on the immutable digest ID. By default it's + latest. -- cgit 1.4.1