Merge branch 'dev'

This commit is contained in:
HorlogeSkynet 2017-04-27 08:51:10 +02:00
commit cb1d9af924

@ -36,6 +36,7 @@ def helpController(admin):
result += "\trights FILE: Displays the rights set on the file\n"
result += "\tchown FILE NEW_OWNER: Changes the owner of a file\n"
result += "\tfind FILE: Finds a file in the server\n"
result += "\tchmod [-r] FILE {USER,GROUP}{+,-,=}{r,w,x} Changes the rights for a file or a directory\n"
if admin:
result += '\n'
@ -47,7 +48,6 @@ def helpController(admin):
result += "\tdelgroup GROUP: Removes an empty group (other than `administrator`)\n"
result += "\taddusergroup USER GROUP: Sets an user in a group (and creates it if it does not exist yet)\n"
result += "\tremoveusergroup USER GROUP: Unsets an user from a group (other than `admin`)\n"
result += "\tchmod [-r] FILE {USER,GROUP}{+,-,=}{r,w,x} Changes the rights for a file or a directory\n"
else:
result += "\tgroups: Displays the ACMS groups you are member of\n"