From 7559f58396cd668dad85548db0b255ff184a95f3 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 07:19:11 +0100 Subject: [PATCH 1/6] remove blank line for better text placement --- docs/basics/101-116-sharelocal.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/basics/101-116-sharelocal.rst b/docs/basics/101-116-sharelocal.rst index 62aef251b..acf51fc4f 100644 --- a/docs/basics/101-116-sharelocal.rst +++ b/docs/basics/101-116-sharelocal.rst @@ -173,7 +173,6 @@ Let's now turn to the fact that the subdataset ``longnow`` contains neither file content nor file metadata information to explore the contents of the dataset: there are no subdirectories or any files under ``recordings/longnow/``. This is behavior that you have not observed until now. - To fix this and obtain file availability metadata, you have to run a somewhat unexpected command: From 7ddbbeb9982c52a404021613c3aff1e74dc7b288 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 07:42:21 +0100 Subject: [PATCH 2/6] Fix: shasum -> UUID --- docs/basics/101-117-sharelocal2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/basics/101-117-sharelocal2.rst b/docs/basics/101-117-sharelocal2.rst index b6c4fdd05..15462c77c 100644 --- a/docs/basics/101-117-sharelocal2.rst +++ b/docs/basics/101-117-sharelocal2.rst @@ -56,7 +56,7 @@ You can recognize a path to the dataset on your computer, prefixed with the user $ datalad create --description "course on DataLad-101 on my private laptop" -c text2git DataLad-101 the command would show ``course on DataLad-101 on my private laptop`` after - the :term:`shasum` -- and thus a more human-readable description of *where* + the :term:`UUID` -- and thus a more human-readable description of *where* file content is stored. This becomes especially useful when the number of repository copies increases. If you have only one other dataset it may be easy to From 64e85d35f219d697cdf4587f3d7b69cd7862ea9b Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 07:42:33 +0100 Subject: [PATCH 3/6] enclose quote in quotation marks --- docs/basics/101-117-sharelocal2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/basics/101-117-sharelocal2.rst b/docs/basics/101-117-sharelocal2.rst index 15462c77c..2947edf2b 100644 --- a/docs/basics/101-117-sharelocal2.rst +++ b/docs/basics/101-117-sharelocal2.rst @@ -134,7 +134,7 @@ The ``.mp3`` files in the ``longnow`` seminar series have registered web URLs [# $ git annex whereis Long_Now__Seminars_About_Long_term_Thinking/2003_11_15__Brian_Eno__The_Long_Now.mp3 $ datalad get Long_Now__Seminars_About_Long_term_Thinking/2003_11_15__Brian_Eno__The_Long_Now.mp3 -As you can see at the end of the ``get`` result, the files has been retrieved ``from web...``. +As you can see at the end of the ``get`` result, the files has been retrieved "``from web...``". Quite useful, this provenance, right? Let's add a note on the :gitannexcmd:`whereis` command. Again, do this in the original ``DataLad-101`` directory, and do not forget to save it. From 7246ba4c80fe4b5b15b39b588b88cb12a5dc7133 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 07:57:59 +0100 Subject: [PATCH 4/6] add missing fullstop --- docs/basics/101-121-siblings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/basics/101-121-siblings.rst b/docs/basics/101-121-siblings.rst index 158e1d73b..29894d3c7 100644 --- a/docs/basics/101-121-siblings.rst +++ b/docs/basics/101-121-siblings.rst @@ -137,7 +137,7 @@ but as you provide a path and not a URL, there is no host name to take as a defa As you can see in the command output, the addition of a :term:`sibling` succeeded: ``roommate(+)[../mock_user/DataLad-101]`` means that your room mate's dataset -is now known to your own dataset as "roommate" +is now known to your own dataset as "roommate". .. index:: pair: list dataset siblings; with DataLad From 9840ed2cd5059e2e8e492646f59b440f990e0772 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 07:58:11 +0100 Subject: [PATCH 5/6] move highlight to right line --- docs/basics/101-121-siblings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/basics/101-121-siblings.rst b/docs/basics/101-121-siblings.rst index 29894d3c7..2d2cf66e8 100644 --- a/docs/basics/101-121-siblings.rst +++ b/docs/basics/101-121-siblings.rst @@ -319,7 +319,7 @@ directory and also peek into the history: .. runrecord:: _examples/DL-101-121-112 :language: console :lines: 1-6 - :emphasize-lines: 2, 3 + :emphasize-lines: 2, 4 :workdir: dl-101/DataLad-101 :notes: and here is the summary in the log :cast: 04_collaboration From 20b5f9cd9d4f226290229de7c26954d5cbf4d776 Mon Sep 17 00:00:00 2001 From: Adina Wagner Date: Tue, 14 Nov 2023 08:01:32 +0100 Subject: [PATCH 6/6] improve wording of one summary statement --- docs/basics/101-120-summary.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/basics/101-120-summary.rst b/docs/basics/101-120-summary.rst index df5ccb47b..1543f1101 100644 --- a/docs/basics/101-120-summary.rst +++ b/docs/basics/101-120-summary.rst @@ -32,11 +32,10 @@ sharing a dataset with a simple example. file content sources. * :gitannexcmd:`whereis PATH` will list all locations known to contain file - content for a particular file. This location is where :term:`git-annex` - will attempt to retrieve file content from, and it is described with the - ``--description`` provided during a :dlcmd:`create`. It is a very + content for a particular file. It is a very helpful command to find out where file content resides, and how many - locations with copies exist. + locations with copies exist. :term:`git-annex` will try to retrieve file contents from those locations. If you want, you can describe locations with the + ``--description`` provided during a :dlcmd:`create`. * A shared copy of a dataset includes the datasets history. If well made, :dlcmd:`run` commands can then easily be ``rerun``.