Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / tips / github.mdwn

diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn
index cd1b479d1e6b8d425bb4fe5cd0a207ba4ae39727..974d572f1aa555467753b30364fa41abcb5ac010 100644 (file)
--- a/doc/tips/github.mdwn
+++ b/doc/tips/github.mdwn
@@ -1,5 +1,5 @@
 Here's how to set up a static wiki or blog using ikiwiki with no hosting
-feeds. Everything is hosted on github, both the git repository and the web
+fees. Everything is hosted on github, both the git repository and the web
 site. Your laptop is used to generate and publish changes to it.
 
 This is possible because github now supports