summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Richard Hartmann <richih@debian.org>2013-12-18 22:09:18 +0100
committerGravatar Richard Hartmann <richih@debian.org>2013-12-18 22:09:18 +0100
commit0c4743cb3801be500d5fd78a0d8880fa18eb3e7a (patch)
tree9e49218fd9eaedde86a8097c613c02e44ee6ffd6
parent2c62951f9843e447373e09dcc4d560d86136b11d (diff)
doc/: s/amoung/among/gi
Qouth ye olde [Wiktionary](http://en.wiktionary.org/wiki/amoung) Archaic spelling of among.
-rw-r--r--doc/bugs/Enable__47__paus_syncing_to_remote_ssh_server_with_multiple_directories/comment_1_e8affeca873c2ef73255f8f77e0ac16f._comment2
-rw-r--r--doc/bugs/Old_repository_stuck.mdwn2
-rw-r--r--doc/design/assistant/blog/day_199__wrapping_up_Android_for_now.mdwn2
-rw-r--r--doc/design/assistant/blog/day_312__DebConf_midpoint.mdwn2
-rw-r--r--doc/devblog/day_80__plumbing.mdwn2
-rw-r--r--doc/forum/Help_with_syncing_file_contents/comment_3_b26cfa20dc81517d93e760f4809bdc24._comment2
-rw-r--r--doc/tips/Using_Git-annex_as_a_web_browsing_assistant/comment_1_74167f9fff400f148916003468c77de4._comment2
-rw-r--r--doc/todo/branching.mdwn4
-rw-r--r--doc/todo/parallel_possibilities/comment_3_145fb974f45da99b7d4b117a3699cccf._comment2
-rw-r--r--doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn2
10 files changed, 11 insertions, 11 deletions
diff --git a/doc/bugs/Enable__47__paus_syncing_to_remote_ssh_server_with_multiple_directories/comment_1_e8affeca873c2ef73255f8f77e0ac16f._comment b/doc/bugs/Enable__47__paus_syncing_to_remote_ssh_server_with_multiple_directories/comment_1_e8affeca873c2ef73255f8f77e0ac16f._comment
index 02e4826a3..d25a46a98 100644
--- a/doc/bugs/Enable__47__paus_syncing_to_remote_ssh_server_with_multiple_directories/comment_1_e8affeca873c2ef73255f8f77e0ac16f._comment
+++ b/doc/bugs/Enable__47__paus_syncing_to_remote_ssh_server_with_multiple_directories/comment_1_e8affeca873c2ef73255f8f77e0ac16f._comment
@@ -4,7 +4,7 @@
subject="comment 1"
date="2013-03-16T21:56:37Z"
content="""
-Hmm, I can't quite reproduce this, but I did just fix a bug that, amoung other manifestations, caused the display of whether syncing is enabled for a remote to be wrong sometimes.
+Hmm, I can't quite reproduce this, but I did just fix a bug that, among other manifestations, caused the display of whether syncing is enabled for a remote to be wrong sometimes.
Can you send a copy of your repository's .git/config file to this bug report? (That's `annex/.git/config`)
"""]]
diff --git a/doc/bugs/Old_repository_stuck.mdwn b/doc/bugs/Old_repository_stuck.mdwn
index 46b153eb2..73903763d 100644
--- a/doc/bugs/Old_repository_stuck.mdwn
+++ b/doc/bugs/Old_repository_stuck.mdwn
@@ -5,5 +5,5 @@ I had created a test repository a time ago with an old version of git-annex. I d
* OS: Ubuntu 12.04.1 LTS 3.2.0-35-generic-pae #55-Ubuntu SMP Wed Dec 5 18:04:39 UTC 2012 i686 i686 i386 GNU/Linux
> This is [[fixed|done]] in git; assuming the repo was showing up
-> in the upper-right menu for switching amoung local repositories.
+> in the upper-right menu for switching among local repositories.
> --[[Joey]]
diff --git a/doc/design/assistant/blog/day_199__wrapping_up_Android_for_now.mdwn b/doc/design/assistant/blog/day_199__wrapping_up_Android_for_now.mdwn
index 0cd92137b..7d37e8f94 100644
--- a/doc/design/assistant/blog/day_199__wrapping_up_Android_for_now.mdwn
+++ b/doc/design/assistant/blog/day_199__wrapping_up_Android_for_now.mdwn
@@ -6,7 +6,7 @@ So I'm moving on to other things.
Today:
* Fixed a nasty regression that made `*` not match files in subdirectories.
- That broke the preferred content handling, amoung other things. I will
+ That broke the preferred content handling, among other things. I will
be pushing out a new release soon.
* As a last Android thing (for now), made the Android app automatically
run `git annex assistant --autostart` , so you can manually set up
diff --git a/doc/design/assistant/blog/day_312__DebConf_midpoint.mdwn b/doc/design/assistant/blog/day_312__DebConf_midpoint.mdwn
index 8e0758432..40c38aed4 100644
--- a/doc/design/assistant/blog/day_312__DebConf_midpoint.mdwn
+++ b/doc/design/assistant/blog/day_312__DebConf_midpoint.mdwn
@@ -15,7 +15,7 @@ Today is also the last day of the [campaign](https://campaign.joeyh.name/)!
----
There has been a ton of discussion about git-annex here at DebConf,
-including 3 BoF sessions that mostly focused on it, amoung other git stuff.
+including 3 BoF sessions that mostly focused on it, among other git stuff.
Also, RichiH will be presenting his
"[Gitify Your Life](http://penta.debconf.org/dc13_schedule/events/1025.en.html)"
talk on Friday; you can catch it on the [live stream](http://blog.debconf.org/blog/2013/08/14#hl_dc13_recordings).
diff --git a/doc/devblog/day_80__plumbing.mdwn b/doc/devblog/day_80__plumbing.mdwn
index a67a6faaa..465b9b3d1 100644
--- a/doc/devblog/day_80__plumbing.mdwn
+++ b/doc/devblog/day_80__plumbing.mdwn
@@ -1,6 +1,6 @@
Made some improvements to git-annex's plumbing level commands today. Added
new lookupkey and examinekey commands. Also expanded the things that
-`git annex find` can report about files. Amoung other things, the elusive
+`git annex find` can report about files. Among other things, the elusive
hash directory locations can now be looked up, which IIRC a few people have
asked for a way to do.
diff --git a/doc/forum/Help_with_syncing_file_contents/comment_3_b26cfa20dc81517d93e760f4809bdc24._comment b/doc/forum/Help_with_syncing_file_contents/comment_3_b26cfa20dc81517d93e760f4809bdc24._comment
index ff9902e8d..6293ada24 100644
--- a/doc/forum/Help_with_syncing_file_contents/comment_3_b26cfa20dc81517d93e760f4809bdc24._comment
+++ b/doc/forum/Help_with_syncing_file_contents/comment_3_b26cfa20dc81517d93e760f4809bdc24._comment
@@ -4,7 +4,7 @@
subject="comment 3"
date="2013-05-29T16:50:35Z"
content="""
-Treating each version of a file as a separate object that is stored and transmitted separately is one of the core simplifying assumptions of git-annex. Amoung other things it makes it easy to have dumb special remotes that are mere key/value stores. And it keeps it easy to understand.
+Treating each version of a file as a separate object that is stored and transmitted separately is one of the core simplifying assumptions of git-annex. Among other things it makes it easy to have dumb special remotes that are mere key/value stores. And it keeps it easy to understand.
I don't consider this a problem as far as storage goes. Disk space is cheap; git-annex allows dropping unused versions of files from repositories that are not on large cheap storage.
diff --git a/doc/tips/Using_Git-annex_as_a_web_browsing_assistant/comment_1_74167f9fff400f148916003468c77de4._comment b/doc/tips/Using_Git-annex_as_a_web_browsing_assistant/comment_1_74167f9fff400f148916003468c77de4._comment
index a091b8e48..4c5c3cdfa 100644
--- a/doc/tips/Using_Git-annex_as_a_web_browsing_assistant/comment_1_74167f9fff400f148916003468c77de4._comment
+++ b/doc/tips/Using_Git-annex_as_a_web_browsing_assistant/comment_1_74167f9fff400f148916003468c77de4._comment
@@ -4,5 +4,5 @@
subject="comment 1"
date="2013-04-11T20:16:02Z"
content="""
-As of my last commit, you don't really need a separate download manager. The webapp will now display urls that `git annex addurl` is downloading in amoung the other transfers.
+As of my last commit, you don't really need a separate download manager. The webapp will now display urls that `git annex addurl` is downloading in among the other transfers.
"""]]
diff --git a/doc/todo/branching.mdwn b/doc/todo/branching.mdwn
index ad7ece6f1..f65849584 100644
--- a/doc/todo/branching.mdwn
+++ b/doc/todo/branching.mdwn
@@ -22,7 +22,7 @@ A related problem though is the size of the tree objects git needs to
commit. Having the logs in a separate branch doesn't help with that.
As more keys are added, the tree object size will increase, and git will
take longer and longer to commit, and use more space. One way to deal with
-this is simply by splitting the logs amoung subdirectories. Git then can
+this is simply by splitting the logs among subdirectories. Git then can
reuse trees for most directories. (Check: Does it still have to build
dup trees in memory?)
@@ -54,7 +54,7 @@ Let's use one branch per uuid, named git-annex/$UUID.
- (BTW, UUIDs probably don't compress well, and this reduces the bloat of having
them repeated lots of times in the tree.)
- Per UUID branches mean that if it wants to find a file's location
- amoung configured remotes, it can examine only their branches, if
+ among configured remotes, it can examine only their branches, if
desired.
- It's important that the per-repo branches propigate beyond immediate
remotes. If there is a central bare repo, that means push --all. Without
diff --git a/doc/todo/parallel_possibilities/comment_3_145fb974f45da99b7d4b117a3699cccf._comment b/doc/todo/parallel_possibilities/comment_3_145fb974f45da99b7d4b117a3699cccf._comment
index a72a1456c..0d646a7a8 100644
--- a/doc/todo/parallel_possibilities/comment_3_145fb974f45da99b7d4b117a3699cccf._comment
+++ b/doc/todo/parallel_possibilities/comment_3_145fb974f45da99b7d4b117a3699cccf._comment
@@ -4,7 +4,7 @@
subject="comment 3"
date="2013-07-17T19:59:50Z"
content="""
-Note that git-annex now uses locks to communicate amoung multiple processes, so it's now possible to eg run two `git annex get` processes, and one will skip over the file the other is downloading and go on to the next file, and so on.
+Note that git-annex now uses locks to communicate among multiple processes, so it's now possible to eg run two `git annex get` processes, and one will skip over the file the other is downloading and go on to the next file, and so on.
This is an especially nice speedup when downloading encrypted data, since the decryption of one file will tend to happen while the other process is downloading the next file (assuming files of approximately the same size, and that decryption takes approxiately as long as downloading).
diff --git a/doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn b/doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn
index 341a9afa4..cb170dbe4 100644
--- a/doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn
+++ b/doc/todo/wishlist:_Prevent_repeated_password_prompts_for_one_command.mdwn
@@ -24,7 +24,7 @@ Simple, when performing various git annex command over ssh, in particular a mult
Slightly more elaborate design for using ssh connection caching:
* Per-uuid ssh socket in `.git/annex/ssh/user@host.socket`
-* Can be shared amoung concurrent git-annex processes as well as ssh
+* Can be shared among concurrent git-annex processes as well as ssh
invocations inside the current git-annex.
* Also a lock file, `.git/annex/ssh/user@host.lock`.
Open and take shared lock before running ssh; store lock in lock pool.