# HG changeset patch
# User Bernhard Reiter <bernhard@intevation.de>
# Date 1425647244 -3600
# Node ID 77c3e481bea9990ef53e59ff58d7cde38a2650fc
# Parent  b517f2c54272be1e6f8912be1d877884c6435c5a
Minor typos corrected.

diff -r b517f2c54272 -r 77c3e481bea9 README.rst
--- a/README.rst	Fri Mar 06 11:29:33 2015 +0100
+++ b/README.rst	Fri Mar 06 14:07:24 2015 +0100
@@ -24,7 +24,7 @@
     PY3O_UNO_SERVER_HOSTNAME = "my.server.url"
     PY3O_UNO_SERVER_PORT = 4001
 
-or host and port for the odfcase service::
+or host and port for the odfcast service::
 
     SERVER_NAME = "my.odfcast.url:8500"
 
diff -r b517f2c54272 -r 77c3e481bea9 odfcast/templates/merge.html
--- a/odfcast/templates/merge.html	Fri Mar 06 11:29:33 2015 +0100
+++ b/odfcast/templates/merge.html	Fri Mar 06 14:07:24 2015 +0100
@@ -8,6 +8,6 @@
         <label for="files">Files</label>
         <input id="files" type="file" name="files" multiple>
     </div>
-    <button class="btn btn-default" type="submit">Convert</button>
+    <button class="btn btn-default" type="submit">Merge</button>
 </form>
 {% endblock %}