everything moved to sysbystem Diff, removed patch utility, blackbox commands and...

[bbdiff.git] / README

diff --git a/README b/README
index 81432a6d14167c00e71816ca7bfd7d6dc2ddd693..5c03ad50c9be9233bfce2f886cd00f8606a6707c 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 BlackBox diffutils
 --------------------
 
-Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
+Clone of diff and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
 
 
 Commands
@@ -9,38 +9,31 @@ Commands
 
 To use tools within Blackbox just compile DevDiff.
 
-DevDiff.Compare (guard TextCmds.FocusGuard)
+DiffUtils.Compare (guard TextCmds.FocusGuard)
 
        Compare texts from two windows.
-       Can directly replace DevSearch.Compare in Dev/Rsrc/Menus.odc.
+       You can directly replace DevSearch.Compare with it in Dev/Rsrc/Menus.odc.
 
 
-^Q DevDiff.CompareThis <oldfile> <newfile> [">" <outfile>]
+^Q DiffUtils.CompareThis <oldfile> <newfile> [">" <outfile>]
 
        Compare two files and produce patch in unified diff format.
 
 
-^Q DevDiff.ApplyPatch <patchfile>
+^Q DiffUtils.MergeThis <my> <old> <your> [">" <outfile>]
 
-       Read unified diff format and apply changes from it.
-
-
-^Q DevDiff.MergeThis <my> <old> <your> [">" <outfile>]
-
-       Read three files and do three-way merge like.
+       Read three files and do three-way merge like diff3.
 
 
 Dedicated tool
 --------------------
 
 You can read, create diffs and merge documents from command line using odctool.
-To build open OdctoolMain and execute commanders at the end of document.
-Call `odctoll.exe help` to learn how to use it.
-
-Warning: It tested only with wine and NOT tested on windows or native linux.
+To build it, open DiffMain and execute commanders at the end of document.
+Call `odctool help` to learn how to use it.
 
 
-Integration with GIT
+Integration with Git
 --------------------
 
 It is possible to integrate three-way merge with git.
@@ -49,7 +42,7 @@ It is possible to integrate three-way merge with git.
 
        [merge "odctool"]
                name = BlackBox Compound Document merge driver
-               driver = /full/path/to/odctool merge -P %P %A %O %B %A
+               driver = /full/path/to/odctool merge -p %P -o %A %A %O %B
 
 2. Open/create .git/info/attributes and add this line:
 
@@ -62,6 +55,5 @@ Checked not only text, but also views and formatting.
 Current state
 --------------------
 
-This is NOT final version of module DevDiff and Odctool. It is NOT well tested, you are warned!
-Also, program and user interfaces can be changed later.
-Todo list see at the and of sources and build tools.
+This is NOT final version of subsustem Diff and odctool. It is NOT well tested, you are warned!
+Also, program and user interface are not stable yet, so it can be changed in future.