aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Øyvind A. Holm <sunny@sunbase.org>2015-04-17 18:32:03 +0200
committerGravatar Øyvind A. Holm <sunny@sunbase.org>2015-04-17 18:32:03 +0200
commit8b6fb5acc5c1dbf9e9a2fa5e654a3e2c0db629ba (patch)
treef280a392b2dc29e31b86fd92eeafc90c69f538d5
parent252b173b69de78dca0394a0d90bb4940ea4e4bca (diff)
More typo fixes in doc/*.mdwn
-rw-r--r--doc/git-union-merge.mdwn2
-rw-r--r--doc/preferred_content.mdwn6
-rw-r--r--doc/related_software.mdwn4
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn
index d0ceb3a8f..ca06d2f93 100644
--- a/doc/git-union-merge.mdwn
+++ b/doc/git-union-merge.mdwn
@@ -12,7 +12,7 @@ Does a union merge between two refs, storing the result in the
specified newref.
The union merge will always succeed, but assumes that files can be merged
-simply by concacenating together lines from all the oldrefs, in any order.
+simply by concatenating together lines from all the oldrefs, in any order.
So, this is useful only for branches containing log-type data.
Note that this does not touch the checked out working copy. It operates
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index 557305aae..d3aa4fa47 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -44,7 +44,7 @@ options in commands like this:
git annex get --include='*.mp3' --and -'(' --not --largerthan=100mb -')'
-The equivilant preferred content expression looks like this:
+The equivalent preferred content expression looks like this:
include=*.mp3 and (not largerthan=100mb)
@@ -63,7 +63,7 @@ to not retain those files, like this:
### difference: no "in="
-Preferred content expressions have no direct equivilant to `--in`.
+Preferred content expressions have no direct equivalent to `--in`.
Often, it's best to add repositories to groups, and match against
the groups in a preferred content expression. So rather than
@@ -146,7 +146,7 @@ expression tuned for your needs, and every repository you put in this
group and make its preferred content be "groupwanted" will use it.
For example, the archive group only wants to archive 1 copy of each file,
-spread amoung every repository in the group.
+spread among every repository in the group.
Here's how to configure a group named redundantarchive, that instead
wants to contain 3 copies of each file:
diff --git a/doc/related_software.mdwn b/doc/related_software.mdwn
index 4b6f42d2f..a0462f541 100644
--- a/doc/related_software.mdwn
+++ b/doc/related_software.mdwn
@@ -4,9 +4,9 @@ designed to interoperate with it.
* The [[git-annex assistant|assistant]] is included in git-annex,
and extends its use cases into new territory.
* [gitlab-shell](https://gitlab.com/gitlab-org/gitlab-shell) supports
- git-annex. So git-annex can be used with repositries served by Gitlab,
+ git-annex. So git-annex can be used with repositories served by GitLab,
including gitlab.com, or deploy your own.
- [See Gitlab's announcment](https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/)
+ [See GitLab's announcement](https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/)
* Emacs Org mode can auto-commit attached files to git-annex.
* [git annex darktable integration](https://github.com/xxv/darktable-git-annex)
* [Magit](http://github.com/magit/magit), an Emacs mode for Git, has