Index: trunk/cli/authors.ml
===================================================================
--- trunk/cli/authors.ml	(revision 63)
+++ trunk/cli/authors.ml	(revision 65)
@@ -7,5 +7,5 @@
 	Person.Set.iter (fun x -> print_endline (Person.to_string x)) s
 
-open Cmdliner
+open Ocmd
 let term =
 	let recurse = Arg.(value & flag & info ["R"]
Index: trunk/cli/convert.ml
===================================================================
--- trunk/cli/convert.ml	(revision 63)
+++ trunk/cli/convert.ml	(revision 65)
@@ -77,5 +77,5 @@
 	| path -> Printf.eprintf "Path doesn't exist: %s" path
 
-open Cmdliner
+open Ocmd
 let term =
 	let path = Arg.(value & pos 0 string "" & info [] ~docv:"path"
Index: trunk/cli/edit.ml
===================================================================
--- trunk/cli/edit.ml	(revision 63)
+++ trunk/cli/edit.ml	(revision 65)
@@ -1,3 +1,3 @@
-open Cmdliner
+open Ocmd
 let term =
 	let id = Arg.(value & pos 0 string "" & info [] ~docv:"text ID") in
Index: trunk/cli/file.ml
===================================================================
--- trunk/cli/file.ml	(revision 63)
+++ trunk/cli/file.ml	(revision 65)
@@ -15,5 +15,5 @@
 	List.iter (fun d -> List.iter (unlink d) files) dirs
 
-open Cmdliner
+open Ocmd
 let term =
 	let files = Arg.(value & pos_all string [] & info []
Index: trunk/cli/index.ml
===================================================================
--- trunk/cli/index.ml	(revision 63)
+++ trunk/cli/index.ml	(revision 65)
@@ -68,5 +68,5 @@
 	index { dir; index_path; pck = Header_pack.of_kv kv }
 
-open Cmdliner
+open Ocmd
 let term =
 	let print= Arg.(value & flag & info ["print"] ~doc:"print info") in
Index: trunk/cli/last.ml
===================================================================
--- trunk/cli/last.ml	(revision 63)
+++ trunk/cli/last.ml	(revision 65)
@@ -21,5 +21,5 @@
 	| Some (_, f) -> List.iter print_endline f
 
-open Cmdliner
+open Ocmd
 let term =
 	let mine = Arg.(value & flag & info ["mine"] ~doc:"last text authored by me") in
Index: trunk/cli/listing.ml
===================================================================
--- trunk/cli/listing.ml	(revision 63)
+++ trunk/cli/listing.ml	(revision 65)
@@ -20,5 +20,5 @@
 		| None -> FS.iter ~r ~dir ~predicate ~order list_text
 
-open Cmdliner
+open Ocmd
 let term =
 	let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in
Index: trunk/cli/new.ml
===================================================================
--- trunk/cli/new.ml	(revision 63)
+++ trunk/cli/new.ml	(revision 65)
@@ -1,4 +1,4 @@
 open Logarion
-open Cmdliner
+open Ocmd
 
 let new_txt title topics_opt interactive =
Index: trunk/cli/peers.ml
===================================================================
--- trunk/cli/peers.ml	(revision 63)
+++ trunk/cli/peers.ml	(revision 65)
@@ -29,5 +29,5 @@
 		Logarion.Peers.fold print_peer ()
 
-open Cmdliner
+open Ocmd
 let term =
 	let remove = Arg.(value & opt (some string) None & info ["remove"]
Index: trunk/cli/pull.ml
===================================================================
--- trunk/cli/pull.ml	(revision 63)
+++ trunk/cli/pull.ml	(revision 65)
@@ -139,5 +139,5 @@
 	| "" -> pull_list auths topics | x -> ignore (pull_index x auths topics)
 
-open Cmdliner
+open Ocmd
 let term =
 	let authors = Arg.(value & opt (some string) None & info ["a"; "authors"]
Index: trunk/cli/read.ml
===================================================================
--- trunk/cli/read.ml	(revision 63)
+++ trunk/cli/read.ml	(revision 65)
@@ -1,5 +1,5 @@
 open Logarion
 
-open Cmdliner
+open Ocmd
 let term =
 	let id = Arg.(value & pos 0 string "" & info [] ~docv:"text ID") in
Index: trunk/cli/recent.ml
===================================================================
--- trunk/cli/recent.ml	(revision 63)
+++ trunk/cli/recent.ml	(revision 65)
@@ -3,5 +3,5 @@
 module A = Archive
 
-open Cmdliner
+open Ocmd
 let term =
 	let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in
Index: trunk/cli/topics.ml
===================================================================
--- trunk/cli/topics.ml	(revision 63)
+++ trunk/cli/topics.ml	(revision 65)
@@ -7,5 +7,5 @@
 	print_endline @@ String_set.to_string s
 
-open Cmdliner
+open Ocmd
 let term =
 	let recurse = Arg.(value & flag & info ["R"]
Index: trunk/cli/txt.ml
===================================================================
--- trunk/cli/txt.ml	(revision 63)
+++ trunk/cli/txt.ml	(revision 65)
@@ -1,9 +1,7 @@
-let version = "1.3.2"
-
-open Cmdliner
+open Ocmd
 let default_cmd =
 	let doc = "Discover, collect & exchange texts" in
 	let man = [ `S "CONTACT"; `P "<mailto:logarion-dev@chaotic.ninja>" ] in
-	Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version ~doc ~man
+	Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version:"%%VERSION%%" ~doc ~man
 
 let () = match Term.eval_choice default_cmd [
