Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / messages / roomaccess

diff --git a/citadel/messages/roomaccess b/citadel/messages/roomaccess
index 4dabb9605577d6ecbb1d39c88a22e7c0b72d6708..0aebbac56fe7327a1ddd5a9ab28a901037f1169a 100644 (file)
--- a/citadel/messages/roomaccess
+++ b/citadel/messages/roomaccess
@@ -8,13 +8,13 @@ the room's name. No hints are given by the system.
 to get access.
  
  Invitation-only: users may only gain access to this type of room if
 to get access.
  
  Invitation-only: users may only gain access to this type of room if

-an Aide gives it to them. 
+an Admin gives it to them. 

  
  Personal: this type of room acts as a user-specific "mailbox."
   
  Once a user has access to a private room, it shows up on the known
  
  Personal: this type of room acts as a user-specific "mailbox."
   
  Once a user has access to a private room, it shows up on the known

-rooms list and acts the same as any other room. Aides may kick users out
+rooms list and acts the same as any other room. Admins may kick users out

 of any type of private room, and out of excludable rooms.  Please also keep
 of any type of private room, and out of excludable rooms.  Please also keep

-in mind that Aides have access to ALL private rooms.
+in mind that Admins have access to ALL private rooms.

  
  Before making it private, think about it. Does it really NEED to be private?
  
  Before making it private, think about it. Does it really NEED to be private?