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

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

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index 3cfcb68d4095e1817e4d335f85256ffb27083683..daf16fd3c34176f71b6ca846af9434632418f8a7 100644 (file)
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -34,10 +34,10 @@ Each page containing an `album` directive is treated as a photo album.
 
 Every image attached to an album or its subpages is considered to be part of
 the album. A "viewer" page, with the wiki's default page extension, will be
 
 Every image attached to an album or its subpages is considered to be part of
 the album. A "viewer" page, with the wiki's default page extension, will be

-generated to display the image, if there isn't already a page of the same
-name as the image: for instance, if `debconf` is an album and
-`debconf/tuesday/p100.jpg` exists, then `debconf/tuesday/p100.mdwn` might
-be created.
+generated in the [[transient underlay|todo/transient_pages]] to display the
+image, if there isn't already a page of the same name as the image: for
+instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists,
+then `debconf/tuesday/p100.mdwn` might be created.

 
 There's currently a hard-coded list of extensions that are treated as images:
 `png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could
 
 There's currently a hard-coded list of extensions that are treated as images:
 `png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could


@@ -138,7 +138,7 @@ image viewer.
   as a reference implementation of that hook.
 
 * There should be an option to reduce the size of photos and write them into
   as a reference implementation of that hook.
 
 * There should be an option to reduce the size of photos and write them into

-  an underlay, for this workflow:
+  an underlay (perhaps just the transient underlay), for this workflow:

 
   * your laptop's local ikiwiki has two underlays, `photos` and `webphotos`
   * `photos` contains full resolution photos with EXIF tags
 
   * your laptop's local ikiwiki has two underlays, `photos` and `webphotos`
   * `photos` contains full resolution photos with EXIF tags