Merged from trunk 6806:6812

   Merged from trunk 6806:6812

   +------------------------------------------------------------------------+
   | 6807    | Move news about ** token in package.keywords to the 2.1.3    |
   | zmedico | section.                                                     |
   |---------+--------------------------------------------------------------|
   | 6808    | Update the PORT_LOGDIR docs for bug #82378. Thanks to        |
   | zmedico | Arfrever FTA for reporting.                                  |
   |---------+--------------------------------------------------------------|
   | 6809    | Update the PORT_LOGDIR docs for bug #82378. Thanks to        |
   | zmedico | Arfrever FTA for reporting.                                  |
   |---------+--------------------------------------------------------------|
   | 6810    | Remove stray newline.                                        |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6812    | Add a note about preservation of timestamps on merged files. |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6939