From 6dd49d0df7ac97b2a74517f18fcb24881c940cad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 19:23:24 -0400 Subject: bug --- doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn (limited to 'doc') diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn new file mode 100644 index 000000000..9e1924472 --- /dev/null +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -0,0 +1,3 @@ +The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir +in a subdirectory of the repository. It must be at the top. Git has +special code to handle this case. --[[Joey]] -- cgit v1.2.3 From 7ba0f7d297e7d3e833756016b635ffa0cc78200e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 20:30:14 -0400 Subject: monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. --- IkiWiki/Plugin/monotone.pm | 13 ++++++++++++- debian/changelog | 2 ++ .../monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 95fbcee76..75bf2f458 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -252,9 +252,20 @@ sub get_changed_files ($$) { my @ret; my %seen = (); - + + # we need to strip off the relative path to the source dir + # because monotone outputs all file paths absolute according + # to the workspace root + my $rel_src_dir = $config{'srcdir'}; + $rel_src_dir =~ s/^\Q$config{'mtnrootdir'}\E\/?//; + $rel_src_dir .= "/" if length $rel_src_dir; + while ($changes =~ m/\s*(add_file|patch|delete|rename)\s"(.*?)(? Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn index 9e1924472..35f624f78 100644 --- a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -1,3 +1,5 @@ The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir in a subdirectory of the repository. It must be at the top. Git has special code to handle this case. --[[Joey]] + +[[done]] -- cgit v1.2.3 From c752be0acb942036a2dfd69dcfde06c17860db34 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:53:32 +0000 Subject: Mac OS X Snow Leopard Installing IkiWiki Tips --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 81 ++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn (limited to 'doc') diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn new file mode 100644 index 000000000..2c3428b3f --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -0,0 +1,81 @@ +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. + +## installing git: + +curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O +tar xzvf git-(latest version).tar.gz +cd git-(latest version) +./configure --prefix=/usr/local +NO_MSGFMT=yes make prefix=/usr/local all +sudo make install + +git config --global user.name "firstname lastname" +git config --global user.email "email here" +git config --global color.ui "auto" + +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ + + +## installing ikiwiki: +I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I like to install test software in /opt. No particular reason. You could install to defaults. + +perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +perl Makefile.PL LIB=/Library/Perl/5.10.0 +make +make install +sudo install -d /opt/ikiwiki +sudo install -m 0644 wikilist /opt/ikiwiki +sudo install -m 0644 auto.setup /opt/ikiwiki +sudo install -m 0644 auto-blog.setup /opt/ikiwiki + +when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + +## using git from inside a git folder: +start with git clone, then learn to do the git dance like this. +git pull +make your changes to your clone +git commit -a -m "message here" +git push + +When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. + +## installing gitweb + +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin + +cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +sudo chmod 2755 gitweb.cgi + +## installing xapian: +download xapian and omega +I needed pcre: sudo ports install pcre + +./configure +make +sudo make install + +## installing omega: +I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. +./configure +make +sudo make install + +## installing Search::Xapian from CPAN +for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. +perl Makefile.PL +make +make test +sudo make install +it installed without issue so I'm baffled why it didn't install from command line. + +## turning on search plugin: +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. 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 setup file and replaced the bad path, updated and badda-boom badda-bing. + +Then I fell asleep. -- cgit v1.2.3 From 20b94ad9e1f5a401798b6991aeba964267ce3087 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 05:55:32 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'doc') 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 2c3428b3f..4eb084f38 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -2,44 +2,71 @@ These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a th The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + ## installing git: curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O + tar xzvf git-(latest version).tar.gz + cd git-(latest version) + ./configure --prefix=/usr/local + NO_MSGFMT=yes make prefix=/usr/local all + sudo make install + git config --global user.name "firstname lastname" + git config --global user.email "email here" + git config --global color.ui "auto" + curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. + I like to install test software in /opt. No particular reason. You could install to defaults. + perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 + perl Makefile.PL LIB=/Library/Perl/5.10.0 + make + make install + sudo install -d /opt/ikiwiki + sudo install -m 0644 wikilist /opt/ikiwiki + sudo install -m 0644 auto.setup /opt/ikiwiki + sudo install -m 0644 auto-blog.setup /opt/ikiwiki + when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + ## using git from inside a git folder: + start with git clone, then learn to do the git dance like this. + git pull + make your changes to your clone + git commit -a -m "message here" + git push + When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. ## installing gitweb @@ -47,35 +74,61 @@ When you can't get into the setup page or you get strange behavior after a setup make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ + sudo chmod 2755 gitweb.cgi + ## installing xapian: + download xapian and omega + I needed pcre: sudo ports install pcre ./configure + make + sudo make install + ## installing omega: + I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. + ./configure + make + sudo make install + ## installing Search::Xapian from CPAN + for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. + perl Makefile.PL + make + make test + sudo make install + it installed without issue so I'm baffled why it didn't install from command line. + + ## turning on search plugin: + I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. 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 setup file and replaced the bad path, updated and badda-boom badda-bing. + Then I fell asleep. -- cgit v1.2.3 From b7d4c1e473ccec6d6e21b1ed225f5e4de27a62f5 Mon Sep 17 00:00:00 2001 From: justint Date: Tue, 12 Oct 2010 14:46:35 +0000 Subject: setting Discussion PageSpec? --- doc/forum/Discussion_PageSpec__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Discussion_PageSpec__63__.mdwn (limited to 'doc') diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn new file mode 100644 index 000000000..fb592be48 --- /dev/null +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -0,0 +1 @@ +I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? -- cgit v1.2.3 From e6d130877bb374abe9721e497f0d4868b6c952d8 Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 03:03:24 +0000 Subject: --- .../Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn (limited to 'doc') diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn new file mode 100644 index 000000000..fcffe690f --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn @@ -0,0 +1,3 @@ +Map Plugin, would like to add ?updated to all links created. + +When I edit a page and then click that page in a map in a sidebar Safari always shows me a cached page. -- cgit v1.2.3 From 48c53906bc899364c74a2877ea6e5c5189299e0e Mon Sep 17 00:00:00 2001 From: justint Date: Wed, 13 Oct 2010 05:30:50 +0000 Subject: Added a comment: skip it --- .../comment_1_3fe4c5967e704355f9b594aed46baf67._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment (limited to 'doc') diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment new file mode 100644 index 000000000..ce1a78584 --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="justint" + ip="24.182.207.250" + subject="skip it" + date="2010-10-13T05:30:50Z" + content=""" +skip it, I added + + + + +to my page.tmpl and the problem went away. +"""]] -- cgit v1.2.3 From 71fdabcb494d3f6e62bf755246c480ac7fc17156 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE" Date: Wed, 13 Oct 2010 09:10:45 +0000 Subject: --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a3a20fd78..c665e67f0 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * * [GNU](http://www.gnu.org/) +* Joey's blog ---- -- cgit v1.2.3 From 8555d10f6369d78c44cf4677010b7e1260d9f5c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:57:16 -0400 Subject: img: If a class is specified, don't also put the img in the img class. --- IkiWiki/Plugin/img.pm | 5 +---- debian/changelog | 2 ++ .../class_parameter_of_img_directive_behave_not_as_documented.mdwn | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2375ead89..bd527c8c8 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,10 +156,7 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (exists $params{class}) { - $params{class}.=" img"; - } - else { + if (! exists $params{class}) { $params{class}="img"; } diff --git a/debian/changelog b/debian/changelog index 12cc90b11..5433ba05f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * websetup: Fix defaults of checkboxes in advanced mode. * monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn index 10ba15066..e7797765f 100644 --- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is passed. If you keep the current behaviour, please document it. + +> [[done]] --[[Joey]] -- cgit v1.2.3 From dcd89979379b7cbaab7ec4af0411796bdcf16f44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:59:59 -0400 Subject: answer --- doc/forum/Discussion_PageSpec__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn index fb592be48..2860d0d17 100644 --- a/doc/forum/Discussion_PageSpec__63__.mdwn +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -1 +1,3 @@ I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? + +> Not currently, sorry. --[[Joey]] -- cgit v1.2.3 From a14c2a9cd0f04062e32c218b799076adaf8b934e Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Thu, 14 Oct 2010 12:25:48 +0000 Subject: perms --- doc/bugs/More_permission_checking.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/More_permission_checking.mdwn (limited to 'doc') diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn new file mode 100644 index 000000000..e56cda98b --- /dev/null +++ b/doc/bugs/More_permission_checking.mdwn @@ -0,0 +1,9 @@ +I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup. + +I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw. + +I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user. + +I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`. Though shouldn't everything be under the `www-data` group in reality? + +Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this. -- cgit v1.2.3 From 46118a983f1253defcda3042821a10ce5046103c Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:24:43 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 35 ++++++++++---------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'doc') 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 4eb084f38..38df19708 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -5,15 +5,17 @@ The best part of installing ikiwiki was learning how to use git. I never used so ## installing git: +cd /opt/ikiwiki/install + curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O tar xzvf git-(latest version).tar.gz cd git-(latest version) -./configure --prefix=/usr/local +./configure --prefix=/usr/local -NO_MSGFMT=yes make prefix=/usr/local all +make prefix=/usr/local all sudo make install @@ -25,31 +27,20 @@ git config --global user.email "email here" git config --global color.ui "auto" -curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /opt/local/share/man/ +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/ ## installing ikiwiki: I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. -I like to install test software in /opt. No particular reason. You could install to defaults. - - -perl Makefile.PL PREFIX=/Library/Perl/5.10.0 LIB=/Library/Perl/5.10.0 +git clone git://git.ikiwiki.info/ perl Makefile.PL LIB=/Library/Perl/5.10.0 make -make install - -sudo install -d /opt/ikiwiki - -sudo install -m 0644 wikilist /opt/ikiwiki - -sudo install -m 0644 auto.setup /opt/ikiwiki - -sudo install -m 0644 auto-blog.setup /opt/ikiwiki - +sudo make install when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. @@ -71,12 +62,13 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" bindir=/opt/local/bin +cd gitweb -cp gitweb.cgi /Library/WebServer/CGI-Executables/gitweb/ +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" -sudo chmod 2755 gitweb.cgi +cp gitweb.cgi /Library/WebServer/CGI-Executables/ +sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi ## installing xapian: @@ -117,7 +109,6 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a @@ -131,4 +122,4 @@ and found the omega program in Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. -Then I fell asleep. + -- cgit v1.2.3 From 52375d9c080fd5db8106f75d5ca00f3c806644de Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 20:42:23 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'doc') 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 38df19708..d685af0d0 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -109,6 +109,50 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. +## setup file + +#!/usr/bin/perl +# Ikiwiki setup automator. +# +# This setup file causes ikiwiki to create a wiki, check it into revision +# control, generate a setup file for the new wiki, and set everything up. +# +# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup +# +# By default, it asks a few questions, and confines itself to the user's home +# directory. You can edit it to change what it asks questions about, or to +# modify the values to use site-specific settings. + +require IkiWiki::Setup::Automator; + +our $wikiname="your wiki"; +our $wikiname_short="yourwiki"; +our $rcs="git"; +our $admin="your name"; +use Net::Domain q{hostfqdn}; +our $domain="your.domain"; + +IkiWiki::Setup::Automator->import( +wikiname => $wikiname, +adminuser => [$admin], +rcs => $rcs, +srcdir => "/opt/ikiwiki/$wikiname_short", +destdir => "/Library/WebServer/Documents/$wikiname_short", +repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), +dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", +url => "http://$domain/$wikiname_short", +cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", +cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", +adminemail => "your\@email.com", +add_plugins => [qw{goodstuff websetup}], +disable_plugins => [qw{}], +libdir => "/opt/ikiwiki/.ikiwiki", +rss => 1, +atom => 1, +syslog => 1, +) + + ## turning on search plugin: I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a -- cgit v1.2.3 From 29b5c68bbbb35749b5b515266deffe9358ce3b74 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:19:19 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 96 ++++++++++++++------------ 1 file changed, 51 insertions(+), 45 deletions(-) (limited to 'doc') 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 d685af0d0..05a9bf6d7 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -64,11 +64,19 @@ When you can't get into the setup page or you get strange behavior after a setup cd gitweb -make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb/gitweb.css" GITWEB_LOGO="/gitweb/git-logo.png" GITWEB_FAVICON="/gitweb/git-favicon.png" +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi +sudo chmod 2755 /Library/WebServer/git-favicon.png +sudo chmod 2755 /Library/WebServer/git-logo.png +sudo chmod 2755 /Library/WebServer/gitweb.css +sudo chmod 2755 /Library/WebServer/gitweb.js ## installing xapian: @@ -108,50 +116,48 @@ sudo make install it installed without issue so I'm baffled why it didn't install from command line. - -## setup file - -#!/usr/bin/perl -# Ikiwiki setup automator. -# -# This setup file causes ikiwiki to create a wiki, check it into revision -# control, generate a setup file for the new wiki, and set everything up. -# -# Just run: ikiwiki -setup /etc/ikiwiki/auto.setup -# -# By default, it asks a few questions, and confines itself to the user's home -# directory. You can edit it to change what it asks questions about, or to -# modify the values to use site-specific settings. - -require IkiWiki::Setup::Automator; - -our $wikiname="your wiki"; -our $wikiname_short="yourwiki"; -our $rcs="git"; -our $admin="your name"; -use Net::Domain q{hostfqdn}; -our $domain="your.domain"; - -IkiWiki::Setup::Automator->import( -wikiname => $wikiname, -adminuser => [$admin], -rcs => $rcs, -srcdir => "/opt/ikiwiki/$wikiname_short", -destdir => "/Library/WebServer/Documents/$wikiname_short", -repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), -dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", -url => "http://$domain/$wikiname_short", -cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", -cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", -adminemail => "your\@email.com", -add_plugins => [qw{goodstuff websetup}], -disable_plugins => [qw{}], -libdir => "/opt/ikiwiki/.ikiwiki", -rss => 1, -atom => 1, -syslog => 1, -) - + + ## setup file + _!/usr/bin/perl + _ Ikiwiki setup automator. + + _ This setup file causes ikiwiki to create a wiki, check it into revision + _ control, generate a setup file for the new wiki, and set everything up. + + _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup + + _By default, it asks a few questions, and confines itself to the user's home + _directory. You can edit it to change what it asks questions about, or to + _modify the values to use site-specific settings. + require IkiWiki::Setup::Automator; + + our $wikiname="your wiki"; + our $wikiname_short="yourwiki"; + our $rcs="git"; + our $admin="your name"; + use Net::Domain q{hostfqdn}; + our $domain="your.domain"; + + IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "/opt/ikiwiki/$wikiname_short", + destdir => "/Library/WebServer/Documents/$wikiname_short", + repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", + url => "http://$domain/$wikiname_short", + cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", + adminemail => "your\@email.com", + add_plugins => [qw{goodstuff websetup}], + disable_plugins => [qw{}], + libdir => "/opt/ikiwiki/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + ) + ## turning on search plugin: -- cgit v1.2.3 From 222e1fdc1f62433d290c39e8bb3235167192b062 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:23:08 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'doc') 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 05a9bf6d7..aa89c4f55 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -67,16 +67,26 @@ cd gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" cp gitweb.cgi /Library/WebServer/CGI-Executables/ -cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/ -cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/ + +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/ + sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi -sudo chmod 2755 /Library/WebServer/git-favicon.png -sudo chmod 2755 /Library/WebServer/git-logo.png -sudo chmod 2755 /Library/WebServer/gitweb.css -sudo chmod 2755 /Library/WebServer/gitweb.js + +sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png + +sudo chmod 2755 /Library/WebServer/Documents/git-logo.png + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.css + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.js + ## installing xapian: -- cgit v1.2.3 From 1c4eeddb784b4e04abb5364d140684359a56aca3 Mon Sep 17 00:00:00 2001 From: justint Date: Thu, 14 Oct 2010 21:45:48 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'doc') 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 aa89c4f55..50bb2f520 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -171,15 +171,10 @@ it installed without issue so I'm baffled why it didn't install from command lin ## turning on search plugin: -I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory". +I did a "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega". -find / -name "omega" -print - -and found the omega program in - -/usr/local/lib/xapian-omega/bin/omega. - -Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing. +Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing. -- cgit v1.2.3 From f57f56fac11f2cbd619b7e2d14944538e9fb34b6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:17:32 +0000 Subject: add my own way :) --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index d67a9131b..cbea798f1 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,6 +6,10 @@ ---- +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]] + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: -- cgit v1.2.3 From c8d5b7d2f93464560b2db97b139713eda692320f Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:19:06 +0000 Subject: --- doc/users/anarcat.wiki | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/anarcat.wiki (limited to 'doc') diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki new file mode 100644 index 000000000..7ef474ed6 --- /dev/null +++ b/doc/users/anarcat.wiki @@ -0,0 +1 @@ +Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me. -- cgit v1.2.3 From deb4bb6111beb9004544bc32d4aeb79f6d5768f7 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~anarcat" Date: Fri, 15 Oct 2010 05:24:40 +0000 Subject: date --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index cbea798f1..4a7163eae 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -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]] +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 ---- -- cgit v1.2.3 From dd35d0d28fa2db775b4fd7fef0c587d5abd96e3e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Fri, 15 Oct 2010 14:39:18 +0000 Subject: package systems exist --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn (limited to 'doc') 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 new file mode 100644 index 000000000..ae3969879 --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn @@ -0,0 +1 @@ +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]] -- cgit v1.2.3 From 332cb13310dfdc40b4620be7942657c30f63b3c8 Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:05:02 +0000 Subject: Fixes --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') 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 50bb2f520..f755813e3 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -34,8 +34,12 @@ curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | su I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. +cd .. + git clone git://git.ikiwiki.info/ +cd git.ikiwiki.info/ + perl Makefile.PL LIB=/Library/Perl/5.10.0 make -- cgit v1.2.3 From d2b7fcda9a3b302cfabf528e37dd3366030ebb6b Mon Sep 17 00:00:00 2001 From: josepht Date: Mon, 18 Oct 2010 15:38:16 +0000 Subject: --- doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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 f755813e3..8b649156d 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -66,7 +66,7 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -cd gitweb +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" -- cgit v1.2.3 From 0fe25eb41464095f1511b054f45b885572a13071 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnzWY2QyG3IWm_oMTbSsdYFbNE3kiwh4ns" Date: Tue, 19 Oct 2010 06:10:17 +0000 Subject: --- doc/examples/blog/posts/hello__33__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/examples/blog/posts/hello__33__.mdwn (limited to 'doc') diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn new file mode 100644 index 000000000..2a855be13 --- /dev/null +++ b/doc/examples/blog/posts/hello__33__.mdwn @@ -0,0 +1 @@ +hi! there............ -- cgit v1.2.3 From a40abf3e1acba1eaab8dd0f2e416bfde2d9b6667 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:32:04 -0400 Subject: cleanup --- doc/examples/blog/posts/hello__33__.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/examples/blog/posts/hello__33__.mdwn (limited to 'doc') diff --git a/doc/examples/blog/posts/hello__33__.mdwn b/doc/examples/blog/posts/hello__33__.mdwn deleted file mode 100644 index 2a855be13..000000000 --- a/doc/examples/blog/posts/hello__33__.mdwn +++ /dev/null @@ -1 +0,0 @@ -hi! there............ -- cgit v1.2.3 From 2bb049df4fe55191783e6625dbac719e52e329fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:45:29 -0400 Subject: add news item for ikiwiki 3.20101019 --- doc/news/version_3.20100804.mdwn | 14 -------------- doc/news/version_3.20101019.mdwn | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 doc/news/version_3.20100804.mdwn create mode 100644 doc/news/version_3.20101019.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn deleted file mode 100644 index be85cb949..000000000 --- a/doc/news/version_3.20100804.mdwn +++ /dev/null @@ -1,14 +0,0 @@ -ikiwiki 3.20100804 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * template: Fix dependency tracking. Broken in version 3.20100427. - * po: The po\_slave\_languages setting is now a list, so the order of - translated languages can be controlled. (intrigeri) - * git: Fix gitweb historyurl examples so "diff to current" links work. - (Thanks jrayhawk) - * meta: Allow syntax closer to html meta to be used. - * Add new disable hook, allowing plugins to perform cleanup after they - have been disabled. - * Use Digest::SHA built into perl rather than external Digest::SHA1 - to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040) - * Fixes a bug that prevented matching deleted pages when using the page() - PageSpec."""]] \ No newline at end of file diff --git a/doc/news/version_3.20101019.mdwn b/doc/news/version_3.20101019.mdwn new file mode 100644 index 000000000..86c302e25 --- /dev/null +++ b/doc/news/version_3.20101019.mdwn @@ -0,0 +1,20 @@ +ikiwiki 3.20101019 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) + * Updated French program translation. Closes: #[598918](http://bugs.debian.org/598918) + * git: Added new rcs\_revert and rcs\_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. + * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. + * monotone: Fix recentchanges page when the srcdir is not at the top + of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments."""]] \ No newline at end of file -- cgit v1.2.3 From a0b55ac3cd4f840f62d0441e3b1fe9b95ec15007 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E" Date: Tue, 19 Oct 2010 15:13:29 +0000 Subject: setting cookies before aggregating --- doc/plugins/aggregate/discussion.mdwn | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'doc') diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn index 1a9844577..77005a6a1 100644 --- a/doc/plugins/aggregate/discussion.mdwn +++ b/doc/plugins/aggregate/discussion.mdwn @@ -89,3 +89,30 @@ New bug: new posts aren't getting displayed (or cached for aggregation). After f >>> mind having a copy to investigate. --[[Joey]] >>>> Didn't think of that, will keep a copy if there's a next time. -- [[schmonz]] + +----- + +In a corporate environment where feeds are generally behind +authentication, I need to prime the aggregator's `LWP::UserAgent` +with some cookies. What I've done is write a custom plugin to populate +`$config{cookies}` with an `HTTP::Cookies` object, plus this diff: + + --- /var/tmp/pkg/lib/perl5/vendor_perl/5.10.0/IkiWiki/Plugin/aggregate.pm 2010-06-24 13:03:33.000000000 -0400 + +++ aggregate.pm 2010-06-24 13:04:09.000000000 -0400 + @@ -488,7 +488,11 @@ + } + $feed->{feedurl}=pop @urls; + } + - my $res=URI::Fetch->fetch($feed->{feedurl}); + + my $res=URI::Fetch->fetch($feed->{feedurl}, + + UserAgent => LWP::UserAgent->new( + + cookie_jar => $config{cookies}, + + ), + + ); + if (! $res) { + $feed->{message}=URI::Fetch->errstr; + $feed->{error}=1; + +It works, but I have to remember to apply the diff whenever I update +ikiwiki. Can you provide a more elegant means of allowing cookies and/or +the user agent to be programmatically manipulated? --[[schmonz]] -- cgit v1.2.3 From 372ed18f2806367964ac500ac4f463ad466ca06f Mon Sep 17 00:00:00 2001 From: JoeRayhawk Date: Wed, 20 Oct 2010 06:57:06 +0000 Subject: forum: PageSpec results from independent checkout: call for help --- doc/forum/PageSpec_results_from_independent_checkout.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/PageSpec_results_from_independent_checkout.mdwn (limited to 'doc') diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn new file mode 100644 index 000000000..6b2fd6df0 --- /dev/null +++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn @@ -0,0 +1,5 @@ +I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, but at best I'm currently restricted to copying over and using whatever is in the indexdb with this approach: + + perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" + +I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk -- cgit v1.2.3 From 7e8064e9fa8b3f2c3c0bd0aa5458f00552398e06 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Oct 2010 18:53:50 -0400 Subject: add a hint that creation_month takes a number, not a month name --- IkiWiki.pm | 6 +++--- doc/ikiwiki/pagespec.mdwn | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/IkiWiki.pm b/IkiWiki.pm index 941ee13c4..1fa89586e 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2610,7 +2610,7 @@ sub match_created_after ($$;@) { sub match_creation_day ($$;@) { my $d=shift; if ($d !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid day'); + return IkiWiki::ErrorReason->new("invalid day $d"); } if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { return IkiWiki::SuccessReason->new('creation_day matched'); @@ -2623,7 +2623,7 @@ sub match_creation_day ($$;@) { sub match_creation_month ($$;@) { my $m=shift; if ($m !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid month'); + return IkiWiki::ErrorReason->new("invalid month $m"); } if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { return IkiWiki::SuccessReason->new('creation_month matched'); @@ -2636,7 +2636,7 @@ sub match_creation_month ($$;@) { sub match_creation_year ($$;@) { my $y=shift; if ($y !~ /^\d+$/) { - return IkiWiki::FailReason->new('invalid year'); + return IkiWiki::ErrorReason->new("invalid year $y"); } if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 6aec561ae..fe1af4c15 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page -- cgit v1.2.3 From a0eb16b68dc11d7e9e13f8f9aebb8cb9d312ef6e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmE7z4CSv-ctBarutQCd70R3CcaSPPxjVk" Date: Thu, 21 Oct 2010 05:27:08 +0000 Subject: --- ...r_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn (limited to 'doc') diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn new file mode 100644 index 000000000..8d6700651 --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn @@ -0,0 +1,7 @@ +I have been mucking about with ikiwiki for two whole days now. + +I like many things about it. Even though I've been spending most of my time wrestling with css I did manage to write a whole lot of blog posts and love what ikiwiki is doing for the "revise" part of my writing cycle. And I like the idea of integrating the wiki and the blog into one unifying architecture.... + +But... I would like very much to have different page templates for blogging and wiki-ing, some way of specifying that for stuff in the "/posts" directory I'd rather use blogpost.tmpl rather than page.tmpl. I just spent a few minutes looking at the perl for this (I assume Render.pm) and my mind dumped core... + +(generically, some way to specify output formatting on a subdirectory basis would be good) -- cgit v1.2.3 From 1fc550ac8c9a6ca8c666fde3bcbf5743a4b8d3fe Mon Sep 17 00:00:00 2001 From: "https://mukund.startssl.com/" Date: Thu, 21 Oct 2010 08:37:47 +0000 Subject: Fix link --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..2836d96e5 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -154,7 +154,7 @@ Personal sites and blogs * [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) -* [Mukund](https://www.mukund.org/) +* [Mukund](https://mukund.org/) * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) -- cgit v1.2.3 From 6a3323e9b6d5813233025a28d88d36cb861ee58c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" Date: Thu, 21 Oct 2010 15:00:50 +0000 Subject: Added a comment --- .../comment_1_15651796492a6f04a19f4a481947c97c._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment (limited to 'doc') diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment new file mode 100644 index 000000000..e92f4107d --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" + nickname="Javier" + subject="comment 1" + date="2010-10-21T15:00:50Z" + content=""" +You can do what you want with the [[ikiwiki/directive/pagetemplate]] directive, but in a slightly cumbersome way, because you have to say what template you want in every page that differs from the default. + +See also: [[templates]] + +And, a perhaps more proper solution to your problem, although I don't fully understand the way of tackling it, in [[todo/multiple_template_directories]]. + +If you could create a proper page in this wiki, centralizing all the knowledge dispersed in those pages, it would be nice ;) + +--[[jerojasro]] +"""]] -- cgit v1.2.3 From 5a82fad494ddbf8f283454202eb3d2712b1b4b19 Mon Sep 17 00:00:00 2001 From: fd Date: Fri, 22 Oct 2010 14:18:41 +0000 Subject: --- doc/sandbox/hey.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/hey.mdwn (limited to 'doc') diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn new file mode 100644 index 000000000..a955185ef --- /dev/null +++ b/doc/sandbox/hey.mdwn @@ -0,0 +1 @@ +* Hello -- cgit v1.2.3 From 91a3b74711df8a74e2d600ba3b0bca8f441d1958 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmZMunnF2szppZKh59QntrdlZDr6BPipiM" Date: Sat, 23 Oct 2010 02:16:00 +0000 Subject: --- doc/plugins/theme.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 7149cc163..2622abc88 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -9,3 +9,6 @@ inside `/usr/share/ikiwiki/themes/`. A theme provides, via the underlay, an enhanced version of the regular [[style.css]]. This leaves [[local.css]] free for you to further customise. Themes can also provide header and background images. + +You can set the theme via the **theme** option in your config file (after +enabling the plugin). Refresh the wiki after changing it to see the changes. -- cgit v1.2.3 From d567c8b209e6643f603d04f8f62f2ca67e9154c6 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:35:42 +0000 Subject: expand on using templates outside the wiki source directory --- doc/ikiwiki/directive/template.mdwn | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn index 6c50fa32e..9e3ae54df 100644 --- a/doc/ikiwiki/directive/template.mdwn +++ b/doc/ikiwiki/directive/template.mdwn @@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a template: The template is a regular wiki page, located in the `templates/` subdirectory inside the source directory of the wiki. -(Alternatively, templates can be stored in a directory outside the wiki, +Alternatively, templates can be stored in a directory outside the wiki, as files with the extension ".tmpl". -By default, these are searched for in `/usr/share/ikiwiki/templates`; +By default, these are searched for in `/usr/share/ikiwiki/templates`, the `templatedir` setting can be used to make another directory be searched -first.) +first. When referring to templates outside the wiki source directory, the "id" +parameter is not interpreted as a pagespec, and you must include the full filename +of the template page, including the ".tmpl" extension. E.g.: + + \[[!template id=blogpost.tmpl]] The template uses the syntax used by the [[!cpan HTML::Template]] perl module, which allows for some fairly complex things to be done. Consult its -- cgit v1.2.3 From 30a647edf89d9645291ee7ba1f8df328f4d21821 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:45:47 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/sandbox/revert_me.mdwn (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn new file mode 100644 index 000000000..2b1cd2f94 --- /dev/null +++ b/doc/sandbox/revert_me.mdwn @@ -0,0 +1 @@ +this looks good -- cgit v1.2.3 From 9d85b10be894c85529daac111040b1ff1ee3ecd9 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 17:47:04 +0000 Subject: --- doc/sandbox/revert_me.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,5 @@ this looks good + +alas, + + Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 1c8d7c450b6ec1e6bf9973525bf117035b907e98 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 18:06:17 +0000 Subject: web reversion - hmm --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/bugs/web_reversion_on_ikiwiki.info.mdwn (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn new file mode 100644 index 000000000..c8563b1b5 --- /dev/null +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -0,0 +1,5 @@ +I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was + + Error: you are not allowed to change sandbox/revert_me.mdwn + +I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon -- cgit v1.2.3 From 6ec52548c22d96f1d9eabdca48694ba167d47631 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:23:37 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..ed717d26d 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,3 +3,5 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn + +test -- cgit v1.2.3 From 2c0783831e08dc912d8c90879c00c3315bf85d96 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:32:46 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index ed717d26d..c3212ce71 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -3,5 +3,3 @@ this looks good alas, Error: you are not allowed to change sandbox/revert_me.mdwn - -test -- cgit v1.2.3 From f3820ee8acbbb31a4794039a989d3e642f5c6d2a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:17:57 +0000 Subject: test web revert (fixed bug) This reverts commit 9d85b10be894c85529daac111040b1ff1ee3ecd9 --- doc/sandbox/revert_me.mdwn | 4 ---- 1 file changed, 4 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index c3212ce71..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,5 +1 @@ this looks good - -alas, - - Error: you are not allowed to change sandbox/revert_me.mdwn -- cgit v1.2.3 From 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:29:12 -0400 Subject: test --- doc/sandbox/revert_me.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index 2b1cd2f94..d5fb06504 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1 +1,3 @@ this looks good + +ok -- cgit v1.2.3 From bb8fc299acf377846caa189cd17426e4abd2ce74 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ" Date: Sat, 23 Oct 2010 20:30:02 +0000 Subject: test 2 This reverts commit 45fac6dabf394d2b9bfdfd4026b4823dc6cc6308 --- doc/sandbox/revert_me.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn index d5fb06504..2b1cd2f94 100644 --- a/doc/sandbox/revert_me.mdwn +++ b/doc/sandbox/revert_me.mdwn @@ -1,3 +1 @@ this looks good - -ok -- cgit v1.2.3 From 9d78e484da5c0f8734cbc26bb1a8f89617d6afe8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:33:27 -0400 Subject: fixed --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index c8563b1b5..19a073da2 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -1,5 +1,12 @@ -I created [[sandbox/revert me]] and then tried the revert button on [[recentchanges]], but I was not allowed to revert it. The specific error was +I created [[sandbox/revert me]] and then tried the revert button on +[[recentchanges]], but I was not allowed to revert it. The specific error +was Error: you are not allowed to change sandbox/revert_me.mdwn -I've just tried reading through the revert code, and I haven't figured out what permission I am lacking. Perhaps the error message could be a little clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon +I've just tried reading through the revert code, and I haven't figured out +what permission I am lacking. Perhaps the error message could be a little +clearer on that. The error might have been thrown by git_parse_changes in +git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon + +[[fixed|done]] --[[Joey]] -- cgit v1.2.3 From 3993757cf8f5747dd19cf35e95e1078de1513acf Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Sat, 23 Oct 2010 20:48:03 +0000 Subject: Thanks Joey --- doc/bugs/web_reversion_on_ikiwiki.info.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn index 19a073da2..6f18cfcba 100644 --- a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -10,3 +10,5 @@ clearer on that. The error might have been thrown by git_parse_changes in git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon [[fixed|done]] --[[Joey]] + +: Brilliant, many thanks. -- [[Jon]] -- cgit v1.2.3 From 7163ec70f955a1ea902bc16d6a229b57732473b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:26:26 -0400 Subject: add news item for ikiwiki 3.20101023 --- doc/news/version_3.20100815.mdwn | 4 ---- doc/news/version_3.20101023.mdwn | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 doc/news/version_3.20100815.mdwn create mode 100644 doc/news/version_3.20101023.mdwn (limited to 'doc') diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn deleted file mode 100644 index 1073933a1..000000000 --- a/doc/news/version_3.20100815.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -ikiwiki 3.20100815 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix po test suite to not assume ikiwiki's underlay is already installed. - Closes: #[593047](http://bugs.debian.org/593047)"""]] \ No newline at end of file diff --git a/doc/news/version_3.20101023.mdwn b/doc/news/version_3.20101023.mdwn new file mode 100644 index 000000000..44bed6be6 --- /dev/null +++ b/doc/news/version_3.20101023.mdwn @@ -0,0 +1,4 @@ +ikiwiki 3.20101023 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix typo that broke anonymous git push. + * Fix web reversion when the srcdir is in a subdir of the git repo."""]] \ No newline at end of file -- cgit v1.2.3 From 38f0bec34560d2258a2d690676987b12ab184490 Mon Sep 17 00:00:00 2001 From: "72.0.72.144" <72.0.72.144@web> Date: Sun, 24 Oct 2010 13:58:59 +0000 Subject: poll vote (Accept both) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 025a07802..05991ff72 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] -- cgit v1.2.3