Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn b/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
new file mode 100644 (file)
index 0000000..2f11e2e
--- /dev/null
+++ b/doc/bugs/Unable_to_add_attachments_to_some_pages.mdwn
@@ -0,0 +1,14 @@
+I can add attachment to some pages within an ikiwiki site. ( for example the index page ), but I'm unable to add attachments to other child pages.
+
+When I try I get the error message "Error: bad attachment filename".  I can successfully attach the same file to the index page.
+
+I'm running
+
+ikiwiki version 3.20100815.7 on Debian Squeeze.
+
+Please advise.
+
+
+> I get the following error in apache error.log
+> Died at /usr/share/perl5/IkiWiki/CGI.pm line 466.
+> -- [[aland]]

diff --git a/doc/forum/Flowplayer/comment_1_75d13cd915a736422db47e00dbe46671._comment b/doc/forum/Flowplayer/comment_1_75d13cd915a736422db47e00dbe46671._comment
new file mode 100644 (file)
index 0000000..159e9dc
--- /dev/null
+++ b/doc/forum/Flowplayer/comment_1_75d13cd915a736422db47e00dbe46671._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="Sphynkx"
+ ip="85.238.106.185"
+ subject="Videoplugin"
+ date="2011-06-27T02:27:19Z"
+ content="""
+Hello!!
+Test my [videoplugin](http://ikiwiki.info/plugins/contrib/video/)!!
+"""]]

diff --git a/doc/forum/nginx:_404_plugin_not_working.mdwn b/doc/forum/nginx:_404_plugin_not_working.mdwn
index b39dde1100c0f5edc7923b97f3da377602262567..dd23e3128af41806c979485037ee798c10304f0d 100644 (file)
--- a/doc/forum/nginx:_404_plugin_not_working.mdwn
+++ b/doc/forum/nginx:_404_plugin_not_working.mdwn
@@ -8,4 +8,5 @@ If i use the [[shell script for lighttpd|bugs/404_plugin_and_lighttpd]], ikiwiki
 
 Might this be a mistake by me or does anyone know a workaround to get the 404 plugin working with nginx? --[[bacuh]]
 
-    
+
+

