Move docs/ to doc/.

README

@@ -33,18 +33,18 @@ The following documentation is available in the Turba distribution:
 
 :README_:            This file
 :LICENSE_:           Copyright and license information
-:`docs/CHANGES`_:    Changes by release
-:`docs/CREDITS`_:    Project developers
-:`docs/INSTALL`_:    Installation instructions and notes
-:`docs/LDAP`_:       LDAP personal addressbook HOWTO
-:`docs/UPGRADING`_:  Pointers on upgrading from previous Turba versions
+:`doc/CHANGES`_:    Changes by release
+:`doc/CREDITS`_:    Project developers
+:`doc/INSTALL`_:    Installation instructions and notes
+:`doc/LDAP`_:       LDAP personal addressbook HOWTO
+:`doc/UPGRADING`_:  Pointers on upgrading from previous Turba versions
 
 
 Installation
 ============
 
 Instructions for installing Turba can be found in the file INSTALL_ in the
-``docs/`` directory of the Turba distribution.
+``doc/`` directory of the Turba distribution.
 
 
 Assistance
@@ -80,9 +80,9 @@ The Turba team
 
 .. _README: README
 .. _LICENSE: http://www.horde.org/licenses/apache
-.. _docs/CHANGES: CHANGES
-.. _docs/CREDITS: CREDITS
+.. _doc/CHANGES: CHANGES
+.. _doc/CREDITS: CREDITS
 .. _INSTALL:
-.. _docs/INSTALL: INSTALL
-.. _docs/LDAP: LDAP
-.. _docs/UPGRADING: UPGRADING
+.. _doc/INSTALL: INSTALL
+.. _doc/LDAP: LDAP
+.. _doc/UPGRADING: UPGRADING

config/backends.php

@@ -525,7 +525,7 @@
  * A personal LDAP address book. This assumes that the login is
  * <username>@domain.com and that the users are stored on the same LDAP
  * server. Thus it is possible to bind with the username and password from the
- * user. For more info; please refer to the docs/LDAP file in the Turba
+ * user. For more info; please refer to the doc/LDAP file in the Turba
  * distribution.
  *
  * To store distribution lists in the LDAP directory, you'll need to include

docs/INSTALL → doc/INSTALL

@@ -29,7 +29,7 @@ To function properly, Turba **requires** the following:
                   earlier versions of Horde will **not** work.
 
    .. Important:: Be sure to have completed all of the steps in the
-                  `horde/docs/INSTALL`_ file for the Horde Framework before
+                  `horde/doc/INSTALL`_ file for the Horde Framework before
                   installing Turba. Many of Turba's prerequisites are also
                   Horde prerequisites. Additionally, many of Turba's optional
                   features are configured via the Horde install.
@@ -56,7 +56,7 @@ latest not yet released fixes, you can install Turba from Git.
 Installing with PEAR
 ~~~~~~~~~~~~~~~~~~~~
 
-First follow the instructions in `horde/docs/INSTALL`_ to prepare a PEAR
+First follow the instructions in `horde/doc/INSTALL`_ to prepare a PEAR
 environment for Horde and install the Horde Framework.
 
 When installing Turba through PEAR now, the installer will automatically
@@ -125,7 +125,7 @@ Configuring Turba
 3. Securing Turba
 
    Before you can secure Turba, you need a secure Horde installation.  Please
-   read the file in `horde/docs/SECURITY`_ for Horde security information
+   read the file in `horde/doc/SECURITY`_ for Horde security information
    before proceeding.
 
    Some of Turba's configuration files might contain passwords which local
@@ -183,7 +183,7 @@ The Horde team
 
 .. _README: README
 .. _INSTALL:
-.. _`horde/docs/INSTALL`: ../../horde/docs/INSTALL
-.. _`horde/docs/PERFORMANCE`: ../../horde/docs/PERFORMANCE
-.. _`horde/docs/SECURITY`: ../../horde/docs/SECURITY
-.. _`horde/docs/TRANSLATIONS`: ../../horde/docs/TRANSLATIONS
+.. _`horde/doc/INSTALL`: ../../horde/doc/INSTALL
+.. _`horde/doc/PERFORMANCE`: ../../horde/doc/PERFORMANCE
+.. _`horde/doc/SECURITY`: ../../horde/doc/SECURITY
+.. _`horde/doc/TRANSLATIONS`: ../../horde/doc/TRANSLATIONS

docs/RELEASE_NOTES → doc/RELEASE_NOTES

@@ -22,10 +22,10 @@ tracking system.  Updated translations are very welcome, though some strings
 might still change before the final release.
 
 For upgrading instructions, please see
-http://www.horde.org/apps/turba/docs/UPGRADING
+http://www.horde.org/apps/turba/doc/UPGRADING
 
 For detailed installation and configuration instructions, please see
