urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2011-12-27 12:33:21 -04:00
parent b8bf318b91 0daa03f4c9
commit c8a4ffff53
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment 100644
View File

@ -0,0 +1,28 @@
[[!comment format=mdwn
username="https://launchpad.net/~tale"
nickname="tale"
subject="comment 2"
date="2011-12-27T16:18:31Z"
content="""
In both old and new host gitorigin_branch is empty string in ikiwiki.setup.
tale@tugelbend:~$ grep -i gitorigin ikiwiki.setup
gitorigin_branch => '',
The branches subdir is empty on both hosts:
tale@tugelbend:~$ LANG=C ls -lha wiki/src.git/branches/
total 8.0K
drwxr-xr-x 2 tale tale 4.0K Dec 24 2009 .
drwxr-xr-x 7 tale tale 4.0K Dec 24 2009 ..
tale@tugelbend:~$
I do not know what value I should assign to gitorigin_branch.
I tried
wiki.git/hooks/post-update
but nothing seems to happen. No output, web page stays the same. File timestamps are not updated
on the dest directory.
"""]]

2
doc/forum/pandoc-iki_plugin.mdwn
View File

@ -1,4 +1,4 @@
I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See <https://github.com/profjim/pandoc-iki> for details.
I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See <https://github.com/dubiousjim/pandoc-iki> for details.
How do I get this added to the contrib section of the plugin list? --Profjim

2
doc/tips/convert_mediawiki_to_ikiwiki.mdwn
View File

@ -1,6 +1,6 @@
[[!toc levels=2]]
Mediawiki is a dynamically-generated wiki which stores it's data in a
Mediawiki is a dynamically-generated wiki which stores its data in a
relational database. Pages are marked up using a proprietary markup. It is
possible to import the contents of a Mediawiki site into an ikiwiki,
converting some of the Mediawiki conventions into Ikiwiki ones.

2
doc/users/Erkan_Yilmaz.mdwn 100644
View File

@ -0,0 +1,2 @@
* [[recentchanges]]
* my site: [here](http://iaskquestions.com)