summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
Diffstat (limited to 'doc/design')
-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
2 files changed, 2 insertions, 2 deletions
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).