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 2012-01-09 10:34:23 -04:00
parent c1a0fec9d7 28edab5ea9
commit d95f6fd87e
10 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/bugs/http_proxy_for_openid.mdwn
View File

@ -78,3 +78,9 @@ Brian May
>>>>> explicitly removed", so if ikiwiki can preferentially find that
>>>>> installed, even with the above commit, `openid` won't be able to
>>>>> traverse a proxy. --[[schmonz]]
[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
>>>>> I bollixed up my git, recloned, and reapplied the diffs, so
>>>>> that commit won't exist anymore. My proxy-related changes are
>>>>> now on a branch. --[[schmonz]]

12
doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_2_45ca7ef4190c281d703c8c7ca6979298._comment 100644
View File

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="dave"
ip="24.209.97.191"
subject="comment 2"
date="2012-01-04T04:01:54Z"
content="""
Thank you sir, that was exactly what I needed!
Don't know why I didn't think to try page - apparently I have a special blindness which applies to looking at the pagespec help page. ;)
Anyway, thanks again, that fixed it.
"""]]

1
doc/ikiwikiusers.mdwn
View File

@ -77,6 +77,7 @@ Projects & Organizations
* [The Amnesic Incognito Live System](https://tails.boum.org/index.en.html)
* [The Progress Linux OS wiki](http://wiki.progress-linux.org/)
* [Oxford Computer Society](http://www.ox.compsoc.net/)
* [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/)
Personal sites and blogs
========================

7
doc/install/discussion.mdwn
View File

@ -349,3 +349,10 @@ I've attempted to mergeably patch these in my git, commit
5c177c96ac98b24aaa0613ca241fb113f1b32c55.
--[[schmonz]]
-----
[[!template id=gitbranch branch=schmonz/portability author="[[schmonz]]"]]
My git was in a screwy state so I started over. These changes are
now on a branch. --[[schmonz]]

2
doc/plugins/contrib/mandoc.mdwn
View File

@ -1,5 +1,5 @@
[[!template id=plugin name=mandoc author="[[schmonz]]"]]
[[!template id=gitbranch branch=schmonz/master author="[[schmonz]]"]]
[[!template id=gitbranch branch=schmonz/mandoc author="[[schmonz]]"]]
[[!tag type/format]]
This plugin lets ikiwiki convert Unix man pages to HTML. It uses

4
doc/tips/convert_mediawiki_to_ikiwiki.mdwn
View File

@ -188,7 +188,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi
[[scy]] wrote a python script to convert from mediawiki XML dumps to git repositories at <https://github.com/scy/levitation>.
[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at <http://anarcat.ath.cx/software/mediawikigitdump.git/>. The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter.
[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at git://src.anarcat.ath.cx/mediawikigitdump.git/. The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: git://src.anarcat.ath.cx/media2iki.git/).
> Some assembly is required to get Mediawiki2markdown and its mwlib
> gitmodule available in the right place for it to use.. perhaps you could
@ -204,7 +204,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi
> fails on some html in the page named "4_metres". On archiveteam.org,
> it fails trying to write to a page filename starting with "/", --[[Joey]]
> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: <http://anarcat.ath.cx/software/media2iki.git/> -- [[anarcat]]
> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: git://src/anarcat.ath.cx/media2iki.git/ -- [[anarcat]]
>>> Not using your new converter, just the installation I did earlier
>>> today:

2
doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
View File

@ -6,7 +6,7 @@
----
I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15
I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: git://anarcat.ath.cx/software/mediawikigitdump.git/ and git://anarcat.ath.cx/software/media2iki.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15
----

5
doc/todo/Improve_markdown_speed.mdwn
View File

@ -25,4 +25,9 @@ support of the C implementation of Markdown called
>>> (Upskirt, discount... Who comes up with these names? Discount also
>>> features a "NOPANTS" option.) --[[Joey]]
>>>> Thanks for doing this; it's given a well-needed speedup to my huge site.
>>>>
>>>> (At least "Discount" is related to "Mark Down" but I don't fathom "Upskirt" either.)
>>>> --[[KathrynAndersen]]
[[wishlist]]

2
doc/todo/sortbylastcomment_plugin.mdwn
View File

@ -9,3 +9,5 @@ You'll find it in this repository, in the 'sortbylastcomment' branch:
[[!tag wishlist patch]]
> Reviewed, tested: looks good to me. We need it for the [Tails forum](https://tails.boum.org/forum/). --[[intrigeri]]
>> Hi, is there a chance of seeing this plugin getting included in a release at any point soon? --sajolida

11
doc/users/schmonz.mdwn
View File

@ -1,5 +1,10 @@
[Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki
for all sorts of things. His attempts at contributing:
[[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
[[!map
pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"
]]
I've also written a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which may or may not be of general utility.
He's also written a plugin for [WIND
authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which
may or may not be of general utility.