Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / plugins / contrib / album.mdwn

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index c2f991d5a9bb25768083a9bdd39b94fa0f537681..9fac111647a1ac6b7ef8164c8590ad4a8317dab2 100644 (file)
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -47,6 +47,10 @@ is to provide a direct link to the image.)
 Updated, June 2014: integrated changes from [[KathrynAndersen]],
 Lukas Lipavsky and kjs
 
+An `album6` branch is also available, but is less suitable
+for manual installation since it needs core IkiWiki changes
+(until [[bugs/trails depend on everything]] is fixed).
+
 ### Manual installation
 
 First, you need a version of ikiwiki with the [[trail]] plugin merged in