From 4865408bb47253f6365f0ad7f1b17c689c0fc1dd Mon Sep 17 00:00:00 2001
From: VicDeo <dubiniuk@owncloud.com>
Date: Tue, 13 Jan 2015 17:29:06 +0300
Subject: [PATCH] WebODF sync instructions. Closes #426

---
 README.md | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 2613e087..c87794fb 100644
--- a/README.md
+++ b/README.md
@@ -22,21 +22,31 @@ If you don't want to mess around with dependencies, you need simply install `uno
 
 ### WebODF upgrade ###
 1. Build WebODF:
-```
-git clone https://github.com/kogmbh/WebODF.git webodf
-mkdir build
-cd build
-cmake ../webodf
-make webodf.js-target
-```
+
+        git clone https://github.com/kogmbh/WebODF.git webodf
+        mkdir build
+        cd build
+        cmake ../webodf
+        make webodf.js-target
 
 2. Refresh code and create a new branch:
-```
-cd /path/to/documents
-git checkout master
-git pull --rebase
-git checkout -b new-branch
-```
+
+        cd /path/to/documents
+        git checkout master
+        git pull --rebase
+        git checkout -b new-branch
 
 3. Run upgrade script:
-./src/updateWebODF.sh
+
+        ./src/updateWebODF.sh /path/to/WebODF/build/dir
+
+4. Resolve confilcts in patches (if any). Commit changes.
+5. Update patches in `/path/to/documents/src/patches` according to conflicts. Commit changes.
+6. Test UI. Fix glitches by updating CSS. Commit changes.
+7. Run locale extraction script:
+
+        ./src/updateWebODF.sh
+
+8. Commit changes
+9. Push the branch for testing
+10. You are done.