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

5 files changed, 70 insertions, 24 deletions

diff --git a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
index fc10b4d47..66d71a223 100644
--- a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
+++ b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn
@@ -1 +1,7 @@
+[[!template  id=gitbranch branch=anarcat/master author="[[anarcat]]"]]
+
 I know this sounds backwards, but it seems to me that the KML-generated map should be displayable on google maps. KML is the standard Google uses for google maps, and since we use it, we should interoperate with them. God knows why this is failing, but it is and should probably be fixed for the sake of interoperability: <https://maps.google.ca/maps?q=http:%2F%2Fwiki.reseaulibre.ca%2Fmap%2Fpois.kml> -- [[users/anarcat]]
+
+> The KML only needs a Document tag because it uses "shared styles" -- don't ask me what this is. Here is a [[patch]]: [[https://reseaulibre.deuxpi.ca/0001-Add-Document-tag-to-OSM-plugin-KML-output.patch]] --[[deuxpi]]
+
+> > I applied the patch to my master branch and tested it on the above URL: it works... mostly. The icons for the elements on the actual map seem incorrect (some are the proper icons, some others are the ugly default blue pin of google maps, weird) but I think this is a step in the right direction. Thus, this should be merged. -- [[anarcat]]
diff --git a/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment b/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment
new file mode 100644
index 000000000..5546c4789
--- /dev/null
+++ b/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY"
+ nickname="FName"
+ subject="How to install the trail package?"
+ date="2012-08-09T00:11:26Z"
+ content="""
+I tried putting
+
+trail 
+
+in
+
+    add_plugins => [qw{ 
+    ...
+    trail
+    ...
+    }]
+
+in site.setup and rebuild.  It gives error
+
+    Failed to load plugin IkiWiki::Plugin::trail: Can't locate IkiWiki/Plugin/trail.pm in @IN ...
+
+"""]]
diff --git a/doc/forum/possible_utf-8_problem__63__.mdwn b/doc/forum/possible_utf-8_problem__63__.mdwn
new file mode 100644
index 000000000..fb87fadd1
--- /dev/null
+++ b/doc/forum/possible_utf-8_problem__63__.mdwn
@@ -0,0 +1,26 @@
+I have some problems with a blog wiki that I try to setup.
+
+Everything seemed to work correctly with utf-8 until
+I tried to have a page name with utf-8 characters that
+contained a blog. More testing showed that the 'from'-parameter
+in the form didn't like utf-8. Just that variable, everything
+else works fine.
+
+As soon as I try to add a new entry I get "bad page name"
+instead of the editpage.
+
+Here is an example:
+The page itself is named 'hönshuset.mdwn' and it contains
+this blog inline:
+
+\[\[!inline  pages="honshuset/*" postform=yes ]]
+
+Looking at the form, it is the from-parameter that contains 'hönshuset'
+that triggers the problem. If I rename the file to honshuset.mdwn
+everything works fine.
+
+For some reason the from-parameter seems to depend on both the filename and
+the rootpage parameter. If I add *rootpage*, then I must not use
+utf-8 characters in *rootpage* or in the source filename.
+
+I use ikiwiki 3.20120629 in Debian sid.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 51c24ba96..5c3bb8d51 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -2,32 +2,25 @@
 
 [[!pagestats  pages="/tags/*"]]
 
-An initial change
 Hello, ikiwiki.
 
 Testing.
 
 [[!sidebar ]]
 
+Here's a hr:
+
+---------------------------------------------------------
 
 ## number 2
 ### number 3
+#### number 4
 
 This is the SandBox, a page anyone can edit to try out ikiwiki
 (version [[!version  ]]).
 
 [[!toc levels=1 startlevel=2 ]]
 
-See, online editing :-p
-
-Let's try this~!
-
-w00t, how does this look on the **git** end? Well, as a commit of course.
-
-Testing this sandbox thing.
-
-Awesome :P
-
 ## Blockquotes
 
 > This is a blockquote.
@@ -54,6 +47,15 @@ Let's see a table:
 Heading 1|Heading 2|Heading 3
 Item 1| Item 2| Item 3"""]]
 
+    location / {
+     proxy_pass http://test.ashep:80;
+     proxy_cache default;
+     proxy_cache_valid 200 302 10m;
+     proxy_cache_valid 404 1m;
+    }
+
+
+
 
 Numbered list 
 
@@ -178,16 +180,3 @@ module vc_Mux2 #( parameter W = 1 )
 
 endmodule
 """]]
-
-#<asd>
-
-This is simple enough for now [[sandbocen]] no?
-
-    Do code tags work?
-
-test by max
-
-test by bbb
-
-
-Can I make a [[NewPage]]?
diff --git a/doc/todo/custom_location_for_openlayers.mdwn b/doc/todo/custom_location_for_openlayers.mdwn
index ac9b40cf5..c387a4cf5 100644
--- a/doc/todo/custom_location_for_openlayers.mdwn
+++ b/doc/todo/custom_location_for_openlayers.mdwn
@@ -8,3 +8,5 @@ For those reasons, I think the location of that script should be customizable. -
 [[!template  id=gitbranch branch=anarcat/master author="[[anarcat]]"]]
 
 There is now a [[patch]] for this, thanks to Genevieve, available in my master branch.
+
+Note that there's an update to the patch in my master branch, that allows changing the URL for tiles too.