david: doc/kolab-formats contacts.sgml,1.8,1.9

cvs at intevation.de cvs at intevation.de
Thu Jul 15 18:35:20 CEST 2004


Author: david

Update of /kolabrepository/doc/kolab-formats
In directory doto:/tmp/cvs-serv7368

Modified Files:
	contacts.sgml 
Log Message:
Changed <city> to <locality>, <state> to <region>, and <zip> to <postal-code> as discussed.


Index: contacts.sgml
===================================================================
RCS file: /kolabrepository/doc/kolab-formats/contacts.sgml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- contacts.sgml	6 Jul 2004 10:48:52 -0000	1.8
+++ contacts.sgml	15 Jul 2004 16:35:18 -0000	1.9
@@ -55,9 +55,9 @@
           {<address>
             <type>(string, default home)</type>
             <street>(string, default empty)</street>
-            <city>(string, default empty)</city>
-            <state>(string, default empty)</state>
-            <zip>(string, default empty)</zip>
+            <locality>(string, default empty)</locality>
+            <region>(string, default empty)</region>
+            <postal-code>(string, default empty)</postal-code>
             <country>(string, default empty)</country>
           </address>}
           <preferred-address>(string, default none)</preferred-address>
@@ -79,5 +79,9 @@
 
 <para>The address type can be home, business, and other. The preferred
 address can be set to one of these or none.</para>
+
+<para>In an address, locality is the city or village name, the meaning of
+region depends on the country (e.g. it's the state in federal states like the USA),
+and postal-code is what is also known as "zip" in some countries.</para>
 
 </chapter>





More information about the commits mailing list