Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/contacts/contacts.info	28 Jun 2005 20:23:38 -0000	1.15
+++ openacs-4/packages/contacts/contacts.info	29 Jun 2005 00:50:30 -0000	1.16
@@ -30,12 +30,14 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllPeopleAreUsers"  default="0" description="1 if true, 0 if false. If set to 1 all newly created people will be users. If set to 0 you will be asked whether or not a user account should be created."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ContactMaster"  default="/packages/contacts/lib/contact-master" description="The master template for an individual contact" section_name="Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ContactSummaryViewTemplate"  default="/packages/contacts/www/contact" description="The contact summary view template to be used" section_name="Templates"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ContactsMaster"  default="/packages/contacts/lib/contacts-master" description="The master template for this contacts instance. All pages except indiviual contacts page (as specified by ContactMaster)" section_name="Templates"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ContactsMaster"  default="/packages/contacts/lib/contacts-master" description="The master template for this contacts instance. All pages except indiviual contacts page (as specified by ContactMaster)
+" section_name="Templates"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ConverttoJpg"  default="1" description="0 for no, 1 for yes. Flag to convert images to jpegs automatically" section_name="Photos"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultPageSize"  default="50" description="The default page size for this contacts instance. Acceptable values are 0, 25, 50, 100 or 500. If set to 0 there will be no pagination which can be incredibly slow when you have more than a few hundred contacts."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultViewAttributes"  default="{email} {home_phone} {(h)} {work_phone} {(w)} {mobile_phone} {(m)}" description="The default attributes to view on the main contact page. This should be a list of attribute_name display_code to show for the attribute, the display code will only show up if the person/contact has a value for that attribute."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForceSearchBeforeAdd"  default="0" description="1 for yes, 0 for no. Should we force users to search all contacts before they are allowed to add a person or organization? This is not an actual software force but the &quot;add person&quot; and &quot;add organization&quot; buttons will only be displayed after a search on &quot;all contacts.&quot;"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageMagickPath"  default="/usr/local/bin" description="Absolute path from computer root to directory containing ImageMagick executables" section_name="Photos"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="MailingAddressAttributeIdOrder"  description="A list of attribute_ids for postal addresses in order of priority. In doing a letter mail merge the first attribute_id in this list that a contact has a value for will be used as the mailing address. If no attribute_ids are specified all postal_address attribute_ids will be used in alphabetical order."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PortraitSize"  default="200x200" description="Max dimensions for portrait" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PortraitThumbnailSize"  default="50x50" description="Max dimensions of portrait thumbnail" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SquareThumbnails"  default="1" description="0 for no, 1 for yes. If yes we crop either the top or the bottom of the image to create square thumbnails and portraits" section_name="Photos"/>