11. Access your Comt instance by pointing your browser to http://127.0.0.1:8000/
+
+
##Installation (production environment)
-This README.txt does not cover in details a production environment because this kind of setup is too platform dependant for us to provide a guide.
+This README does not cover in details a production environment because this kind of setup is too platform dependant for us to provide a guide.
A few tips thought:
-- recommended way to install it is using apache and wsgi, check out django installation guide at http://www.djangoproject.com/documentation/modpython/
-- if you use apache as a frontend, you will need to create {{ APACHE_HOME: usually /var/www }}/.python-eggs and chown it to apache
+- The recommended way to install it is using apache and wsgi, check out django installation guide at >http://www.djangoproject.com/documentation/modpython/>
+- If you use apache as a frontend, you will need to create `{{ APACHE_HOME: usually /var/www }}/.python-eggs` and chown it to the `apache` user.
+
##Upgrade
@@ -140,30 +150,32 @@ If your database was created using comt alpha prior to the revision 29, here are
-`./bin/django migrate cm 0001_initial --fake`
-`./bin/django migrate`
+
##Abiword or Openoffice ?
Comt uses either abiword or openoffice to convert documents from ODT, MS Word, etc. to html.
-Abiword is a lighter and more performant solution. You have to add the configuration parameter `USE_ABI = True` in your settings_local.py to use Abiword. Otherwise openoffice is used.
+Abiword is a lighter and more performant solution. You have to add the configuration parameter `USE_ABI = True` in your `settings_local.py` to use Abiword. Otherwise openoffice is used.
To use openoffice, on a development setup, you should make sure no openoffice process is left and launch `soffice -headless "-accept=socket,port=2002;urp;"` to start openoffice in background mode.
-##Comt uses
+
+##Libraries and assets COMT depends upon
###Javascript libs used (and license) / shipped with the distribution
@@ -174,8 +186,9 @@ To use openoffice, on a development setup, you should make sure no openoffice pr
- python-cssutils
###Icons
------
-- Icons derived from FatCow Icon Set http://www.fatcow.com/free-icons/index.bml (Creative Commons Attribution 3.0 License)
+
+Icons derived from FatCow Icon Set (<http://www.fatcow.com/free-icons/index.bml>) (Creative Commons Attribution 3.0 License)
+
##FAQ
@@ -202,54 +215,48 @@ Q4: I get 'import error' when starting the server (step #9)
R4: Make sure you installed all required python dependencies
-## Community
-
-The Comt web site http://www.co-ment.org is the place to ask questions, report bugs, check out the source code or download the releases of Comt.
-## How to contribute
-
-### Contribute using mercurial
-
-We use mercurial as our source code management system.
+## Community
-1. Create a mercurial profile (nickname/email) in ~/.hgrc (cf. http://mercurial.selenic.com/quickstart for more info).
- This is important because your name will appear in your changeset once it gets accepted into the mainline
+The Comt web site <http://www.co-ment.org/> is the place to ask questions, report bugs, check out the source code or download the releases of Comt.
-2. Clone the repository `hg clone http://hg.co-ment.org/ comt`
- OR update your copy of the source code: `hg update`
-3. Hack, hack
+## How to contribute
-4. Commit locally: `hg commit -m "MY COMMIT MESSAGE"`
+We use GitHub as our collaboration tool.
+
+### Reporting issues
-5. Export your changeset to a file: `hg export tip > my_patch.txt`
+Please use the GitHub issue tracker for the project: <>
-6. Create a ticket describing your change and attach your patch to it: http://www.co-ment.org/newticket
-7. We will review the patch as soon as possible. If we judge it acceptable and useful, we will be back to you regarding copyright, licensing and other legalese.
+### Contribute using Git
-### Contribute without using mercurial
+We use Git as our source code management system.
-If you don't want to use mercurial, you can also create a ticket (http://www.co-ment.org/newticket) with a few modified files to the bugtracker.
+You can submit pull request
-Make sure you leave us a nickname and an email for inclusion in the changelog. Point 7 above also applies to contributions without using mercurial.
+###Additional trademark clause to the GNU Affero GPLv3 license for the COMT software
+
As authorized by the [GNU AGPLv3](http://www.fsf.org/licensing/licenses/agpl.html "Affero GPLv3 license text") license, users of the COMT software can only make use of the co-ment trademark in compliance with the regulation of use (see below).
Regulation of use for the co-ment(R) trademark
-==============================================
+----------------------------------------------
+
+###Sopinspace
-Sopinspace
-----------
Sopinspace is a SARL (limited liability company) with a capital of 15000 €, registered in France under the number RCS Paris B 451 436 604 with VAT number FR92 451 436 604. Sopinspace(R) is a registered trademark. Postal address: 4, passage de la Main d'Or, F-75011 Paris, France.
-Definitions
------------
+###Definitions
+
For the application of this regulation:
1.*Country of operation* designate the country in which an activity (such as operating a Web service or distributing software) covered by the co-ment trademark classes is conducted.
@@ -32,8 +31,8 @@ For the application of this regulation:
6.*General interest organisation* designates an organization whose main purpose is to serve the public.
7.*Sopinspace co-ment sites* designates any website operated by Sopinspace whose domain name contains *co-ment* and any subdomain of these sites.
-Rules
------
+###Rules
+
Use of the co-ment trademark by a commercial entity or for any commercial purpose is forbidden without written authorization of the tramemark holder.
Non-for-profit organisations are welcome to make use of the co-ment trademark within source code, documentation or user interfaces for their non-for-profit activities when operating Web services or software based on the COMT platform or developing activities making use of Sopinspace's co-ment(R) Web services, provided that:
0 comments on commit
c63bb85