summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Edward Betts <edward@4angle.com>2017-02-11 09:38:49 +0000
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-12 17:30:23 -0400
commitc6e4dcca673841f29449c8c2bf85fa41b31da12f (patch)
treea0e16f9c52f6690be527044031607d97fae7d706 /doc/design
parentf765752568381ca2f003c08e9601fb2b5c397b5b (diff)
correct spelling mistakes
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/assistant/blog/day_126__mr_watson_come_here.mdwn2
-rw-r--r--doc/design/assistant/blog/day_172__short_day.mdwn2
-rw-r--r--doc/design/assistant/blog/day_195__real_android_app/comment_13_4f6bc0680f2debd638933968a26975e0._comment2
-rw-r--r--doc/design/assistant/upgrading.mdwn2
-rw-r--r--doc/design/caching_database.mdwn2
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/design/assistant/blog/day_126__mr_watson_come_here.mdwn b/doc/design/assistant/blog/day_126__mr_watson_come_here.mdwn
index 78d263b6d..0dd600cc8 100644
--- a/doc/design/assistant/blog/day_126__mr_watson_come_here.mdwn
+++ b/doc/design/assistant/blog/day_126__mr_watson_come_here.mdwn
@@ -13,7 +13,7 @@ at debugging output to find:
messages.
2. The git-receive-pack side waited on the wrong thread, so didn't
notice when the program was done.
-3. I accidentially used the wrong attribute name when sending a ReceivePackDone
+3. I accidentally used the wrong attribute name when sending a ReceivePackDone
message.
But all in all, it just worked.
diff --git a/doc/design/assistant/blog/day_172__short_day.mdwn b/doc/design/assistant/blog/day_172__short_day.mdwn
index 031f90e0f..80a32d87e 100644
--- a/doc/design/assistant/blog/day_172__short_day.mdwn
+++ b/doc/design/assistant/blog/day_172__short_day.mdwn
@@ -1,5 +1,5 @@
Only one bug fix today, but it was a doozie. It seems that gpg2 has an
-incompatability with the gpg 1.x that git-annex was written for, that
+incompatibility with the gpg 1.x that git-annex was written for, that
causes large numbers of excess passphrase prompts, when it's supposed to be
using a remote's symmetric encryption key. Adding the --batch parameter
fixed this.
diff --git a/doc/design/assistant/blog/day_195__real_android_app/comment_13_4f6bc0680f2debd638933968a26975e0._comment b/doc/design/assistant/blog/day_195__real_android_app/comment_13_4f6bc0680f2debd638933968a26975e0._comment
index 57a601530..455029a41 100644
--- a/doc/design/assistant/blog/day_195__real_android_app/comment_13_4f6bc0680f2debd638933968a26975e0._comment
+++ b/doc/design/assistant/blog/day_195__real_android_app/comment_13_4f6bc0680f2debd638933968a26975e0._comment
@@ -6,5 +6,5 @@
content="""
@Karsten does KBOX work on this version of Android? <http://kevinboone.net/Term-debug.apk>
-It may well be that this is just too old and incompatable for the terminal to work.
+It may well be that this is just too old and incompatible for the terminal to work.
"""]]
diff --git a/doc/design/assistant/upgrading.mdwn b/doc/design/assistant/upgrading.mdwn
index b1d658c8b..1395d0cd8 100644
--- a/doc/design/assistant/upgrading.mdwn
+++ b/doc/design/assistant/upgrading.mdwn
@@ -21,7 +21,7 @@ restarts itself.
To clean up the old installation, a git-annex.MANIFEST file is looked for
in it, and the files listed, as well as empty directories, are deleted.
-I don't want to accidentially delete something I didn't ship!
+I don't want to accidentally delete something I didn't ship!
## restart on upgrade
diff --git a/doc/design/caching_database.mdwn b/doc/design/caching_database.mdwn
index 87efd9810..c27c9557c 100644
--- a/doc/design/caching_database.mdwn
+++ b/doc/design/caching_database.mdwn
@@ -87,7 +87,7 @@ MVars.)
(Note that if the database is a cache, there is no need to perform migrations
when querying it. My benchmarks skip `runMigration`. Instead, if the query
-fails, the database doesn't exist, or uses an incompatable schema, and the
+fails, the database doesn't exist, or uses an incompatible schema, and the
cache can be rebuilt then. This avoids the problem that persistent's migrations
can sometimes fail.)