From c2e60a5a37ec43a0687472898b23463f0be2eb6f Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 26 Feb 2005 18:27:47 +0000
Subject: [PATCH] update configs

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4596 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini |  6 +++--
 config/config-dist.ini    | 48 +++++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index f8b765abe..297b218aa 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.28 2005-01-25 06:47:04 rurban Exp $
+; $Id: config-default.ini,v 1.29 2005-02-26 18:27:46 rurban Exp $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -12,7 +12,9 @@ ENABLE_XHTML_XML = false
 USECACHE = true
 WIKIDB_NOCACHE_MARKUP = false
 ENABLE_SPAMASSASSIN = false
+ENABLE_LIVESEARCH = false
 GOOGLE_LINKS_NOFOLLOW = true
+USE_SAFE_DBSESSION = false
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
@@ -97,7 +99,7 @@ ALLOW_LDAP_LOGIN = false
 ALLOW_IMAP_LOGIN = false
 
 THEME = default
-; DEFAULT_LANGUAGE = en
+; DEFAULT_LANGUAGE = 
 CHARSET = iso-8859-1
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
diff --git a/config/config-dist.ini b/config/config-dist.ini
index 56a2d8569..f8172bf5b 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -43,20 +43,19 @@
 ; I suspect ACL page permissions to degrade speed by 10%. Default: true
 ;ENABLE_PAGEPERM = false
 
-; Experimental new edit feature. Default: true
-; Reportedly broken on MacOSX Safari, and with application/xhtml+xml
+; Graphical buttons on edit. Default: true
+; Reportedly broken on MacOSX Safari
 ;ENABLE_EDIT_TOOLBAR = false
 
 ; Adds two additional buttons in EDIT_TOOLBAR, Search&Replace and Undo
-; Currently broken. Default: false
+; Default: true
 ;JS_SEARCHREPLACE = true
 
 ; Default: true
 ;ENABLE_DOUBLECLICKEDIT = false
 
-; Experimental. Conflicts with ENABLE_EDIT_TOOLBAR and Signin Button 
-; document.write() javascript. Needed for inlined SVG and MathML.
-; Default: false
+; Needed for inlined SVG and MathM, but may conflict with document.write(). 
+; Experimental. Default: false
 ;ENABLE_XHTML_XML = true
 
 ; Store DB query results in memory to avoid duplicate queries.
@@ -73,6 +72,16 @@
 ; if you want to improve pageranks on external links.
 ;GOOGLE_LINKS_NOFOLLOW = false
 
+; LiveSearch enables immediate title search results via XMLHttpRequest.
+; Displays the results in a dropdown under the titlesearch inputbox
+; while typing. (experimental, only with certain themes)
+; You'll have to copy livesearch.js from http://blog.bitflux.ch/wiki/LiveSearch
+; to themes/default/ and define ENABLE_LIVESEARCH in config.ini to true. 
+; See themes/blog/themeinfo.php.
+; Currently we use the bitflux.ch library, but we will change to 
+; the russian acdropdown soon. http://momche.net/publish/article.php?page=acdropdown
+;ENABLE_LIVESEARCH = true
+
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -194,7 +203,7 @@ MINOR_EDIT_TIMEOUT = 604800
 ; If defined (e.g. 1) read-access is done via SQL. 
 ; If flag 2 is set, phpwiki also writes. (Default on SQL or ADODB)
 ; This must use DATABASE_TYPE = SQL or ADODB
-;ACCESS_LOG_SQL = 1 ; read
+;ACCESS_LOG_SQL = 1 ; phpwiki reads, apache mod_log_sql writes
 ;ACCESS_LOG_SQL = 2 ; read + write
 
 ; By default PhpWiki will try to have PHP compress its output
@@ -754,21 +763,20 @@ CHARSET = iso-8859-1
 
 ; Select your language/locale - Default language is "" for auto-detected.
 ; Available languages:
-; English "en"  (English    - HomePage)
-; Dutch   "nl" (Nederlands - ThuisPagina)
-; Spanish "es" (Español    - PáginaPrincipal)
-; French  "fr" (Français   - PageAccueil))
-; German  "de" (Deutsch    - StartSeite)
-; Swedish "sv" (Svenska    - Framsida)
-; Italian "it" (Italiano   - PaginaPrincipale)
+; English  "en" (English    - HomePage)
+; Dutch    "nl" (Nederlands - ThuisPagina)
+; Spanish  "es" (Español    - PáginaPrincipal)
+; French   "fr" (Français   - PageAccueil))
+; German   "de" (Deutsch    - StartSeite)
+; Swedish  "sv" (Svenska    - Framsida)
+; Italian  "it" (Italiano   - PaginaPrincipale)
 ; Japanese "ja" (Japanese   - ¥Û¡¼¥à¥Ú¡¼¥¸)
-; Chinese  "zh" (Chinese   - ?)
+; Chinese  "zh" (Chinese    - ?)
 ;
-; If you set DEFAULT_LANGUAGE to the empty string, your system's
-; default language (as determined by the applicable environment
-; variables) will be used.
-; Japanese requires CHARSET=euc-jp or utf-8, Chinese CHARSET=utf-8
-DEFAULT_LANGUAGE = en
+; If you set DEFAULT_LANGUAGE to the empty string, the users 
+; preferred language as determined by the browser setting will be used.
+; Japanese requires CHARSET=euc-jp or utf-8 (not yet safe), Chinese CHARSET=utf-8
+;DEFAULT_LANGUAGE = en
 
 ; WIKI_PGSRC -- specifies the source for the initial page contents of
 ; the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is
-- 
2.45.0