Merge remote-tracking branch 'bremner/master'

diff --git a/doc/bugs/Please_update_highlight_plugin_for_highlight_3.18.mdwn b/doc/bugs/Please_update_highlight_plugin_for_highlight_3.18.mdwn
new file mode 100644 (file)
index 0000000..910e6a1
--- /dev/null
+++ b/doc/bugs/Please_update_highlight_plugin_for_highlight_3.18.mdwn
@@ -0,0 +1,10 @@
+I have put two patches 
+
+     git://pivot.cs.unb.ca/ikiwiki.git -b master
+
+The first works around a highlight API change, and the second supports the new(ish) 
+feature of having multiple directories with language defintions for highlight.
+
+The corresponding version of libhighlight-perl is in Debian experimental if you want to test.
+
+[[!tag patch]] 

diff --git a/doc/forum/Spaces_in_URLs.mdwn b/doc/forum/Spaces_in_URLs.mdwn
index 847d1416785dd506f44a81f9dd3cd56b13ce7a30..4749f4dc557f3edea5293735815ca6cc647982f3 100644 (file)
--- a/doc/forum/Spaces_in_URLs.mdwn
+++ b/doc/forum/Spaces_in_URLs.mdwn
@@ -8,3 +8,7 @@ Now that I've moved to Ikiwiki, that doesn't work. So I moved the file here:
 Is there a better approach to maintaining this link than setting an alias in Apache?
 
 > You can add the space character to the `wiki_file_chars` argument in your setup file. -- [[Jon]]
+
+>> a space character is not allowed in a url; user agents that read one usually represent it in percent encoded form (`%20`). if you use that, things also work for direct links, which i assume caused the problem (for both the links in the original description render correctly): `\[[http://dada.pink/scarsdale/Statement%2020140527.pdf]]` renders [[http://dada.pink/scarsdale/Statement%2020140527.pdf]].
+>>
+>> spaces are allowed in internal pages because wiki page names are not urls per se but converted using conversion rules -- this allows people to not think about url rules and just link to pages, but when you're linking outside ikiwiki, some strings just aren't valid urls. --[[chrysn]]

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 442d02df0091badeafb06682288857c9339e4bb7..23ff9017d366b3d407ce6788c9bf05856bbf91e6 100644 (file)
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -843,6 +843,13 @@ images as small as the ones you used. You might find
 or the same techniques, useful: it contains images with a realistic pixel
 count, but very very lossy JPEG compression, to keep the size in bytes low.
 
+> I have now created a large (images) example, you can find all the examples
+> here [1]. I have also built all the examples with the album5 branch, you can
+> find the results here [2].
+>
+> 1: <http://cbaines.net/projects/ikiwiki/album/dest/>
+> 2: <http://cbaines.net/projects/ikiwiki/album/dest-album5/>
+
 It's much, much easier to review changes if you use separate commits for
 cosmetic changes like "separate index CSS from viewer CSS" and "more
 consistent indentation", and functional changes like turning the prev/next
@@ -850,6 +857,10 @@ links from absolutely-positioned to floating. I'd be happy to apply
 the cosmetic changes if they were in commits that were literally only
 cosmetic changes, with no functional effect.
 
+> I have now rewritten the CSS changes to get a smaller diff. The only big
+> functional change is from the previous patch is the max-width stuff to cope
+> better with large images.
+
 For the functional bits: I think I'd have used floating boxes instead of the
 absolutely-positioned boxes that are currently used if they provided the effect
 I wanted. I can't remember exactly why I didn't do that now, but
@@ -863,3 +874,16 @@ branch, could you please explain it, and perhaps we can come up with something
 that matches both our requirements?
 
 --smcv
+
+> I don't think that something specific is wrong with CSS in the album5 branch,
+> but it does not display large [3], or small [4] images very well. It might be
+> possible to resolve the image size issues without changing from absolute
+> positioning, but I felt (for no particular reason) that I would do it using
+> floats.
+>
+> The clickable region on the margin seems the most likely reason to me to go
+> with absolute positioning, as an initial look at doing this with floats
+> suggests that it is non-trivial.
+>
+> 3: <http://cbaines.net/projects/ikiwiki/album/dest-album5/large-goldtype/album/3/>
+> 4: <http://cbaines.net/projects/ikiwiki/album/dest-album5/basic-blueview/album/ikiwiki_old/>