diff --git a/addons/caldav/doc/caldav_doc.pdf b/addons/caldav/doc/caldav_doc.pdf
index e49abc3add8..a9ea5810739 100644
--- a/addons/caldav/doc/caldav_doc.pdf
+++ b/addons/caldav/doc/caldav_doc.pdf
@@ -63,12 +63,12 @@ endobj
 7 0 obj
 % Page dictionary
 << /Annots [ 6 0 R ]
- /Contents 23 0 R
+ /Contents 33 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 22 0 R
+ /Parent 32 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -113,45 +113,29 @@ endobj
 10 0 obj
 << /A << /S /URI
  /Type /Action
- /URI (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings) >>
+ /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
  /Border [ 0
  0
  0 ]
- /Rect [ 162.2528
- 315.5936
- 503.8577
- 327.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER5': class PDFDictionary 
-11 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 118.6929
- 303.5936
- 422.7329
- 315.5936 ]
+ /Rect [ 85.69291
+ 294.5936
+ 379.7229
+ 306.5936 ]
  /Subtype /Link
  /Type /Annot >>
 endobj
 % 'Page2': class PDFPage 
-12 0 obj
+11 0 obj
 % Page dictionary
 << /Annots [ 8 0 R
  9 0 R
- 10 0 R
- 11 0 R ]
- /Contents 24 0 R
+ 10 0 R ]
+ /Contents 34 0 R
  /MediaBox [ 0
  0
  595.2756
  841.8898 ]