-http://www.horde.org/apps/turba/docs/INSTALL
+http://www.horde.org/apps/turba/doc/INSTALL
 
 The major changes compared to the Turba version H5 (4.2.0alpha1) are:
     * Small bugfixes.

package.xml

@@ -28,7 +28,7 @@
   <email>chuck@horde.org</email>
   <active>no</active>
  </lead>
- <date>2017-06-06</date>
+ <date>2017-10-16</date>
  <version>
   <release>5.0.0</release>
   <api>5.0.0</api>
@@ -95,7 +95,7 @@
     <file name="mime_drivers.php" role="horde" />
     <file name="prefs.php" role="horde" />
    </dir> <!-- /config -->
-   <dir name="docs">
+   <dir name="doc">
     <dir name="vcf">
      <file name="brad.vcf" role="doc" />
      <file name="dimitris.vcf" role="doc" />
@@ -107,14 +107,14 @@
      <file name="README" role="doc" />
      <file name="sfg.vcf" role="doc" />
      <file name="test.vcf" role="doc" />
-    </dir> <!-- /docs/vcf -->
+    </dir> <!-- /doc/vcf -->
     <file name="CHANGES" role="doc" />
     <file name="CREDITS" role="doc" />
     <file name="INSTALL" role="doc" />
     <file name="LDAP" role="doc" />
     <file name="RELEASE_NOTES" role="doc" />
     <file name="UPGRADING" role="doc" />
-   </dir> <!-- /docs -->
+   </dir> <!-- /doc -->
    <dir name="js">
     <file name="browse.js" role="horde" />
     <file name="columnprefs.js" role="horde" />
@@ -485,11 +485,11 @@
    </dir> <!-- /migration -->
    <dir name="scripts">
     <dir name="ldap">
-     <file name="addou" role="data" />
-     <file name="addou.pl" role="data" />
+     <file name="addou" role="horde" />
+     <file name="addou.pl" role="horde" />
     </dir> <!-- /scripts/ldap -->
-    <file name=".htaccess" role="data" />
-    <file name="Turba.reg" role="data" />
+    <file name=".htaccess" role="horde" />
+    <file name="Turba.reg" role="horde" />
    </dir> <!-- /scripts -->
    <dir name="templates">
     <dir name="block">
@@ -629,7 +629,7 @@
      </dir> <!-- /themes/default/smartmobile -->
      <file name="screen.css" role="horde" />
     </dir> <!-- /themes/default -->
-    </dir> <!-- /themes -->
+   </dir> <!-- /themes -->
    <file name="add.php" role="horde" />
    <file name="browse.php" role="horde" />
    <file name="contact.php" role="horde" />
@@ -894,6 +894,21 @@
  </usesrole>
  <phprelease>
   <filelist>
+   <install as="turba/add.php" name="add.php" />
+   <install as="turba/browse.php" name="browse.php" />
+   <install as="turba/contact.php" name="contact.php" />
+   <install as="turba/data.php" name="data.php" />
+   <install as="turba/delete.php" name="delete.php" />
+   <install as="turba/deletefile.php" name="deletefile.php" />
+   <install as="turba/edit.php" name="edit.php" />
+   <install as="turba/index.php" name="index.php" />
+   <install as="LICENSE" name="LICENSE" />
+   <install as="turba/merge.php" name="merge.php" />
+   <install as="README" name="README" />
+   <install as="turba/search.php" name="search.php" />
+   <install as="turba/smartmobile.php" name="smartmobile.php" />
+   <install as="turba/vcard.php" name="vcard.php" />
+   <install as="turba/view.php" name="view.php" />
    <install as="turba/addressbooks/create.php" name="addressbooks/create.php" />
    <install as="turba/addressbooks/delete.php" name="addressbooks/delete.php" />
    <install as="turba/addressbooks/edit.php" name="addressbooks/edit.php" />
@@ -914,22 +929,22 @@
    <install as="turba/config/menu.php.dist" name="config/menu.php.dist" />
    <install as="turba/config/mime_drivers.php" name="config/mime_drivers.php" />
    <install as="turba/config/prefs.php" name="config/prefs.php" />
