Changeset 1602 in main for branches


Ignore:
Timestamp:
09/03/12 09:22:28 (7 years ago)
Author:
pcosquer
Message:

branch 1.1: merge commits [1599] [1600] [1601] from trunk

Location:
branches/1.1
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/docs/en/admin/ht_2_install_server.rst

    r1597 r1602  
    3838    #. ``apt-get install python-pip python-dev python-imaging python-kjbuckets python-pypdf ipython`` 
    3939    #. ``pip install odfpy`` 
    40     #. ``apt-get install graphviz graphviz-dev`` 
    41     #. ``pip install 'pygraphviz>=1.1'`` 
     40    #. ``apt-get install graphviz graphviz-dev python-pygraphviz`` 
    4241    #. ``apt-get install python-xapian rabbitmq-server`` 
    43     #. ``apt-get install python-django python-docutils`` 
    44     #. ``pip install 'south>=0.7'`` 
    45     #. ``pip install celery`` 
     42    #. ``apt-get install python-django python-django-south`` 
     43    #. ``pip install docutils`` 
    4644    #. ``pip install django-celery`` 
    4745    #. ``pip install 'django-haystack<2'`` 
    4846    #. ``apt-get install postgresql python-psycopg2`` 
    4947    #. ``pip install lepl`` 
    50     #. ``apt-get install python-pisa`` 
    51     #. ``apt-get install libgsf-bin`` 
     48    #. ``apt-get install python-pisa libgsf-bin`` 
    5249 
    5350To enable plain text search on files, you need to install the following 
  • branches/1.1/docs/en/devel/applications/document3D

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/1.1/openPLM

  • branches/1.1/openPLM/plmapp/management/commands/createcompany.py

    r389 r1602  
    11""" 
    2 Management utility to create superusers. 
     2Management utility to create a "company" user. 
    33""" 
    44 
     
    3737                 'until they\'re given a valid password.'), 
    3838    ) 
    39     help = 'Used to create a superuser.' 
     39    help = 'Used to create a "company" user.' 
    4040 
    4141    def handle(self, *args, **options): 
Note: See TracChangeset for help on using the changeset viewer.