- /Parent 22 0 R
+ /Parent 32 0 R
  /Resources << /Font 1 0 R
  /ProcSet [ /PDF
  /Text
@@ -162,112 +146,270 @@ endobj
  /Trans <<  >>
  /Type /Page >>
 endobj
-% 'R13': class PDFCatalog 
+% 'Annot.NUMBER5': class PDFDictionary 
+12 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 162.2528
+ 690.5936
+ 503.8577
+ 702.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER6': class PDFDictionary 
 13 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 118.6929
+ 678.5936
+ 422.7329
+ 690.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER7': class PDFDictionary 
+14 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://www.mozilla.org/projects/calendar/lightning/) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 62.69291
+ 477.5936
+ 282.2129
+ 489.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Annot.NUMBER8': class PDFDictionary 
+15 0 obj
+<< /A << /S /URI
+ /Type /Action
+ /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
+ /Border [ 0
+ 0
+ 0 ]
+ /Rect [ 85.69291
+ 354.5936
+ 379.7229
+ 366.5936 ]
+ /Subtype /Link
+ /Type /Annot >>
+endobj
+% 'Page3': class PDFPage 
+16 0 obj
+% Page dictionary
+<< /Annots [ 12 0 R
+ 13 0 R
+ 14 0 R
+ 15 0 R ]
+ /Contents 35 0 R
+ /MediaBox [ 0
+ 0
+ 595.2756
+ 841.8898 ]
+ /Parent 32 0 R
+ /Resources << /Font 1 0 R
+ /ProcSet [ /PDF
+ /Text
+ /ImageB
+ /ImageC
+ /ImageI ] >>
+ /Rotate 0
+ /Trans <<  >>
+ /Type /Page >>
+endobj
+% 'R17': class PDFCatalog 
+17 0 obj
 % Document Root
-<< /Outlines 15 0 R
- /PageLabels 25 0 R
+<< /Outlines 19 0 R
+ /PageLabels 36 0 R
  /PageMode /UseNone
- /Pages 22 0 R
+ /Pages 32 0 R
  /Type /Catalog >>
 endobj
-% 'R14': class PDFInfo 
-14 0 obj
+% 'R18': class PDFInfo 
+18 0 obj
 << /Author ()
- /CreationDate (D:20110107131258-01'00')
+ /CreationDate (D:20110107152143-01'00')
  /Keywords ()
  /Producer (ReportLab http://www.reportlab.com)
  /Subject (\(unspecified\))
  /Title () >>
 endobj
-% 'R15': class PDFOutlines 
-15 0 obj
-<< /Count 7
- /First 16 0 R
- /Last 21 0 R
+% 'R19': class PDFOutlines 
+19 0 obj
+<< /Count 15
+ /First 20 0 R
+ /Last 29 0 R
  /Type /Outlines >>
 endobj
 % 'Outline.0': class OutlineEntryObject 
-16 0 obj
+20 0 obj
 << /Count 3
  /Dest [ 7 0 R
  /XYZ
  62.69291
  765.0236
  0 ]
- /First 17 0 R
- /Last 19 0 R
- /Next 20 0 R
- /Parent 15 0 R
+ /First 21 0 R
+ /Last 23 0 R
+ /Next 24 0 R
+ /Parent 19 0 R
  /Title (CalDAV How-To) >>
 endobj
-% 'Outline.7.0': class OutlineEntryObject 
-17 0 obj
+% 'Outline.13.0': class OutlineEntryObject 
+21 0 obj
 << /Dest [ 7 0 R
  /XYZ
  62.69291
  648.0236
  0 ]
- /Next 18 0 R
- /Parent 16 0 R
+ /Next 22 0 R
+ /Parent 20 0 R
  /Title (OpenERP server Setup) >>
 endobj
-% 'Outline.7.1': class OutlineEntryObject 
-18 0 obj
+% 'Outline.13.1': class OutlineEntryObject 
+22 0 obj
 << /Dest [ 7 0 R
  /XYZ
  62.69291
  450.0236
  0 ]
- /Next 19 0 R
- /Parent 16 0 R
- /Prev 17 0 R
+ /Next 23 0 R
+ /Parent 20 0 R
+ /Prev 21 0 R
  /Title (DNS server setup) >>
 endobj
-% 'Outline.7.2': class OutlineEntryObject 
-19 0 obj
+% 'Outline.13.2': class OutlineEntryObject 
+23 0 obj
 << /Dest [ 7 0 R
  /XYZ
  62.69291
  402.0236
  0 ]
- /Parent 16 0 R
- /Prev 18 0 R
+ /Parent 20 0 R
+ /Prev 22 0 R
  /Title (SSL setup) >>
 endobj
 % 'Outline.1': class OutlineEntryObject 
-20 0 obj
+24 0 obj
 << /Dest [ 7 0 R
  /XYZ
  62.69291
  276.0236
  0 ]
- /Next 21 0 R
- /Parent 15 0 R
- /Prev 16 0 R
+ /Next 25 0 R
+ /Parent 19 0 R
+ /Prev 20 0 R
  /Title (CalDAV with iPhone How-To) >>
 endobj
 % 'Outline.2': class OutlineEntryObject 
-21 0 obj
-<< /Dest [ 12 0 R
+25 0 obj
+<< /Count 2
+ /Dest [ 11 0 R
  /XYZ
  62.69291
  459.0236
  0 ]
- /Parent 15 0 R
- /Prev 20 0 R
+ /First 26 0 R
+ /Last 27 0 R
+ /Next 28 0 R
+ /Parent 19 0 R
+ /Prev 24 0 R
+ /Title (Synchronization with Android phone) >>
+endobj
+% 'Outline.14.0': class OutlineEntryObject 
+26 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 426.0236
+ 0 ]
+ /Next 27 0 R
+ /Parent 25 0 R
+ /Title (Prerequire) >>
+endobj
+% 'Outline.14.1': class OutlineEntryObject 
+27 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 366.0236
+ 0 ]
+ /Parent 25 0 R
+ /Prev 26 0 R
+ /Title (configuration) >>
+endobj
+% 'Outline.3': class OutlineEntryObject 
+28 0 obj
+<< /Dest [ 11 0 R
+ /XYZ
+ 62.69291
+ 222.0236
+ 0 ]
+ /Next 29 0 R
+ /Parent 19 0 R
+ /Prev 25 0 R
  /Title (Synchronization with Evolution's calendar) >>
 endobj
-% 'R22': class PDFPages 
-22 0 obj
-% page tree
+% 'Outline.4': class OutlineEntryObject 
+29 0 obj
 << /Count 2
+ /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 555.0236
+ 0 ]
+ /First 30 0 R
+ /Last 31 0 R
+ /Parent 19 0 R
+ /Prev 28 0 R
+ /Title (Synchronization with Sunbird/Lightning) >>
+endobj
+% 'Outline.15.0': class OutlineEntryObject 
+30 0 obj
+<< /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 522.0236
+ 0 ]
+ /Next 31 0 R
+ /Parent 29 0 R
+ /Title (Prerequire) >>
+endobj
+% 'Outline.15.1': class OutlineEntryObject 
+31 0 obj
+<< /Dest [ 16 0 R
+ /XYZ
+ 62.69291
+ 462.0236
+ 0 ]
+ /Parent 29 0 R
+ /Prev 30 0 R
+ /Title (configuration) >>
+endobj
+% 'R32': class PDFPages 
+32 0 obj
+% page tree
+<< /Count 3
  /Kids [ 7 0 R
- 12 0 R ]
+ 11 0 R
+ 16 0 R ]
  /Type /Pages >>
 endobj
