diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-08 09:50:27 +0100 |
| commit | ae474d8e14631ff519ed7d54bb64eaa0538f56d9 (patch) | |
| tree | 09637db5faf2632b67b581cf04463fe4493584d4 /doc/tips/github.mdwn | |
| parent | 0314ed459ba1c49fad9170a54cc05f1c9e9c96bf (diff) | |
| parent | 08e4472fc469c630ebef93e16a66a5a69d9cb33a (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/editpage.pm
debian/control
debian/copyright
doc/todo/need_global_renamepage_hook.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/tips/github.mdwn')
| -rw-r--r-- | doc/tips/github.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn index cd1b479d1..974d572f1 100644 --- 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 |