diff --git a/doc/git-annex-add.mdwn b/doc/git-annex-add.mdwn index 05de37c929..aab54d090d 100644 --- a/doc/git-annex-add.mdwn +++ b/doc/git-annex-add.mdwn @@ -24,7 +24,7 @@ modification of their content unless unlocked by [[git-annex-unlock]](1). (This is not the case however when a repository is in a filesystem not supporting symlinks, or is in direct mode.) To add a file to the annex in unlocked form, `git add` can be used instead -(that only works when the repository has annex.version 6 or higher). +(that only works in repository v7 or higher). This command can also be used to add symbolic links, both symlinks to annexed content, and other symlinks. diff --git a/doc/git-annex-pre-commit.mdwn b/doc/git-annex-pre-commit.mdwn index 21e5aef68f..a08845bbb0 100644 --- a/doc/git-annex-pre-commit.mdwn +++ b/doc/git-annex-pre-commit.mdwn @@ -17,7 +17,7 @@ point to annexed content. When in a view, updates metadata to reflect changes made to files in the view. -When in a repository that has not been upgraded to annex.version 6, +When in a repository that has not been upgraded to v7, also handles injecting changes to unlocked files into the annex. # SEE ALSO diff --git a/doc/git-annex-unlock.mdwn b/doc/git-annex-unlock.mdwn index b5dcc7e5e7..9e93fc7287 100644 --- a/doc/git-annex-unlock.mdwn +++ b/doc/git-annex-unlock.mdwn @@ -14,10 +14,10 @@ symlink for each specified file with the file's content. You can then modify it and `git annex add` (or `git commit`) to save your changes. -In repositories with annex.version 5 or earlier, unlocking a file is local -to the repository, and is temporary. With version 6, unlocking a file +In v5 repositories, unlocking a file is local +to the repository, and is temporary. In v7 repositories, unlocking a file changes how it is stored in the git repository (from a symlink to a pointer -file), so you can commit it like any other change. Also in version 6, you +file), so you can commit it like any other change. Also in v7, you can use `git add` to add a file to the annex in unlocked form. This allows workflows where a file starts out unlocked, is modified as necessary, and is locked once it reaches its final version. @@ -26,7 +26,7 @@ Normally, unlocking a file requires a copy to be made of its content, so that its original content is preserved, while the copy can be modified. To use less space, annex.thin can be set to true; this makes a hard link to the content be made instead of a copy. (Only when supported by the file -system, and only in repository version 6.) While this can save considerable +system, and only in v7 and higher.) While this can save considerable disk space, any modification made to a file will cause the old version of the file to be lost from the local repository. So, enable annex.thin with care. diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 1cb95b8245..fff75e31f2 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -901,7 +901,7 @@ Here are all the supported configuration settings. Set to true to make commands like `git-annex add` that add files to the repository add them in unlocked form. The default is to add files in - locked form. This only has effect in version 6 repositories. + locked form. This only has effect in v7 repositories. When a repository has core.symlinks set to false, it implicitly sets annex.addunlocked to true. diff --git a/doc/install/comment_8_1330a5413b720eca0103a0880d24eb2d._comment b/doc/install/comment_8_1330a5413b720eca0103a0880d24eb2d._comment index 08e4a3d2b9..29b8c07a31 100644 --- a/doc/install/comment_8_1330a5413b720eca0103a0880d24eb2d._comment +++ b/doc/install/comment_8_1330a5413b720eca0103a0880d24eb2d._comment @@ -3,5 +3,5 @@ subject="""comment 8""" date="2018-10-04T18:24:07Z" content=""" -@seregynp, you need git-annex version 6 to use that. +@seregynp, you need git-annex version 7 to use that. """]]