Merge branch 'upstream'

[chaz/homebank] / doc / misc-csvformat.html

diff --git a/doc/misc-csvformat.html b/doc/misc-csvformat.html
index 3bbeda0eacd601396478b315a0254611d10af193..ea1404e1c32e36e878bf706298802f2d51d6548a 100644 (file)
--- a/doc/misc-csvformat.html
+++ b/doc/misc-csvformat.html
@@ -28,11 +28,21 @@
     <table class="widgetinfo">
       <tr>
         <th>date</th>
-        <td>format must be DD-MM-YY</td>
+        <td>the date format can be:
+          <ul>
+            <li>y-m-d
+            <li>m-d-y
+            <li>d-m-y
+          </ul>
+          <p>year can be 2 or 4 digits<br>
+          separators can be / . or -</td>
       </tr>
       <tr>
         <th>payment</th>
-        <td>from 0=none to 10=FI fee</td>
+        <td>
+          <img src="images/d-warn.png">&nbsp;<span class="warning">You cannot import transaction with payment type=5 (internal xfer)</span><br>
+          from 0=none to 10=FI fee (in the same order of the list)<br>
+        </td>
       </tr>
       <tr>
         <th>info</th>
@@ -62,8 +72,8 @@
     </table>
     <p>Example:</p>
     <pre class="csvexample">
-15-02-04;0;;;Some cash;-40,00;Bill:Withdrawal of cash;tag1
-15-02-04;1;;;Internet DSL;-45,00;Inline service/Internet;tag2
+15-02-04;0;;;Some cash;-40,00;Bill:Withdrawal of cash;tag1 tag2
+15-02-04;1;;;Internet DSL;-45,00;Inline service/Internet;tag2 my-tag3
 ... 
 </pre>
     <p class="top"><a href="#top">↑ Back to Top</a></p>
@@ -130,14 +140,18 @@
         <th>payee name</th>
         <td>the name of the payee</td>
       </tr>
+      <tr>
+        <th>full category name</th>
+        <td>optional: since 5.1.3<br>the full name of the category</td>
+      </tr>
     </table>
     <p>Example:</p>
     <pre class="csvexample">
-payee_name1
-payee_name2
+payee_name1;cat1:subcat1
+payee_name2;
 ... 
 </pre>
     <p class="top"><a href="#top">↑ Back to Top</a></p>
   </div><!-- separator -->
 </body>
-</html>
\ No newline at end of file
+</html>