-% 'R23': class PDFStream 
-23 0 obj
+% 'R33': class PDFStream 
+33 0 obj
 % page stream
 << /Length 7905 >>
 stream
@@ -687,10 +829,10 @@ Q
 endstream
 
 endobj
-% 'R24': class PDFStream 
-24 0 obj
+% 'R34': class PDFStream 
+34 0 obj
 % page stream
-<< /Length 9586 >>
+<< /Length 8788 >>
 stream
 1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
 q
@@ -960,17 +1102,182 @@ Q
 q
 1 0 0 1 62.69291 438.0236 cm
 q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Android phone) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 408.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .568409 Tw (There is no buit-in way to synchronize calendar with caldav. So you need to install a third part software :) Tj T* 0 Tw (Calendar \(CalDav\) for now it's the only one) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 336.0236 cm
+Q
+q
+1 0 0 1 62.69291 336.0236 cm
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Open Calendar Sync I'll get an interface with 2 tabs Stay on the first one) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+Q
+q
+1 0 0 1 62.69291 318.0236 cm
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 20.95698 Tw 12 TL /F1 10 Tf 0 0 0 rg (CaDAV Calendar URL : put the URL given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+Q
+q
+1 0 0 1 62.69291 288.0236 cm
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Put your openerp username and password) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+Q
+q
+1 0 0 1 62.69291 270.0236 cm
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (If your server don't use SSL, you'll get a warnign, say "Yes") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+Q
+q
+1 0 0 1 62.69291 252.0236 cm
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then you can synchronize manually or custom the settings to synchronize every x minutes.) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+Q
+q
+1 0 0 1 62.69291 234.0236 cm
+Q
+q
+1 0 0 1 62.69291 201.0236 cm
+q
 BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Evolution's calendar) Tj T* ET
 Q
 Q
 q
-1 0 0 1 62.69291 426.0236 cm
+1 0 0 1 62.69291 189.0236 cm
 Q
 q
-1 0 0 1 62.69291 426.0236 cm
+1 0 0 1 62.69291 189.0236 cm
 Q
 q
-1 0 0 1 62.69291 408.0236 cm
+1 0 0 1 62.69291 171.0236 cm
 0 0 0 rg
 BT /F3 10 Tf 12 TL ET
 q
@@ -991,13 +1298,13 @@ q
 Q
 Q
 q
-1 0 0 1 62.69291 408.0236 cm
+1 0 0 1 62.69291 171.0236 cm
 Q
 q
-1 0 0 1 62.69291 408.0236 cm
+1 0 0 1 62.69291 171.0236 cm
 Q
 q
-1 0 0 1 62.69291 390.0236 cm
+1 0 0 1 62.69291 153.0236 cm
 0 0 0 rg
 BT /F3 10 Tf 12 TL ET
 q
@@ -1017,13 +1324,23 @@ q
 Q
 Q
 q
-1 0 0 1 62.69291 390.0236 cm
+1 0 0 1 62.69291 153.0236 cm
 Q
 q
-1 0 0 1 62.69291 390.0236 cm
+1 0 0 1 62.69291 153.0236 cm
 Q
+ 
+endstream
+
+endobj
+% 'R35': class PDFStream 
+35 0 obj
+% page stream
+<< /Length 7419 >>
+stream
+1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
 q
-1 0 0 1 62.69291 228.0236 cm
+1 0 0 1 62.69291 603.0236 cm
 0 0 0 rg
 BT /F3 10 Tf 12 TL ET
 q
@@ -1219,13 +1536,13 @@ q
 Q
 Q
 q
-1 0 0 1 62.69291 228.0236 cm
+1 0 0 1 62.69291 603.0236 cm
 Q
 q
-1 0 0 1 62.69291 228.0236 cm
+1 0 0 1 62.69291 603.0236 cm
 Q
 q
-1 0 0 1 62.69291 210.0236 cm
+1 0 0 1 62.69291 585.0236 cm
 0 0 0 rg
 BT /F3 10 Tf 12 TL ET
 q
@@ -1246,13 +1563,13 @@ q
 Q
 Q
 q