diff --git a/doc/forum/nginx:_404_plugin_not_working/comment_5_0720cd8842dc1cb338b74a0e6fdb2aac._comment b/doc/forum/nginx:_404_plugin_not_working/comment_5_0720cd8842dc1cb338b74a0e6fdb2aac._comment
new file mode 100644 (file)
index 0000000..60824bd
--- /dev/null
+++ b/doc/forum/nginx:_404_plugin_not_working/comment_5_0720cd8842dc1cb338b74a0e6fdb2aac._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl981Fi5YVeEC_ncO9cJTfkPyyy2A_-tG8"
+ nickname="Mick"
+ subject="comment 5"
+ date="2011-06-25T12:00:24Z"
+ content="""
+Is [[this|missing_pages_redirected_to_search-SOLVED]] what you are after ?  --[Mick](http://www.lunix.com.au)
+"""]]

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 558d3cd699dbfbd7c5f9f6ea03072f6a20372251..d4e8add561ae397c468082fb9ae5a5bbadcf56b2 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -189,3 +189,4 @@ Personal sites and blogs
 * [Siri Reiter](http://sirireiter.dk/) portfolio website with a blog (in danish)
 * [L'Altro Wiki](http://laltromondo.dynalias.net/~iki/) Tutorials, reviews, miscellaneus articles in English and Italian, from the IRC network syrolnet.org
 * [STUPiD](http://lhzhang.com/)
+* gregoa's [p.r. - political rants](http://info.comodo.priv.at/pr/)

diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index 8ae457ee2fbbcaf900561bbc79154832b83bbe1b..74eccb7931905011723ffce4ec230355a6a899cb 100644 (file)
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -1,7 +1,7 @@
 These plugins are provided by third parties and are not currently
 included in ikiwiki. See [[install]] for installation help.
 
-[[!map pages="plugins/contrib/* and !plugins/contrib/*/* and !*/Discussion"]]
+[[!map pages="plugins/contrib/* and !plugins/contrib/*/* and !*/Discussion and !plugins/contrib/sphynkx"]]
 
 [[!inline pages="plugins/contrib/*" rootpage="plugins/contrib" show=-1
 postformtext="Add a new plugin:" feeds=no]]

diff --git a/doc/plugins/contrib/sphynkx.mdwn b/doc/plugins/contrib/sphynkx.mdwn
new file mode 100644 (file)
index 0000000..230d39c
--- /dev/null
+++ b/doc/plugins/contrib/sphynkx.mdwn
@@ -0,0 +1 @@
+My [Infopage](http://sphynkx.org.ua/)

diff --git a/doc/plugins/contrib/type/video.mdwn b/doc/plugins/contrib/type/video.mdwn
new file mode 100644 (file)
index 0000000..b60e26a
--- /dev/null
+++ b/doc/plugins/contrib/type/video.mdwn
@@ -0,0 +1 @@
+These plugins enhance the web interface.

diff --git a/doc/plugins/contrib/video.mdwn b/doc/plugins/contrib/video.mdwn
new file mode 100644 (file)
index 0000000..1cafe0e
--- /dev/null
+++ b/doc/plugins/contrib/video.mdwn
@@ -0,0 +1,26 @@
+[[!template id=plugin name=video author="[[Yury Chumak|sphynkx]]"]]
+[[!tag type/video]]
+
+## Video
+
+This plugin provides embedding video on wikipages. Plugin uses most simple embedding method - only with *embed* tag and without  any JS-scripts.
+
+###Usage
+
+>\[\[\!video width=100 height=100 type="application/x-shockwave-flash" src="/\_jwplayer/player.swf" allowscriptaccess="always" allowfullscreen="true" autostart="false" file="path\_to\_video"\]\]
+
+All parameters are optional except *file* and will be replaced with the default settings as showed in the above example.
+
+*file* is relative path in webdir or web-address (to Youtube page).
+
+### Install
+Download and unpack [archive](http://sphynkx.org.ua/progr/videoplug/jw_videoplugin.tar.bz2) in your ikiwiki webdir. 
+Or download [JW Player](http://www.longtailvideo.com/players/jw-flv-player/) and [perl module](http://sphynkx.org.ua/progr/videoplug/video.pm) separately. Make dir *\_jwplayer* and put player.swf in it. Also put *video.pm* in *Plugin* dir. In Ikiwiki configuration switch on the plugin:
+
+    add_plugins => [qw{.......... video}]
+
+### Note
+
+[Htmlscrubber](http://ikiwiki.info/plugins/htmlscrubber/) may block *embed* tag.
+
+If embed tag present but video not playing - check mode of unpacked *player.swf*.

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index f3b3abfbb6cd8af0203d522ca13d07201a3d540b..d56d1a396b8b505e424d272d8d93bae4dd3eb455 100644 (file)
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -17,7 +17,7 @@ only use some other form of authentication, such as [[passwordauth]].
 ## options
 
 These options do not normally need to be set, but can be useful in
-certian setups.
+certain setups.
 
 * `openid_realm` can be used to control the scope of the openid request.
   It defaults to the `cgiurl` (or `openid_cgiurl` if set); only allowing

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index cafe3f573ef5cfd4811bee9688afa1675302aca9..053c0771fb81eda9a14476d6854891161c924a8b 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -61,6 +61,10 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
 * [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
+* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
+* [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]]
+* [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]]
+* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the

diff --git a/doc/tips/Install_ikiwiki_on_Mac_OS_X___91__Snow__93___Leopard_via_MacPorts.mdwn b/doc/tips/Install_ikiwiki_on_Mac_OS_X___91__Snow__93___Leopard_via_MacPorts.mdwn
deleted file mode 100644 (file)
index 0d68cc8..0000000
--- a/doc/tips/Install_ikiwiki_on_Mac_OS_X___91__Snow__93___Leopard_via_MacPorts.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-The easiest way of installing ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
-
-This project ports Open Source software into Mac Os X platform.
-It's very easy to intall ikiwiki via MacPorts:
-
-1.- Donwnload and install MacPorts port manager from:  <http://www.macports.org/install.php> . 
-    Port manager installs via Mac Os X installer. Prerequisite: XCode.
-    Se above URL for details
-
-2.- Run 
-
-    $ sudo port install ikiwiki
-
-This installs ikiwiki and all of its dependencies
-
-enjoy
-
-Enrique Castilla

diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn
deleted file mode 100644 (file)
index ae39698..0000000
--- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc.  --[[schmonz]]

diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_mac_os_x.mdwn
similarity index 87%
rename from doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
rename to doc/tips/ikiwiki_on_mac_os_x.mdwn
index bb1db0cbba1b9424cb8b49de83bd42605e33c0f4..b3d1de3706498e863a2e83135dd0bf30f9961c2d 100644 (file)
--- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
+++ b/doc/tips/ikiwiki_on_mac_os_x.mdwn
@@ -1,3 +1,40 @@
+[[!toc]]
+
+# MacPorts
+
+The easiest way of installing ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
+
+This project ports Open Source software into Mac Os X platform.
+It's very easy to intall ikiwiki via MacPorts:
+
+1.- Donwnload and install MacPorts port manager from:  <http://www.macports.org/install.php> . 
+    Port manager installs via Mac Os X installer. Prerequisite: XCode.
+    Se above URL for details
+
+2.- Run 
+
+    $ sudo port install ikiwiki
+
+This installs ikiwiki and all of its dependencies
+
+enjoy
+
+Enrique Castilla
+
+-----
+
+# pkgsrc
+
+The other easiest way of installing ikiwiki on Mac OS X is via
+[pkgsrc](http://www.pkgsrc.org/).
+
+7. Bootstrap pkgsrc
+7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
+
+-----
+
+# Manual install
+
 These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. 
 
 The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick.
@@ -179,6 +216,3 @@ I turned on the plugin from the setup page in ikiwiki but it gave an error when
 I did a  "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega".
 
 Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing.
-
-
-

diff --git a/doc/users/aland.mdwn b/doc/users/aland.mdwn
new file mode 100644 (file)
index 0000000..5980675
--- /dev/null
+++ b/doc/users/aland.mdwn
@@ -0,0 +1 @@
+# aland

diff --git a/doc/users/sphynkx.mdwn b/doc/users/sphynkx.mdwn
new file mode 100644 (file)
index 0000000..c161d77
--- /dev/null
+++ b/doc/users/sphynkx.mdwn
@@ -0,0 +1 @@
+[My infopage](http://sphynkx.org.ua)