Merge branch 'master' of git://github.com/joeyh/ikiwiki

master
Amitai Schlair 2009-09-04 15:02:58 -05:00
commit ab88adc5e4
31 changed files with 37 additions and 240 deletions

View File

@ -65,3 +65,32 @@ Could you please enlighten me. It should be possible seeing for example this sit
Thanks in advance,
--[[PaulePanter]]
---
## Current Working Notes
I've spent a little time getting this working and I wanted to share my notes on this, for those that come after me.
### My Setup
- Debian Lenny
- Gitosis (hand compiled, for no good reason, but it's the same version as in the repository)
- Ikiwiki 3.12 installed using packages from Sid
### What Works
- Everything needs to be chowned git:git (or gitosis:gitosis) by whatever gitosis runs with. This includes:
- the bare repository (as always)
- the srcdir
- the destdir
- Ikiwiki needs to run in gitosis' group (eg. git in my case, but probably gitosis in yours)
- ikiwiki.cgi needs be set with the wrapper mode 6755.
-- [[tychoish]]

View File

@ -1,39 +1,7 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
----
2009/7/13 Monday Blue...\\
While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
* I thought that creole markup is used by ikiwiki...
* Thought about using //SVN/CVS// server, however with different idea
* Kinda curious why **Tcl** does not show her face in this Wiki arena
* It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
---
Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr.
☺ becomes ☺
<script>alert("If this pops, ikiwiki is not cross site scripting safe."); /* Fortunately, this does not work. */</script>
---
I try to have a discussion page !!!
----
Testing OpenID some more..
test more test
[[中文显示]]
Here's a paragraph.
The following code block is pre-formatted:
Testing what
pre-formatted code blocks
look like.
Here's another one with *emphasised* text.
# Header
@ -59,10 +27,6 @@ Numbered list
1. And another..
1. foo
2. bar
3. baz
4. qux
5. quux
6. wibble
Bulleted list
@ -71,9 +35,6 @@ Bulleted list
* item
* one
* two
* three
* four
* five
----
@ -82,102 +43,15 @@ Bulleted list
----
The haiku will change after every save, mind you.
## Different sorts of links:
* [[Features]]
* [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
* <http://www.gnu.org/>
* [GNU](http://www.gnu.org/)
* [Email](mailto:noone@invalid)
* [![ikiwiki logo](http://ikiwiki.info/logo/ikiwiki.png)](http://ikiwiki.info)
* <a href="http://www.google.com/">plain old html link</a>
* [[foo]]
-----
This SandBox is also a [[blog]]!
[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
--------
This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
But, of course, rsync is better.
----
Let's see what happens... ~~
#中文标题一
##中文标题二
###中文标题三
...
######中文标题六
###正文:
君不见,黄河之水天上来,奔流到海不复回。
君不见,高堂明镜悲白发,朝如青丝暮成雪。
人生得意须尽欢,莫使金樽空对月。
天生我材必有用,千金散尽还复来。
###列表:
* 天空
1. 蓝色的
2. 好高啊
* 海洋
1. 有鱼
* 鲸鱼
* 鲨鱼
* 大地
###链接:
[谷歌](http://www.google.com)
###引用:
> 一级引用
>
> 一级引用
>
> > 二级引用
>
>> 没有空格也可以
>>> 三级引用
>
> 回到一级引用
----
testing
--
[[!toc levels=2]]
[[Mamma Mia]]
----
[[!format c """
void main () {
printf("hello, world!");
}
"""]]

View File

@ -1,6 +0,0 @@
This is a testing Blag-Entry.
/me loves blagging.
* Entry one
* entry two

View File

@ -1,3 +0,0 @@
Just a test page ...
... to see what happens.

View File

@ -1,25 +0,0 @@
!!!Heading Three
Itemized
* list
* of
* things
or not
1. mom
1. hi
1. there
!!!Heading Three
Itemized
* list
* of
* things
or not
1. mom
1. hi
1. there

View File

@ -1,31 +0,0 @@
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow>
<msup>
<mfenced open="(" close=")">
<mrow>
<mi>a</mi>
<mo>+</mo>
<mi>b</mi>
</mrow>
</mfenced>
<mn>2</mn>
</msup>
<mo>-</mo>
<msub>
<mfenced open="{" close="}">
<mrow>
<mi>x</mi>
<mo>+</mo>
<mi>y</mi>
</mrow>
</mfenced>
<mi>i</mi>
</msub>
</mrow>
</math>
<br>
test <b>test</b><abbr title="test">T.</abbr> <h1>test</h1>
<a href="https://bugzilla.mozilla.org">øđ</a>

View File

@ -1 +0,0 @@
what happens?

View File

@ -1,2 +0,0 @@
[[!teximg code="E = - \frac{Z^2 \cdot \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]

View File

@ -1,6 +0,0 @@
# Title with $\TeX$
* How about some math?
* $\frac{1}{2} = \frac{3}{6}$
and teximg? [[!teximg code="\frac{1}{2}"]]

View File

@ -1 +0,0 @@
foo?

View File

@ -1 +0,0 @@
This just a test, but I am impressed.

View File

@ -1,3 +0,0 @@
I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[users/Jon]]
Context: [[todo/discussion_page_as_blog/discussion/castle]]

View File

@ -1 +0,0 @@
I like this idea of using the blog feature to handle comments. Let's see how it works.

View File

@ -1 +0,0 @@
wibble

View File

@ -1,6 +0,0 @@
normally a sandbow doesn't have a discussion page
but it's a sandbox
-
little light
ikiwiki looks great

View File

@ -1 +0,0 @@
a test blog in the ikiwiki sandbox!

View File

@ -1 +0,0 @@
Foobaka bakfoo.

View File

@ -1 +0,0 @@
hehe hohoho

View File

@ -1,5 +0,0 @@
##Why?
* Because I can do things like this
* Because I can use my favourite SCM, as the rest of my project elements (that's the only reason I complain about Trac...)
* Because the perfect tool does not exist, but custommizing very simple approaches like this I can build my own
* Because I'm just adding a new topic to see how diff works

View File

@ -1 +0,0 @@
testing my openid provider @ www.steve.org.uk

View File

@ -1 +0,0 @@
this is test two, being pushed by [[tips/untrusted_git_push]].

View File

@ -1,3 +0,0 @@
Testing nested inlines:
[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]

View File

@ -1 +0,0 @@
I tried to make a page called **testπ** and it didn't work. So this is a page called **test pi**.

View File

@ -1 +0,0 @@
hi mom!

View File

@ -1 +0,0 @@
Test page content.

View File

@ -1,3 +0,0 @@
# Test subpage
This is a test subpage. Isn't that special?

View File

@ -1 +0,0 @@
I am very impressed.

View File

@ -1 +0,0 @@
~를 어떻게 할까~

View File

@ -1,2 +0,0 @@
Wow test

View File

@ -1,5 +1,10 @@
I'm [tycho](http://www.tychoish.com/).
I'm Sam Kleinman ([tychoish](http://www.tychoish.com/)), and I use ikiwiki.
I use ikiwiki *a lot* on my local machine to organize thoughts, stage writing projects, and collect information. It's a great thing for me. Someday I'll probably get around to using it to powersome sort of collaborative fiction project. Someday.
I used to use ikiwiki a bunch, in a purely local setup, for various projects and personal note taking of various kinds. I've since switched to using [orgmode](http://www.orgmode.org) and a number of just regular old git repositories with some textfiles in them, which seems to work just as well for my particular use case.
Talk to you soon.
Currently, I'm using ikiwiki on the [cyborg institute wiki](http://www.cyborginstitute.com/wiki/) and I'm working on helping someone develop a collaborative fiction project at the [critical futures wiki](http://www.criticalfutures.com/wiki/)... and I'm thinking about other projects, but nothing that exists enough to mention here.
I hang out in #ikiwiki on oftc, and I'm working on getting some of my templates in order to share with you all. Soon. For sure.
Cheers,
tychoish