-1 0 0 1 62.69291 210.0236 cm
+1 0 0 1 62.69291 585.0236 cm
 Q
 q
-1 0 0 1 62.69291 210.0236 cm
+1 0 0 1 62.69291 585.0236 cm
 Q
 q
-1 0 0 1 62.69291 192.0236 cm
+1 0 0 1 62.69291 567.0236 cm
 0 0 0 rg
 BT /F3 10 Tf 12 TL ET
 q
@@ -1273,37 +1590,262 @@ q
 Q
 Q
 q
-1 0 0 1 62.69291 192.0236 cm
+1 0 0 1 62.69291 567.0236 cm
 Q
 q
-1 0 0 1 62.69291 192.0236 cm
+1 0 0 1 62.69291 567.0236 cm
+Q
+q
+1 0 0 1 62.69291 534.0236 cm
+q
+BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Sunbird/Lightning) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 504.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 474.0236 cm
+q
+BT 1 0 0 1 0 16.82 Tm 12.56998 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you are using thunderbird, first you need to install the lightning module) Tj T* 0 Tw 0 0 .501961 rg (http://www.mozilla.org/projects/calendar/lightning/) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 444.0236 cm
+q
+BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
+Q
+Q
+q
+1 0 0 1 62.69291 432.0236 cm
+Q
+q
+1 0 0 1 62.69291 432.0236 cm
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to Calendar View) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+Q
+q
+1 0 0 1 62.69291 414.0236 cm
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (File -) Tj (> New Calendar) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+Q
+q
+1 0 0 1 62.69291 396.0236 cm
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Chosse "On the Network") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+Q
+q
+1 0 0 1 62.69291 378.0236 cm
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+BT 1 0 0 1 0 16.82 Tm 13.06331 Tw 12 TL /F1 10 Tf 0 0 0 rg (for format choose CalDav and as location the url given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+Q
+q
+1 0 0 1 62.69291 348.0236 cm
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Choose a name and a color for the Calendar, and we advice you to uncheck "alarm") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+Q
+q
+1 0 0 1 62.69291 330.0236 cm
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 15 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (6.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .23061 Tw (Then put your openerp login and password \(to give the password only check the box "Use password) Tj T* 0 Tw (Manager to remember this password") Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+Q
+q
+1 0 0 1 62.69291 300.0236 cm
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
+0 0 0 rg
+BT /F3 10 Tf 12 TL ET
+q
+1 0 0 1 6 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET
+Q
+Q
+q
+1 0 0 1 23 3 cm
+q
+0 0 0 rg
+BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then Finish, your meetings should appear now in your calendar view) Tj T* ET
+Q
+Q
+q
+Q
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
+Q
+q
+1 0 0 1 62.69291 282.0236 cm
 Q
  
 endstream
 
 endobj
-% 'R25': class PDFPageLabels 
-25 0 obj
+% 'R36': class PDFPageLabels 
+36 0 obj
 % Document Root
 << /Nums [ 0
- 26 0 R
+ 37 0 R
  1
- 27 0 R ] >>
+ 38 0 R
+ 2
+ 39 0 R ] >>
 endobj
-% 'R26': class PDFPageLabel 
-26 0 obj
+% 'R37': class PDFPageLabel 
+37 0 obj
 % None
 << /S /D
  /St 1 >>
 endobj
-% 'R27': class PDFPageLabel 
-27 0 obj
+% 'R38': class PDFPageLabel 
+38 0 obj
 % None
 << /S /D
  /St 2 >>
 endobj
+% 'R39': class PDFPageLabel 
+39 0 obj
+% None
+<< /S /D
+ /St 3 >>
+endobj
 xref
-0 28
+0 40
 0000000000 65535 f
 0000000113 00000 n
 0000000245 00000 n
@@ -1315,31 +1857,43 @@ xref
 0000001510 00000 n
 0000001777 00000 n
 0000002021 00000 n
