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

8 files changed, 100 insertions, 2 deletions

diff --git a/doc/bugs/Checksum_errors_on_the_pristine-tar_branch.mdwn b/doc/bugs/Checksum_errors_on_the_pristine-tar_branch.mdwn
index 4fc2855ee..463b7b3f3 100644
--- a/doc/bugs/Checksum_errors_on_the_pristine-tar_branch.mdwn
+++ b/doc/bugs/Checksum_errors_on_the_pristine-tar_branch.mdwn
@@ -86,3 +86,18 @@ For now, I'll download the `.tar.gz` from <http://packages.debian.org/unstable/s
 > generally been able to compile snapshots on Debian unstable and
 > install them onto Debian lenny (older than that Ubuntu release)
 > without modification. If in doubt, build it from source. --[[smcv]]
+
+> > The .deb file `ikiwiki_3.20110124_all.deb` from Debian unstable seems to 
+> > work great. I'm now the happy user of the newest stable version, yay. There 
+> > were some errors or warnings, though. This is the first one:
+
+> > > `You are overwriting a locally defined method (finished) with an accessor 
+> > > at /usr/lib/perl5/Moose/Meta/Attribute.pm line 570`
+
+> > Along with loads of other suspicious stuff. Have posted the whole output at 
+> > <https://gist.github.com/842789>. I'll dig around a bit in the source to 
+> > see if there's something I need to worry about. It looks good so far.
+> > --&nbsp;[[sunny256]]&nbsp;<small>2011-02-24&nbsp;20:27Z</small>
+
+> > > Looks like a bug in [[!cpan Net::Amazon::S3::Client::Bucket]] or in something
+> > > it uses, rather than in ikiwiki itself. --[[smcv]]
diff --git a/doc/bugs/logout_in_ikiwiki.mdwn b/doc/bugs/logout_in_ikiwiki.mdwn
index d9b6df677..7b5346864 100644
--- a/doc/bugs/logout_in_ikiwiki.mdwn
+++ b/doc/bugs/logout_in_ikiwiki.mdwn
@@ -29,3 +29,16 @@ It looks like there is no way to logout of ikiwiki at present, meaning that if y
 >> logout, help, recentchanges, edit, comment 
 
 >> admin users - logout, help, recentchanges, edit, comment, etc
+
+
+I was referred to this page from posting to the forum. I am also interested in being able to use user class and status to modify the page. I will try to put together a plugin. From what I can see there needs to be a few items in it.
+
+* It should expose a link to a dedicated login page that, once logged in, returns the user to the calling page, or at least the home page.
+
+* it needs to expose a link to a little json explaining the type of user and login status.
+
+* it should expose a link that logs the person out and returns to the calling page, or at least the home page.
+
+Then there would need to be a little javascript to use these links appropriately. I have little javascript experience but I know that can be done. I am less sure if it is possible to add this functionality to a plugin so I'll start with that. If no one objects I will continue to post here if I make progress. If anyone has any suggestions on how to modify my approach to code it in an easier way I'd appreciate the input. [[justint]]
+
+
diff --git a/doc/forum/Setting_up_a_development_environment.mdwn b/doc/forum/Setting_up_a_development_environment.mdwn
new file mode 100644
index 000000000..0b4e555c1
--- /dev/null
+++ b/doc/forum/Setting_up_a_development_environment.mdwn
@@ -0,0 +1,32 @@
+Hi,
+
+I'm trying to setup a development environment to hack on the comments plugin and I'm having problems getting my Ikiwiki CGI to use my git checkout as the libdir and templatedir instead of the system one.
+
+My <tt>.setup</tt> contains:
+
+        srcdir => '/home/francois/wiki/testblog',
+        destdir => '/var/www/testblog',
+        url => 'http://localhost/testblog',
+        cgiurl => 'http://localhost/testblog/ikiwiki.cgi',
+        cgi_wrapper => '/var/www/testblog/ikiwiki.cgi',
+        templatedir => '/home/francois/devel/remote/ikiwiki/templates',
+        underlaydir => '/home/francois/devel/remote/ikiwiki/doc',
+        libdir => '/home/francois/devel/remote/ikiwiki',
+        ENV => {},
+        git_wrapper => '/home/francois/wiki/testblog.git/hooks/post-update',
+
+Now, if I modify <tt>~/devel/remote/ikiwiki/templates/comment.tmpl</tt>, my changes don't appear when I add a comment to a blog post. On the other hand, if I hack <tt>/usr/share/ikiwiki/templates/comment.tmpl</tt> and cause the page to be rebuilt by adding a new comment then that does have an effect.
+
+The same is true for <tt>~/devel/remote/ikiwiki/Ikiwiki/Plugin/comments.pm</tt> (doesn't appear to be used) and <tt>/usr/share/perl5/Ikiwiki/Plugin/comments.pm</tt> (my hacks affect pages as they are recompiled).
+
+I must be missing something obvious, but the [[ikiwiki development environment tips]] didn't help me...
+
+Cheers,
+
+[[Francois|fmarier]]
+
+> I updated the [[ikiwiki development environment tips]] page with my
+> approach to running ikiwiki from the git checkout (with changes). For
+> the templates, also make sure that you do not have custom templates in
+> your src dir as they will be used instead of those from the template
+> dir if found. --GB
diff --git a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_7_bdc5c96022fdb8826b57d68a41ef6ca0._comment b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_7_bdc5c96022fdb8826b57d68a41ef6ca0._comment
new file mode 100644
index 000000000..79fd8516f
--- /dev/null
+++ b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_7_bdc5c96022fdb8826b57d68a41ef6ca0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="justint"
+ ip="24.182.207.250"
+ subject="Continuing discussion..."
+ date="2011-02-24T02:59:04Z"
+ content="""
+Ok, I'll go over to the [[bugs/logout_in_ikiwiki]] page. Thank you for your help.
+"""]]
diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index 91ccc6d6e..f9c584159 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -42,3 +42,27 @@ Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]
 > needed, since it is preconfigured to use the templates and underlays
 > from ikiwiki's source repository.
 > --[[Joey]]
