Well, that's Git integration working. Not complete; it ought to be possible

to view the log of the current page, and previous versions - but it's a start.

resources/public/content/Introduction.md

@@ -2,7 +2,7 @@
 
 Smeagol is a simple Wiki engine inspired by [Gollum](https://github.com/gollum/gollum/wiki). Gollum is a Wiki engine written in Ruby, which uses a number of simple text formats including [Markdown](http://daringfireball.net/projects/markdown/), which uses [Git](http://git-scm.com/) to provide versioning and backup. I needed a new Wiki for a project and thought Gollum would be ideal - but unfortunately it doesn't provide user authentication, which I needed, and it was simpler for me to reimplement the bits I did need in Clojure than to modify Gollum.
 
-So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which will soon use Git as its versioning and backup system.
+So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which uses Git as its versioning and backup system.
 
 ## Markup syntax
 
@@ -10,15 +10,15 @@ Smeagol uses the Markdown format as provided by [markdown-clj](https://github.co
 
 ## Security and authentication
 
-Currently security is very weak. There is currently a file called *passwd* in the *resources/public* directory, which contains a clojure map of username/plain-text password pairs thus:
+Currently security is very weak. There is currently a file called *passwd* in the *resources/public* directory, which contains a clojure map of which maps username to maps with plain-text passwords and emails thus:
 
-    {:admin "admin"}
+    {:admin {:password "admin" :email "admin@localhost"}
+     :adam {:password "secret" :email "adam@localhost"}}
 
 that is to say, the username is a keyword and the corresponding password is a string. Obviously, this is a temporary solution while in development which I will fix later.
 
 ## Todo
 
-* Git integration! Smeagol doesn't have any inbuilt versioning or backup mechanism; it's intended that Git will be used as that mechanism. But it isn't implemented yet;
 * Image (and other media) upload;
 * Improved editor. The editor is at present very primitive - right back from the beginnings of the Web. It would be nice to have a rich embedded editor like [Hallo](https://github.com/bergie/hallo) or [Aloha](http://aloha-editor.org/Content.Node/index.html) but I havenven't (yet) had time to integrate them!
 * Improved security. Having the passwords in plain text rather than encrypted is just basically poor; having the passwd file in *public* space is also poor (although I believe it cannot be accessed via HTTP). Essentially, authentication mechanisms should be pluggable, and at present they aren't; 

resources/public/passwd

@@ -1 +1,2 @@
-{:admin "admin"}
+{:admin {:password "admin" :email "admin@localhost"}}
+

resources/templates/edit.html

@@ -11,6 +11,11 @@
         <form action="{{servlet-context}}/edit" method="POST">
             <input type="hidden" name="content" value="{{title}}"/>
             <textarea name="src" id="src" rows="25" cols="80">{{content}}</textarea>
+        	<p class="widget">
+                <label for="summary">What have you changed?</label>
+                <input name="summary" id="summary" type="text" 
+                	value="{%if exists%}{%else%}New file {{title}}{%endif%}"/>
+        	</p>
             <p class="widget">
                 <label for="submit">When you have finished editing</label>
                 <input name="submit" id="submit" type="submit" class="action" value="Save!"/>