-0000002303 00000 n
-0000002573 00000 n
-0000002900 00000 n
-0000003059 00000 n
-0000003271 00000 n
-0000003396 00000 n
-0000003613 00000 n
-0000003795 00000 n
-0000003988 00000 n
-0000004157 00000 n
-0000004357 00000 n
-0000004543 00000 n
-0000004659 00000 n
-0000012665 00000 n
-0000022356 00000 n
-0000022462 00000 n
-0000022539 00000 n
+0000002288 00000 n
+0000002619 00000 n
+0000002901 00000 n
+0000003185 00000 n
+0000003455 00000 n
+0000003722 00000 n
+0000004051 00000 n
+0000004210 00000 n
+0000004422 00000 n
+0000004548 00000 n
+0000004766 00000 n
+0000004949 00000 n
+0000005143 00000 n
+0000005312 00000 n
+0000005512 00000 n
+0000005767 00000 n
+0000005941 00000 n
+0000006115 00000 n
+0000006332 00000 n
+0000006576 00000 n
+0000006750 00000 n
+0000006908 00000 n
+0000007033 00000 n
+0000015039 00000 n
+0000023928 00000 n
+0000031452 00000 n
+0000031571 00000 n
+0000031648 00000 n
+0000031725 00000 n
 trailer
 << /ID 
  % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(\316\213\214'|\035-\244\350\356\320\252B\366X\214) (\316\213\214'|\035-\244\350\356\320\252B\366X\214)] 
+ [(<\373\321\3360\3002L\025\357\353\216\375g.^) (<\373\321\3360\3002L\025\357\353\216\375g.^)] 
 
- /Info 14 0 R
- /Root 13 0 R
- /Size 28 >>
+ /Info 18 0 R
+ /Root 17 0 R
+ /Size 40 >>
 startxref
-22586
+31772
 %%EOF
diff --git a/addons/caldav/doc/evolution.rst b/addons/caldav/doc/evolution.rst
index 7b893cf763c..11580ae02ef 100644
--- a/addons/caldav/doc/evolution.rst
+++ b/addons/caldav/doc/evolution.rst
@@ -19,3 +19,5 @@ Synchronization with Evolution's calendar
 4. Click ok and give your openerp password
 
 5. A new calendar named with the name you gave should appear on the left side.
+
+
diff --git a/addons/caldav/doc/makefile b/addons/caldav/doc/makefile
index 8de2a9ba197..4424647b08d 100644
--- a/addons/caldav/doc/makefile
+++ b/addons/caldav/doc/makefile
@@ -1,7 +1,7 @@
 all: compile clean
 
 concat: all.rst
-	cat all.rst iPhone.rst evolution.rst > compile.rst
+	cat all.rst iPhone.rst android.rst evolution.rst sunbird.rst  > compile.rst
     
 compile: concat
 	rst2pdf compile.rst -o caldav_doc.pdf 
diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 369ddd6e287..dfb7385931f 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -27,7 +27,9 @@ from tools.translate import _
 
 class caldav_browse(osv.osv_memory):
     
-    __doc = {'other' : _("""
+    __doc = {
+    
+    'other' : _("""
   * Webdav server that provides remote access to calendar
   * Synchronisation of calendar using WebDAV
   * Customize calendar event and todo attribute with any of OpenERP model
@@ -45,6 +47,9 @@ class caldav_browse(osv.osv_memory):
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
      """),
+     
+     
+     
      'iphone' : _("""
     For SSL specific configuration see the documentation below
 
@@ -94,10 +99,32 @@ steps:
       is the default 8071)
     s2. Safari will try to connect and issue a warning about the certificate
       used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it. 
-    
+      now trusts it.   
+    """),
+    'android' : _("""
+Prerequire
+----------
+There is no buit-in way to synchronize calendar with caldav.
+So you need to install a third part software : Calendar (CalDav) 
+for now it's the only one
+
+configuration
+-------------
+
+1. Open Calendar Sync
+   I'll get an interface with 2 tabs
+   Stay on the first one
+   
+2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+
+3. Put your openerp username and password
+
+4. If your server don't use SSL, you'll get a warnign, say "Yes"
+
+5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
     
     """),
+    
      'evolution' : _("""
     1. Go to Calendar View
 
@@ -113,9 +140,35 @@ steps:
 
     4. Click ok and give your openerp password
 
-    5. A new calendar named with the name you gave should appear on the left side.
+    5. A new calendar named with the name you gave should appear on the left side.     
+     """),
      
-     """)}
+     
+     'thunderbird' : _("""
+Prerequire
+----------
+If you are using thunderbird, first you need to install the lightning module
+http://www.mozilla.org/projects/calendar/lightning/
+
+configuration
+-------------
+
+1. Go to Calendar View
+
+2. File -> New Calendar
+
+3. Chosse "On the Network"
+
+4. for format choose CalDav
+   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
+   
+5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
+
+6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
+
+7. Then Finish, your meetings should appear now in your calendar view
+"""),
+    }
     
     
     _name = 'caldav.browse'