Move docs/ to doc/.

README

@@ -33,17 +33,17 @@ The following documentation is available in the Passwd distribution:
 
 :README_:            This file
 :COPYING_:           Copyright and license information
-:`docs/CHANGES`_:    Changes by release
-:`docs/CREDITS`_:    Project developers
-:`docs/INSTALL`_:    Installation instructions and notes
-:`docs/TODO`_:       Development TODO list
+:`doc/CHANGES`_:    Changes by release
+:`doc/CREDITS`_:    Project developers
+:`doc/INSTALL`_:    Installation instructions and notes
+:`doc/TODO`_:       Development TODO list
 
 
 Installation
 ============
 
 Instructions for installing Passwd can be found in the file INSTALL_ in the
-``docs/`` directory of the Passwd distribution.
+``doc/`` directory of the Passwd distribution.
 
 
 Assistance
@@ -79,8 +79,8 @@ The Passwd team
 
 .. _README: README
 .. _COPYING: http://www.horde.org/licenses/gpl
-.. _docs/CHANGES: CHANGES
-.. _docs/CREDITS: CREDITS
+.. _doc/CHANGES: CHANGES
+.. _doc/CREDITS: CREDITS
 .. _INSTALL:
-.. _docs/INSTALL: INSTALL
-.. _docs/TODO: TODO
+.. _doc/INSTALL: INSTALL
+.. _doc/TODO: TODO

docs/CHANGES → doc/CHANGES

@@ -369,6 +369,6 @@ v2.0
 [ejr] Remove check for prefs.php in notconfigured.inc.
 [ejr] Change from short-tag <?= to long format <?php echo.
 [ejr] Fix spacing and look of Submit button.
-[ejr] Update contact info in docs/INSTALL for mailing list.
+[ejr] Update contact info in doc/INSTALL for mailing list.
 [ejr] Added Norwegian (nn_NO) translation.
 [ejr] Added Swedish (sv_SE) translation.

docs/INSTALL → doc/INSTALL

@@ -29,7 +29,7 @@ To function properly, Passwd **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 Passwd. Many of Passwd's prerequisites are also
                   Horde prerequisites. Additionally, many of Passwd's optional
                   features are configured via the Horde install.
@@ -59,7 +59,7 @@ To function properly, Passwd **requires** the following:
       SOAP support is necessary for the SOAP and ISPConfig driver.
 
 3. The following PEAR modules:
-   (See `horde/docs/INSTALL`_ for instructions on installing PEAR modules)
+   (See `horde/doc/INSTALL`_ for instructions on installing PEAR modules)
 
    .. Important:: If you are going to install Passwd the recommended way,
                   i.e. using the PEAR installer, you can skip the remainder of
@@ -100,7 +100,7 @@ latest not yet released fixes, you can install Passwd 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 Passwd through PEAR now, the installer will automatically
@@ -153,7 +153,7 @@ Configuring Passwd
 
    Once you have configured Passwd, bring up the included test page in your
    Web browser to ensure that all necessary prerequisites have been met.  See
-   the `horde/docs/INSTALL`_ document for further details on Horde test
+   the `horde/doc/INSTALL`_ document for further details on Horde test
    scripts.  If you installed Passwd as described above, the URL to the test
    page would be::
 
@@ -322,5 +322,5 @@ The Passwd team
 
 
 .. _README: README
-.. _`horde/docs/INSTALL`: ../../horde/docs/INSTALL
-.. _`horde/docs/TRANSLATIONS`: ../../horde/docs/TRANSLATIONS
+.. _`horde/doc/INSTALL`: ../../horde/doc/INSTALL
+.. _`horde/doc/TRANSLATIONS`: ../../horde/doc/TRANSLATIONS

docs/RELEASE_NOTES → doc/RELEASE_NOTES

@@ -10,10 +10,10 @@ Passwd provides support for changing passwords via the Horde authentication
 system or various password backends.
 
 For upgrading instructions, please see
-http://www.horde.org/apps/nag/docs/UPGRADING
+http://www.horde.org/apps/nag/doc/UPGRADING
 
 For detailed installation and configuration instructions, please see
-http://www.horde.org/apps/nag/docs/INSTALL
+http://www.horde.org/apps/nag/doc/INSTALL
 
 The major changes compared to Passwd version H5 (5.0.0) are:
     * Small bugfixes.

package.xml

@@ -16,7 +16,7 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2016-11-09</date>
+ <date>2017-10-13</date>
  <version>
   <release>6.0.0</release>
   <api>6.0.0</api>
@@ -37,14 +37,14 @@
     <file name="conf.xml" role="horde" />
     <file name="hooks.php.dist" role="horde" />
    </dir> <!-- /config -->
-   <dir name="docs">
+   <dir name="doc">
     <file name="CHANGES" role="doc" />
     <file name="CREDITS" role="doc" />
     <file name="INSTALL" role="doc" />
     <file name="RELEASE_NOTES" role="doc" />
     <file name="TODO" role="doc" />
     <file name="UPGRADING" role="doc" />
-   </dir> <!-- /docs -->
+   </dir> <!-- /doc -->
    <dir name="js">
     <file name="passwd.js" role="horde" />
    </dir> <!-- /js -->
@@ -450,12 +450,12 @@
    <install as="passwd/config/backends.php" name="config/backends.php" />
    <install as="passwd/config/conf.xml" name="config/conf.xml" />
    <install as="passwd/config/hooks.php.dist" name="config/hooks.php.dist" />
-   <install as="CHANGES" name="docs/CHANGES" />
-   <install as="CREDITS" name="docs/CREDITS" />
-   <install as="INSTALL" name="docs/INSTALL" />
-   <install as="RELEASE_NOTES" name="docs/RELEASE_NOTES" />
-   <install as="TODO" name="docs/TODO" />
-   <install as="UPGRADING" name="docs/UPGRADING" />
+   <install as="CHANGES" name="doc/CHANGES" />
+   <install as="CREDITS" name="doc/CREDITS" />
+   <install as="INSTALL" name="doc/INSTALL" />
+   <install as="RELEASE_NOTES" name="doc/RELEASE_NOTES" />
+   <install as="TODO" name="doc/TODO" />
+   <install as="UPGRADING" name="doc/UPGRADING" />
    <install as="passwd/js/passwd.js" name="js/passwd.js" />
    <install as="passwd/lib/.htaccess" name="lib/.htaccess" />
    <install as="passwd/lib/Application.php" name="lib/Application.php" />
@@ -796,7 +796,7 @@
    <stability>
     <release>beta</release>
     <api>beta</api></stability>
-   <date>2016-11-09</date>
+   <date>2017-10-13</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
 * [jan] Add ISPConfig driver (Thomas Basler &lt;thomas@familie-basler.net&gt;).