+
+> I work with Ikiwiki from the git checkout directory the following way.
+>
+> * instead of running ikiwiki, I wrote the following `mykiwiki` shell script,
+> that also allows me to use my custom lib-ifited multimarkdown:
+
+    #!/bin/sh
+    
+    MMDSRC="$HOME/src/multimarkdown/lib"
+    IKIWIKISRC="$HOME/src/ikiwiki"
+    PLUGINS="$HOME/src/ikiplugins"
+    
+    /usr/bin/perl -I"$MMDSRC" -I"$IKIWIKISRC/blib/lib" -I"$PLUGINS" "$IKIWIKISRC/ikiwiki.out" -libdir "$IKIWIKISRC" "$@"
+
+> * I also have an installed ikiwiki from Debian unstable, from which I only use the base wiki, so my `.setup` has the following configs:
+
+    # additional directory to search for template files
+    templatedir => '/home/oblomov/src/ikiwiki/templates',
+    # base wiki source location
+    underlaydir => '/usr/share/ikiwiki/basewiki',
+    # extra library and plugin directory
+    libdir => '/home/oblomov/src/ikiwiki',
+
+> Hope that helps --GB
diff --git a/doc/tips/github.mdwn b/doc/tips/github.mdwn
index 9bdf15751..d745bfcc5 100644
--- a/doc/tips/github.mdwn
+++ b/doc/tips/github.mdwn
@@ -5,7 +5,7 @@ site. Your laptop is used to generate and publish changes to it.
 This is possible because github now supports
 [github pages](http://github.com/blog/272-github-pages).
 
-Note that github limits free accounts to 100 mb of git storage. It's
+Note that github limits free accounts to 100 MB of git storage. It's
 unlikely that a small wiki or blog will outgrow this, but we are keeping
 two copies of the website in git (source and the compiled site), and all
 historical versions too. So it could happen. If it does, you can pay github
diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
index 8b649156d..bb1db0cbb 100644
--- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
+++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
@@ -68,7 +68,7 @@ When you can't get into the setup page or you get strange behavior after a setup
 
 cd ../git-1.7.3.1/gitweb
 
-make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" 
+make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" GITWEB_JS="/gitweb.js"
 
 cp gitweb.cgi /Library/WebServer/CGI-Executables/
 
diff --git a/doc/users/fmarier.mdwn b/doc/users/fmarier.mdwn
new file mode 100644
index 000000000..ecf342697
--- /dev/null
+++ b/doc/users/fmarier.mdwn
@@ -0,0 +1,6 @@
+# François Marier
+
+Free Software and Debian Developer. Lead developer of [Libravatar](http://www.libravatar.org)
+
+* [Blog](http://feeding.cloud.geek.nz)
+* [Identica](http://identi.ca/fmarier) / [Twitter](http://twitter.com/fmarier)