Skip to content

Commit

Permalink
Move docs/ to doc/.
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Oct 16, 2017
1 parent 2f12366 commit 263a3b6
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 20 deletions.
14 changes: 7 additions & 7 deletions README
Expand Up @@ -41,16 +41,16 @@ The following documentation is available in the Ulaform distribution:

:README_: This file
:COPYING_: Copyright and license information
:`docs/CHANGES`_: Changes by release
:`docs/CREDITS`_: Project developers
:`docs/INSTALL`_: Installation instructions and notes
:`doc/CHANGES`_: Changes by release
:`doc/CREDITS`_: Project developers
:`doc/INSTALL`_: Installation instructions and notes


Installation
============

Instructions for installing Ulaform can be found in the file INSTALL_ in the
``docs/`` directory of the Ulaform distribution.
``doc/`` directory of the Ulaform distribution.


Assistance
Expand Down Expand Up @@ -86,7 +86,7 @@ The Ulaform 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
.. _doc/INSTALL: INSTALL
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions docs/INSTALL → doc/INSTALL
Expand Up @@ -28,7 +28,7 @@ To function properly, Ulaform **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 Ulaform. Many of Ulaform's prerequisites are also
Horde prerequisites. Additionally, many of Ulaform's optional
features are configured via the Horde install.
Expand All @@ -44,7 +44,7 @@ To function properly, Ulaform **requires** the following:
Installing Ulaform
==================

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 Ulaform through PEAR now, the installer will automatically
Expand Down Expand Up @@ -155,5 +155,5 @@ The Ulaform team

.. _README: README
.. _INSTALL:
.. _`horde/docs/INSTALL`: ../../horde/docs/INSTALL
.. _`horde/docs/TRANSLATIONS`: ../../horde/docs/TRANSLATIONS
.. _`horde/doc/INSTALL`: ../../horde/doc/INSTALL
.. _`horde/doc/TRANSLATIONS`: ../../horde/doc/TRANSLATIONS
File renamed without changes.
17 changes: 8 additions & 9 deletions package.xml
Expand Up @@ -10,8 +10,7 @@
<email>chuck@horde.org</email>
<active>yes</active>
</lead>
<date>2012-07-19</date>
<time>22:36:22</time>
<date>2017-10-13</date>
<version>
<release>1.0.0alpha1</release>
<api>1.0.0</api>
Expand All @@ -32,12 +31,12 @@
<file name="conf.xml" role="horde" />
<file name="fields.php" 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="TODO" role="doc" />
</dir> <!-- /docs -->
</dir> <!-- /doc -->
<dir name="lib">
<dir name="Action">
<file name="Mailto.php" role="horde" />
Expand Down Expand Up @@ -207,10 +206,10 @@
<install as="ulaform/config/.htaccess" name="config/.htaccess" />
<install as="ulaform/config/conf.xml" name="config/conf.xml" />
<install as="ulaform/config/fields.php" name="config/fields.php" />
<install as="CHANGES" name="docs/CHANGES" />
<install as="CREDITS" name="docs/CREDITS" />
<install as="INSTALL" name="docs/INSTALL" />
<install as="TODO" name="docs/TODO" />
<install as="CHANGES" name="doc/CHANGES" />
<install as="CREDITS" name="doc/CREDITS" />
<install as="INSTALL" name="doc/INSTALL" />
<install as="TODO" name="doc/TODO" />
<install as="ulaform/lib/.htaccess" name="lib/.htaccess" />
<install as="ulaform/lib/Action.php" name="lib/Action.php" />
<install as="ulaform/lib/Api.php" name="lib/Api.php" />
Expand Down Expand Up @@ -273,7 +272,7 @@
<release>alpha</release>
<api>alpha</api>
</stability>
<date>2012-07-19</date>
<date>2017-10-13</date>
<license uri="http://www.horde.org/licenses/gpl.php">GPL-2.0</license>
<notes>
* [jan] Officially support PHP 7.
Expand Down

0 comments on commit 263a3b6

Please sign in to comment.