diff options
Diffstat (limited to 'doc/design/assistant')
3 files changed, 3 insertions, 3 deletions
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 |