diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-16 12:53:33 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-16 12:53:33 -0400 |
commit | ee41aedb100415e6d5f99de5b0dedd686481e73c (patch) | |
tree | 7ff8d613e7af9609ae8086b7f0dc89f46597e475 | |
parent | 0517f9126cff724e62d92e4f637a1eca20f31ed7 (diff) | |
parent | fe4d7a6d3ad4915eb41cf0212821c1207457939c (diff) |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r-- | doc/forum/Darcs_as_the_RCS___63__.mdwn | 7 | ||||
-rw-r--r-- | doc/ikiwikiusers.mdwn | 1 | ||||
-rw-r--r-- | doc/install/discussion.mdwn | 4 | ||||
-rw-r--r-- | doc/users/xma.mdwn | 22 |
4 files changed, 34 insertions, 0 deletions
diff --git a/doc/forum/Darcs_as_the_RCS___63__.mdwn b/doc/forum/Darcs_as_the_RCS___63__.mdwn new file mode 100644 index 000000000..efc360573 --- /dev/null +++ b/doc/forum/Darcs_as_the_RCS___63__.mdwn @@ -0,0 +1,7 @@ +Hi, + +I have successfully installed and set up my first instance of [[ikiwiki]] on my dedicated server. Following [[joey]]'s screencasts made this easy (thank you). + +Currently, I have set up the RCS to be git but I do not like this very much. I'd rather want darcs but if I replace rcs settings, it fails. + +What should I put in the configuration file to use darcs ? diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index e5f978e12..ddf27d2c4 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,6 +101,7 @@ Personal sites and blogs * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[JonDowland]]'s [homepage](http://jmtd.net/) +* [[Xavier Maillard]] is using ikiwiki (http://maillard.mobi/~xma/wiki) Please feel free to add your own ikiwiki site! diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index abe909a94..18cf6e4f3 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -169,3 +169,7 @@ good. Date::Parse was already installed. --[[vibrog]] usemymalloc=n, bincompat5005=undef Not sure how to provide proper version information for you.--[[vibrog]] + +--- + +I've tried a couple of times and my cpan has never recognised Bundle::IkiWiki. Is that section of the page still accurate? -- [[JonDowland]] diff --git a/doc/users/xma.mdwn b/doc/users/xma.mdwn new file mode 100644 index 000000000..782b6eab6 --- /dev/null +++ b/doc/users/xma.mdwn @@ -0,0 +1,22 @@ +[[!meta title="Xavier Maillard"]] +# Xavier Maillard + +I just started using [[ikiwiki]] for my own webspace at http://maillard.mobi/~xma/wiki + +I am learning how to effectively use it. + +Anyway, [[ikiwiki]] is really *awesome* ! + +## More about me + +I am CLI user living in the linux console. More precisely, I live in an [[GNU Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]]. + +## Contacting me + +Various channels to contact me: + +- mail: xma@gnu.org +- jabber: xma01@jabber.fr +- mobile: +33 621-964-362 (I only anwser to people I know though) + +Voila. |