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

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 3e377d4f207b78adfafc4a451dd1ea8743992115..060f8df64c46003fc69eb0fab186ad4d33ecddd8 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -283,7 +283,7 @@ install-data-new:
                echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
                $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
        fi
-       @for i in bio bitbucket files images info userpics; do \
+       @for i in bio bitbucket files images info userpics netconfigs; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
        done
 
@@ -323,7 +323,7 @@ install-doc-new:
        $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-       @for i in bio bitbucket files images info userpics; do \
+       @for i in bio bitbucket files images info userpics netconfigs; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \

diff --git a/citadel/control.c b/citadel/control.c
index bd4136635249f803e3388a9cb251b41c367f98a2..1e469b489ef84178f4466574a9ad5d2b780e1d11 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -329,7 +329,7 @@ long get_new_room_number(void)
  * Get or set global configuration options
  *
  * IF YOU ADD OR CHANGE FIELDS HERE, YOU *MUST* DOCUMENT YOUR CHANGES AT:
- * http://www.citadel.org/doku.php/documentation:appproto:system_config
+ * http://www.citadel.org/doku.php?id=documentation:applicationprotocol
  *
  */
 void cmd_conf(char *argbuf)

diff --git a/citadel/database.c b/citadel/database.c
index 38be23f882247efb1164c2d7d47e2d5c3510b2f2..26cce16330682e5b5c24f94ed4956bf2166916c7 100644 (file)
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -396,7 +396,7 @@ void open_databases(void)
                if (ret) {
                        syslog(LOG_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret));
                        if (ret == ENOMEM) {
-                               syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php/faq:troubleshooting:out_of_lock_entries for more information.\n");
+                               syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
                        }
                        syslog(LOG_EMERG, "exit code %d\n", ret);
                        exit(CTDLEXIT_DB);
@@ -889,7 +889,7 @@ void cdb_trunc(int cdb)
                        } else {
                                syslog(LOG_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret));
                                if (ret == ENOMEM) {
-                                       syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php/faq:troubleshooting:out_of_lock_entries for more information.");
+                                       syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
                                }
                                exit(CTDLEXIT_DB);
                        }

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index c091c65882779dac0b2a1645c5ca2aa45bcdc56c..40ab17c77d94912fa516fefc65b50f71df332932 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -86,7 +86,7 @@ ConstStr ErrGeneral[] = {
        {HKEY("To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
              "The errors returned by the system were:\n")},
        {HKEY("You can recheck the above if you follow this faq item:\n"
-             "http://www.citadel.org/doku.php/faq:mastering_your_os:net#netstat")}
+             "http://www.citadel.org/doku.php?id=faq:mastering_your_os:net#netstat")}
 };
 
 ConstStr ErrPortShort = { HKEY("We couldn't bind all ports you configured to be provided by citadel server.\n")};

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 8f71b7ea41ec3c4a09882d727ed3454ca417f308..2b83270c01c7d1e10fb0f5036c9be522aba084a7 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -1095,7 +1095,7 @@ void checkcrash(void)
                        "factor.\n \n"
                        " You can obtain more information about this by enabling core dumps.\n \n"
                        " For more information, please see:\n \n"
-                       " http://citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
+                       " http://citadel.org/doku.php?id=faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files"
                        "\n \n"
 
                        " If you have already done this, the core dump is likely to be found at %score.%d\n"

diff --git a/webcit/webcit.h b/webcit/webcit.h
index ef976ec93362d1a736c8cd43d96a960082142bce..3d5b861164fe1a36ec0d8b46bf5048f2c36e1fc2 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -129,8 +129,8 @@ extern char *ssl_cipher_list;
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
 #define CLIENT_VERSION         810             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    810             /* Minimum required version of Citadel server */
-#define        LIBCITADEL_MIN          810             /* Minimum required version of libcitadel */
+#define MINIMUM_CIT_VERSION    805             /* Minimum required version of Citadel server */
+#define        LIBCITADEL_MIN          805             /* Minimum required version of libcitadel */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Window target for inline URL's */