-   <install as="CHANGES" name="docs/CHANGES" />
-   <install as="CREDITS" name="docs/CREDITS" />
-   <install as="INSTALL" name="docs/INSTALL" />
-   <install as="LDAP" name="docs/LDAP" />
-   <install as="RELEASE_NOTES" name="docs/RELEASE_NOTES" />
-   <install as="UPGRADING" name="docs/UPGRADING" />
-   <install as="vcf/brad.vcf" name="docs/vcf/brad.vcf" />
-   <install as="vcf/dimitris.vcf" name="docs/vcf/dimitris.vcf" />
-   <install as="vcf/dwalt.vcf" name="docs/vcf/dwalt.vcf" />
-   <install as="vcf/foo.vcf" name="docs/vcf/foo.vcf" />
-   <install as="vcf/larry.vcf" name="docs/vcf/larry.vcf" />
-   <install as="vcf/multiple.vcf" name="docs/vcf/multiple.vcf" />
-   <install as="vcf/palm.vcf" name="docs/vcf/palm.vcf" />
-   <install as="vcf/README" name="docs/vcf/README" />
-   <install as="vcf/sfg.vcf" name="docs/vcf/sfg.vcf" />
-   <install as="vcf/test.vcf" name="docs/vcf/test.vcf" />
+   <install as="CHANGES" name="doc/CHANGES" />
+   <install as="CREDITS" name="doc/CREDITS" />
+   <install as="INSTALL" name="doc/INSTALL" />
+   <install as="LDAP" name="doc/LDAP" />
+   <install as="RELEASE_NOTES" name="doc/RELEASE_NOTES" />
+   <install as="UPGRADING" name="doc/UPGRADING" />
+   <install as="vcf/brad.vcf" name="doc/vcf/brad.vcf" />
+   <install as="vcf/dimitris.vcf" name="doc/vcf/dimitris.vcf" />
+   <install as="vcf/dwalt.vcf" name="doc/vcf/dwalt.vcf" />
+   <install as="vcf/foo.vcf" name="doc/vcf/foo.vcf" />
+   <install as="vcf/larry.vcf" name="doc/vcf/larry.vcf" />
+   <install as="vcf/multiple.vcf" name="doc/vcf/multiple.vcf" />
+   <install as="vcf/palm.vcf" name="doc/vcf/palm.vcf" />
+   <install as="vcf/README" name="doc/vcf/README" />
+   <install as="vcf/sfg.vcf" name="doc/vcf/sfg.vcf" />
+   <install as="vcf/test.vcf" name="doc/vcf/test.vcf" />
    <install as="turba/js/browse.js" name="js/browse.js" />
    <install as="turba/js/columnprefs.js" name="js/columnprefs.js" />
    <install as="turba/js/contact_tabs.js" name="js/contact_tabs.js" />
@@ -1094,10 +1109,10 @@
    <install as="turba/migration/10_turba_upgrade_categoriestotags.php" name="migration/10_turba_upgrade_categoriestotags.php" />
    <install as="turba/migration/11_turba_upgrade_parents.php" name="migration/11_turba_upgrade_parents.php" />
    <install as="turba/migration/12_turba_upgrade_originalphotos.php" name="migration/12_turba_upgrade_originalphotos.php" />
-   <install as="scripts/.htaccess" name="scripts/.htaccess" />
-   <install as="scripts/Turba.reg" name="scripts/Turba.reg" />
-   <install as="scripts/ldap/addou" name="scripts/ldap/addou" />
-   <install as="scripts/ldap/addou.pl" name="scripts/ldap/addou.pl" />
+   <install as="turba/scripts/.htaccess" name="scripts/.htaccess" />
+   <install as="turba/scripts/Turba.reg" name="scripts/Turba.reg" />
+   <install as="turba/scripts/ldap/addou" name="scripts/ldap/addou" />
+   <install as="turba/scripts/ldap/addou.pl" name="scripts/ldap/addou.pl" />
    <install as="turba/templates/.htaccess" name="templates/.htaccess" />
    <install as="turba/templates/block/minisearch.inc" name="templates/block/minisearch.inc" />
    <install as="turba/templates/browse/actions.inc" name="templates/browse/actions.inc" />
@@ -1178,21 +1193,6 @@
    <install as="turba/themes/default/graphics/menu/browse.png" name="themes/default/graphics/menu/browse.png" />
    <install as="turba/themes/default/graphics/menu/new.png" name="themes/default/graphics/menu/new.png" />
    <install as="turba/themes/default/graphics/mime/vcard.png" name="themes/default/graphics/mime/vcard.png" />
-   <install as="turba/add.php" name="add.php" />
-   <install as="turba/browse.php" name="browse.php" />
-   <install as="turba/contact.php" name="contact.php" />
-   <install as="turba/data.php" name="data.php" />
-   <install as="turba/delete.php" name="delete.php" />
-   <install as="turba/deletefile.php" name="deletefile.php" />
-   <install as="turba/edit.php" name="edit.php" />
-   <install as="turba/index.php" name="index.php" />
-   <install as="LICENSE" name="LICENSE" />
-   <install as="turba/merge.php" name="merge.php" />
-   <install as="README" name="README" />
-   <install as="turba/search.php" name="search.php" />
-   <install as="turba/smartmobile.php" name="smartmobile.php" />
-   <install as="turba/vcard.php" name="vcard.php" />
-   <install as="turba/view.php" name="view.php" />
    <install as="turba/themes/default/smartmobile/screen.css" name="themes/default/smartmobile/screen.css" />
   </filelist>
  </phprelease>
@@ -2217,7 +2217,7 @@
    </notes>
   </release>
   <release>
-   <date>2017-06-06</date>
+   <date>2017-10-16</date>
    <version>
     <release>5.0.0</release>
     <api>5.0.0</api>