diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-29 18:07:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-29 18:07:04 -0400 |
| commit | a6b78c97d86b776544b01eaa595d5d335d11731a (patch) | |
| tree | 221ea80451653b0abaef2011d6a8e1b33d18befa /doc | |
| parent | c29957e0177c3c654a1ea1feffdba00307449560 (diff) | |
| parent | da58a21d2832fe95fad992d2031c73add5a33300 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/users/jogo.mdwn | 4 | ||||
| -rw-r--r-- | doc/users/joshtriplett.mdwn | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn index 2a6577990..6f87cbc45 100644 --- a/doc/users/jogo.mdwn +++ b/doc/users/jogo.mdwn @@ -1,3 +1,5 @@ -I'm looking at Ikiwiki, searching the best Wiki. The only other one I've found is [werc](http://werc.cat-v.org/). + * An [economic game](http://sef.matabio.net/) in french, which [use](http://sef.matabio.net/wiki/) IkiWiki. + * Some [plugins](http://kimya.matabio.net/tcgi/hg/IkiPlugins/file/). + * An alternative [base wiki](http://kimya.matabio.net/tcgi/hg/FrIkiWiki/file/) in french. email: `jogo matabio net`. diff --git a/doc/users/joshtriplett.mdwn b/doc/users/joshtriplett.mdwn index f85c068c3..29178057c 100644 --- a/doc/users/joshtriplett.mdwn +++ b/doc/users/joshtriplett.mdwn @@ -6,9 +6,10 @@ Email: `josh@{joshtriplett.org,freedesktop.org,kernel.org,psas.pdx.edu}`. Proud user of ikiwiki. -Currently working on scripts to convert MoinMoin and TWiki wikis to -ikiwikis backed by a git repository, including full history. -Available from the following repositories, though not well-documented: +Worked on scripts to convert MoinMoin and TWiki wikis to ikiwikis backed by a +git repository, including full history. Used for a couple of wikis, and now no +longer maintained, but potentially still useful. Available from the following +repositories, though not well-documented: git clone git://svcs.cs.pdx.edu/git/wiki2iki/moin2iki git clone git://svcs.cs.pdx.edu/git/wiki2iki/html-wikiconverter |