* Changed 'guess-name room' to 'hidden room' in the text client (this was done a...

diff --git a/citadel/messages/roomaccess b/citadel/messages/roomaccess
index 6e62d6b0a274dcf2258b9d46e0eb0bf468116c0f..4dabb9605577d6ecbb1d39c88a22e7c0b72d6708 100644 (file)
--- a/citadel/messages/roomaccess
+++ b/citadel/messages/roomaccess
@@ -1,14 +1,14 @@
 Most rooms are public. Anyone on the system may get into a public room.
 Private rooms may take several forms:
  
- Guess-name: to gain access to this type of room, a user need only know
+ Hidden: to gain access to this type of room, a user need only know
 the room's name. No hints are given by the system.
  
- Passworded: same as guess-name but the user must also know a password
+ Passworded: same as hidden but the user must also know a password
 to get access.
  
  Invitation-only: users may only gain access to this type of room if
-an aide gives it to them. 
+an Aide gives it to them. 
  
  Personal: this type of room acts as a user-specific "mailbox."
   

diff --git a/citadel/rooms.c b/citadel/rooms.c
index 0bffe898ae8090c4b362c08ce2711a1897d1fa9e..5fbc76c7f78c210fd8b7657d2c26fd8eddf2aa9a 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -534,7 +534,7 @@ void editthisroom(CtdlIPC *ipc)
        attr->QRflags = set_room_attr(ipc, attr->QRflags, "Private room", QR_PRIVATE);
        if (attr->QRflags & QR_PRIVATE) {
                attr->QRflags = set_room_attr(ipc, attr->QRflags,
-                                      "Accessible by guessing room name",
+                                      "Hidden room (accessible to anyone who knows the room name)",
                                       QR_GUESSNAME);
        }
 
@@ -1071,10 +1071,14 @@ void entroom(CtdlIPC *ipc)
 
        IFNEXPERT formout(ipc, "roomaccess");
        do {
-               scr_printf("<?>Help\n<1>Public room\n<2>Guess-name room\n"
-                      "<3>Passworded room\n<4>Invitation-only room\n"
-                      "<5>Personal room\n"
-                       "Enter room type: ");
+               scr_printf("<?>Help\n"
+                       "<1>Public room (shown to all users by default)\n"
+                       "<2>Hidden room (accessible to anyone who knows the room name)\n"
+                       "<3>Passworded room (hidden, plus requires a password to enter)\n"
+                       "<4>Invitation-only room (requires access to be granted by an Aide)\n"
+                       "<5>Personal room (accessible to you only)\n"
+                       "Enter room type: "
+               );
                do {
                        b = inkey();
                } while (((b < '1') || (b > '5')) && (b != '?'));
@@ -1099,7 +1103,7 @@ void entroom(CtdlIPC *ipc)
        if (b == 1)
                scr_printf(" public room.");
        if (b == 2)
-               scr_printf(" guess-name room.");
+               scr_printf(" hidden room.");
        if (b == 3)
                scr_printf(" passworded room, password: %s", new_room_pass);
        if (b == 4)