aboutsummaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Yaroslav Halchenko <debian@onerussian.com>2016-06-01 21:46:58 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-06-02 11:22:18 -0400
commit0d555aa363482ed041db2d9c63da271ba7f4ced8 (patch)
tree189747b6aa7476f0f974bf76329f04a19732dde4 /doc/design
parent023e0e5a4f25b6a2acba401826bcdcc940039682 (diff)
minor typo fixes throughout
problematic flexibility
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/adjusted_branches.mdwn4
-rw-r--r--doc/design/assistant/blog/day_110__more_dropping.mdwn2
-rw-r--r--doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment2
-rw-r--r--doc/design/assistant/blog/day_261__Windows_first_stage_complete.mdwn2
-rw-r--r--doc/design/iabackup.mdwn2
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 79231247c..7946e6405 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -229,7 +229,7 @@ better to delete it from the work tree, but keep the branch as-is. Then
But, not maintaining an adjusted branch complicates other things. See
WORKTREE notes throughout this page. Overall, the WORKTREE approach seems
-too problimatic.
+too problematic.
Ah, but we know that when adjustment #2 is in place, any file that `git annex
get` could act on is not in the index. So, it could look at the master branch
@@ -242,7 +242,7 @@ index in that case.
## problems
-Using `git checkout` when in an adjusted branch is problimatic, because a
+Using `git checkout` when in an adjusted branch is problematic, because a
non-adjusted branch would then be checked out. But, we can just say, if
you want to get into an adjusted branch, you have to run git annex adjust
Or, could make a post-checkout hook. This is would mostly be confusing when
diff --git a/doc/design/assistant/blog/day_110__more_dropping.mdwn b/doc/design/assistant/blog/day_110__more_dropping.mdwn
index afa256c77..71fb01ab1 100644
--- a/doc/design/assistant/blog/day_110__more_dropping.mdwn
+++ b/doc/design/assistant/blog/day_110__more_dropping.mdwn
@@ -11,7 +11,7 @@ if this will slow down git-annex in some use cases; might need to add more
higher-level caching. It was a very minimal cache anyway, just of one file.
Removed support for "in=" from preferred content expressions. That was
-problimatic in two ways. First, it referred to a remote by name, but
+problematic in two ways. First, it referred to a remote by name, but
preferred content expressions can be evaluated elsewhere, where that remote
doesn't exist, or a different remote has the same name. This name lookup
code could error out at runtime. Secondly, "in=" seemed pretty useless, and
diff --git a/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment b/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment
index e47b03d48..09613cc90 100644
--- a/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment
+++ b/doc/design/assistant/blog/day_16__more_robust_syncing/comment_2_8e7e7cd27791bb47625e60a284e9c802._comment
@@ -6,5 +6,5 @@
content="""
That's a good question. Unfortunatly they cannot; X and Y need to be stable across repositories, and git remotes can have different names in different repositories.
-Even using the description that git-annex stores for each repository for X and Y is problimatic, since that description can change, and so could be different in two repos that are each trying to resolve the same merge conflict.
+Even using the description that git-annex stores for each repository for X and Y is problematic, since that description can change, and so could be different in two repos that are each trying to resolve the same merge conflict.
"""]]
diff --git a/doc/design/assistant/blog/day_261__Windows_first_stage_complete.mdwn b/doc/design/assistant/blog/day_261__Windows_first_stage_complete.mdwn
index 8107336f0..4d7c9582e 100644
--- a/doc/design/assistant/blog/day_261__Windows_first_stage_complete.mdwn
+++ b/doc/design/assistant/blog/day_261__Windows_first_stage_complete.mdwn
@@ -7,7 +7,7 @@ I didn't have to add many stubs today, either. Many of the missing Windows
features were only used in code paths that made git-annex faster, but I
could fall back to a slower code path on Windows.
-The things that are most problimatic so far:
+The things that are most problematic so far:
* POSIX file locking. This is used in git-annex in several places to
make it safe when multiple git-annex processes are running. I put in
diff --git a/doc/design/iabackup.mdwn b/doc/design/iabackup.mdwn
index da437aa19..8133c2332 100644
--- a/doc/design/iabackup.mdwn
+++ b/doc/design/iabackup.mdwn
@@ -92,7 +92,7 @@ decided to remove content.
annex.diskreserve)
2. Note that [[numcopies|copies]] and [[preferred_content]] settings can be
used to make clients only want to download an file if it's not yet
- reached the desired number of copies. Lots of flexability here in
+ reached the desired number of copies. Lots of flexibility here in
git-annex.
3. git-annex will push back to the server an updated git-annex branch,
which will record when it has successfully stored an file.