From: Joey Hess Date: Mon, 5 Dec 2011 19:17:53 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20111229~72 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2c7a8bd6848fd90de9c88c51765325ca51453713?hp=aa226bbb6ba913db0ce428641d4fde733b63f0a8 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment b/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment new file mode 100644 index 000000000..8040ad5e2 --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2011-12-04T13:37:27Z" + content=""" +If just deleting the unwanted pages is insufficient (e.g. perhaps they +contain information that must not be made public), you can split a git +repository (including ikiwiki repositories) with `git filter-branch` (see +[this stackoverflow question](http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository), +for instance). + +This preserves the history of each individual page, but rewrites the +entire history of the repository (it re-does every commit, pretending +that the addition of the omitted pages and every subsequent edit to +them had never happened); it's like `git rebase` but more so. + +As a result, existing branches will no longer be able to push to the +rewritten repository. +"""]] diff --git a/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment b/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment new file mode 100644 index 000000000..e2dbd2546 --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 3" + date="2011-12-04T14:03:55Z" + content=""" +@smcv: Thanks, that looks promising. The example from stackoverflow is with subdirectories. What do I have to change to match a list of single files (pages) instead? +"""]] diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn new file mode 100644 index 000000000..8d7f0e3cb --- /dev/null +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -0,0 +1,6 @@ +I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). + +>> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Upskirt instead, which uses the Upskirt library which Sundown appears to be derived from. +>> -- [[KathrynAndersen]] + +[[wishlist]] diff --git a/doc/todo/Pagination_next_prev_links.mdwn b/doc/todo/Pagination_next_prev_links.mdwn index e2b56a0cc..951b0c222 100644 --- a/doc/todo/Pagination_next_prev_links.mdwn +++ b/doc/todo/Pagination_next_prev_links.mdwn @@ -4,7 +4,12 @@ They don't want to back out of post to an index. They want an easy button to cli -Thank you +[Jekyll](http://jekyllrb.com/)'s implementation looks rather neat: + +* +* + + > This is a perfect use for [[todo/wikitrails]], of which my > [[plugins/contrib/trail]] plugin is an implementation. Code review on that @@ -53,3 +58,8 @@ Thank you >>> Making [[plugins/contrib/album]] require `trail` v3, and trying it out >>> on my blog, are next on the list. >>> --[[smcv]] + +>>>> Sorry thank link doesn't work. I get a forbidden. --[[hendry]] + + +[[wishlist]] diff --git a/doc/todo/mdwn_preview/discussion.mdwn b/doc/todo/mdwn_preview/discussion.mdwn new file mode 100644 index 000000000..4fb30adf9 --- /dev/null +++ b/doc/todo/mdwn_preview/discussion.mdwn @@ -0,0 +1 @@ ++1, not sure where this feature is going. I'm keen to seen this!