[MERGING
ganesh**Mon Feb 17 23:16:34 GMT 2003] {
hunk ./CHANGELOG 10
+$Added '#' to the list of allowable characters in a path
hunk ./MERGING 87
+devel-55: Added "probing" utility
+devel-56: Added '#' to the list of allowable characters in a path
+devel-57: updates to manual.html
hunk ./MERGING 91
-
hunk ./MERGING 154
+Pending for nick:
+  devel-54 -> devel-57
+
hunk ./doc/manual.html 9
+ 
+    <h2>Contents</h2>
hunk ./doc/manual.html 12
+    <ul>    
+    <li>Installation
+        <ul>
+        <li>Redhat</li>
+        <li>Debian</li>
+        </ul>
+    </li>
+    <li>Configuration
+        <ul>
+        <li><a href="#quickstart">Quick start</a>
+            <ul>
+            <li>Configuring /etc/photopubrc</li>
+            <li>Creating ~/.photopubrc</li>
+            <li>.info files</li>
+            </ul>
+        </li>
+        <li>Webserver configuration</li>
+        <li>General guide</li>
+        </ul>
+    </li>
+    <li>Reference</li>
+    </ul>
+
hunk ./doc/manual.html 44
-    <h3>Quick start guide</h3>
+    <h3>Quick start</h3>
hunk ./doc/manual.html 150
+    <h4>.info files</h4>
+    These files are used to annotate your photos with extra information,
+    such as descriptions, which photos should be grouped together in the 
+    album page, and how the photo should be adjusted when presented to the 
+    user. The file should be placed in the same directory as the photos
+    it describes. If you don't like the name, use whatever you like (and 
+    change the "filename" option above). 
+
+    Here's a short sample of such a file:
+
+    <pre>
+    group 1-5 My first photos
+    describe 1 Me
+    rotate 1 90
+    adjust 1 1.1 1.1 1.1
+    </pre>
+ 
+    The "group" item will cause an entry pointing to that range of photos to 
+    go into the album page. The "describe" item will provide a caption for 
+    the range page. Use "rotate" to turn the picture the right way up, and 
+    adjust to change the colour balance - the values given should be gamma
+    correction values for red, green and blue respectively, with 1 meaning 
+    no change.
+
+    <h3>Webserver configuration</h3>
+
+    <p>
+    Following the principles set out by Tim Berners-Lee in 
+    "<a href="http://www.w3.org/Provider/Style/URI">Cool URIs don't 
+    change</a>", every effort has been made to reduce 
+    implementation dependencies (cgi-bin in the path, .pl extensions)
+    in PhotoPub URLs, to allow for the 
+    possibility of an entirely different implementation of the same interface
+    in future. 
+    </p>
+
+    <p>
+    Thus, a "standard" installation will be accessed at the URL 
+
+    <pre>http://hostname/photopub/{album|range|display}?...</pre>
+    
+    If you installed from a package and are using Apache as your webserver, 
+    this should have been set up automatically, but you may need to deal with
+    this manually if your configuration is non-standard in some way that
+    collides with the assumptions we made.
+    </p>
+
+    <p>
+    If for whatever reason you do not wish to do things in this way, you are
+    mostly on your own for now, but you may find the following settings in
+    /etc/photopubrc useful:
+ 
+    <pre>
+    albumlinkroot album
+    rangelinkroot range
+    displaylinkroot display
+    </pre>
+
+    PhotoPub makes links to other PhotoPub pages using relative links,
+    so everything but the final element in the path of these links 
+    is determined by the URL you access it at. 
+    These settings control what that final element should be - you may for
+    example wish to change album to album.pl, etc.
+    </p>
+
+    <p>
+    We will try our best to avoid incompatible changes in the 
+    query parameters and script names, although it cannot be completely 
+    ruled out, especially in development releases.
+    </p>
+
+    <h3>General guide</h3>
+
+    <h2>Reference</h2>
hunk ./doc/manual.html 254
-    <p>
-
-    <hr>
-    <address><a href="mailto:ganesh@rocky">Ganesh Sittampalam</a></address>
-<!-- Created: Wed Oct  2 09:23:15 BST 2002 -->
-<!-- hhmts start -->
-Last modified: Sun Feb  9 21:01:02 GMT 2003
-<!-- hhmts end -->
}