changeset 30075c73a284 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=30075c73a284
description:
Merge README and doc and remove INSTALL
issue7397
review253271002
diffstat:
INSTALL | 4 ---
MANIFEST.in | 24 ++------------------
README | 66 -----------------------------------------------------------
README.rst | 7 ++++++
doc/index.rst | 22 ++----------------
setup.py | 8 ++++++-
6 files changed, 20 insertions(+), 111 deletions(-)
diffs (175 lines):
diff -r 3692e6e56e40 -r 30075c73a284 INSTALL
--- a/INSTALL Thu Apr 04 20:00:25 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Installing trytond
-==================
-
-See doc/topics/install.rst
diff -r 3692e6e56e40 -r 30075c73a284 MANIFEST.in
--- a/MANIFEST.in Thu Apr 04 20:00:25 2019 +0200
+++ b/MANIFEST.in Sat Apr 06 17:38:58 2019 +0200
@@ -1,26 +1,8 @@
-include LICENSE
+include CHANGELOG
include COPYRIGHT
-include README
-include INSTALL
-include CHANGELOG
+include LICENSE
+include README.rst
include doc/*
recursive-include doc *.rst
recursive-include doc *.po
recursive-include doc *.pot
-include trytond/backend/*/init.sql
-include trytond/ir/tryton.cfg
-include trytond/ir/*.xml
-include trytond/ir/view/*.xml
-include trytond/ir/locale/*.po
-include trytond/ir/ui/*.xml
-include trytond/ir/ui/*.rng
-include trytond/ir/ui/*.rnc
-include trytond/ir/ui/icons/*.svg
-include trytond/res/tryton.cfg
-include trytond/res/*.xml
-include trytond/res/*.html
-include trytond/res/view/*.xml
-include trytond/res/locale/*.po
-include trytond/tests/tryton.cfg
-include trytond/tests/*.xml
-include trytond/tests/forbidden.txt
diff -r 3692e6e56e40 -r 30075c73a284 README
--- a/README Thu Apr 04 20:00:25 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-trytond
-=======
-
-The server of the Tryton application platform.
-A three-tiers high-level general purpose application platform
-written in Python and use Postgresql as main database engine.
-It is the core base of an Open Source ERP.
-It provides modularity, scalability and security.
-
-Installing
-----------
-
-See INSTALL
-
-Package Contents
-----------------
-
- bin/
- Script for startup.
-
- doc/
- sphinx documentation in reStructuredText.
- To generate the HTML (trytond module must be in PYTHONPATH):
-
- sphinx-build doc/ doc/
-
- etc/
- Configuration files.
-
- trytond/
- trytond sources.
-
-Database Backends
------------------
-
-Tryton is mainly developed for PostgreSQL (8.2 or later) but there are other
-backends available. Here are some warnings about using SQLite backend:
-
- * SQLite can not create foreign keys.
-
- * SQL constraints are validated by Tryton instead of database.
-
- * Timestamp has a precision of second which is used for optimistic lock.
-
-Support
--------
-
-If you encounter any problems with Tryton, please don't hesitate to ask
-questions on the Tryton forum or IRC channel:
-
- http://www.tryton.org/forum
-
-License
--------
-
-See LICENSE
-
-Copyright
----------
-
-See COPYRIGHT
-
-
-For more information please visit the Tryton web site:
-
- http://www.tryton.org/
diff -r 3692e6e56e40 -r 30075c73a284 README.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.rst Sat Apr 06 17:38:58 2019 +0200
@@ -0,0 +1,7 @@
+trytond
+=======
+
+The server of Tryton.
+Tryton is business software, ideal for companies of any size, easy to use,
+complete and 100% Open Source.
+It provides modularity, scalability and security.
diff -r 3692e6e56e40 -r 30075c73a284 doc/index.rst
--- a/doc/index.rst Thu Apr 04 20:00:25 2019 +0200
+++ b/doc/index.rst Sat Apr 06 17:38:58 2019 +0200
@@ -1,24 +1,8 @@
.. _index:
-=====================
-trytond documentation
-=====================
-
-Support
-=======
-
-* Looking for specific information? Try the :ref:`genindex`, :ref:`modindex`.
-
-* Search information in the `mailing list`_.
-
-* Ask a question in the `#tryton IRC channel`_, or search the `IRC logs`_.
-
-* Report issues with trytond on `issue tracker`_.
-
-.. _mailing list: http://groups.tryton.org/
-.. _#tryton IRC channel: irc://irc.freenode.net/tryton
-.. _IRC logs: http://www.tryton.org/~irclog/
-.. _issue tracker: http://bugs.tryton.org/
+=============
+Tryton Server
+=============
First steps
===========
diff -r 3692e6e56e40 -r 30075c73a284 setup.py
--- a/setup.py Thu Apr 04 20:00:25 2019 +0200
+++ b/setup.py Sat Apr 06 17:38:58 2019 +0200
@@ -62,11 +62,17 @@
setup(name=name,
version=version,
description='Tryton server',
- long_description=read('README'),
+ long_description=read('README.rst'),
author='Tryton',
author_email='[email protected]',
url='http://www.tryton.org/',
download_url=download_url,
+ project_urls={
+ "Bug Tracker": 'https://bugs.tryton.org/',
+ "Documentation": 'https://docs.tryton.org/',
+ "Forum": 'https://www.tryton.org/forum',
+ "Source Code": 'https://hg.tryton.org/trytond',
+ },
keywords='business application platform ERP',
packages=find_packages(exclude=['*.modules.*', 'modules.*', 'modules',
'*.proteus.*', 'proteus.*', 'proteus']),
