<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,7 @@
 ; reference Wikidot configuration file containing each possible key and default values (if present)
 ; 
 ;  * no-default means that you need to manually set the value (there're no default)
+;  * no-default-if-wiki-farm means that you need to manually set the value if wiki_farm is set to true
 ;  * autogenerated means that if you remove the line from the config (or use the minimal one),
 ;    Wikidot will calculate the value for this setting from other settings -- but you may want to
 ;    override this by explicitely setting the value
@@ -14,12 +15,16 @@
 ; main settings
 [main]
 
+; whether to run whole wiki farm or just a single wiki
+; default: false -- single wiki
+wiki_farm = false
+
 ; name of your service, e.g. &quot;MIT University Wikis&quot;
-service = no-default
+service = no-default-if-wiki-farm
 
 ; domain name
 ; no default
-domain = no-default
+domain = no-default-if-wiki-farm
 
 ; the main wiki
 ; default: the domain name prefixed by www.
@@ -33,11 +38,15 @@ main_wiki = auto-generated
 ; string that is used to generate unpredictable hashes for authentication
 ; YOU MUST CHANGE IT or otherwise, anyone can predict the authentication
 ; cookies and thus steal any session from your users
-secret = no-default
+; by default it's got from file (randomly) generated when making
+secret = auto-generated
 
 ; secret used for logging in on custom domains
 secret_login = auto-generated
 
+; secret used for configuring superadmin password before logging in
+secret_manage_superadmin = auto-generated
+
 ; allow users to configure SSL settings for their wikis.
 ; default: false
 ssl = false
@@ -84,30 +93,11 @@ port = 5432
 ;;;;
 ; search settings -- used for indexing pages
 [search]
-; search (Zend_Search_Lucene) index directory
-; default: tmp/lucene_index inside of Wikidot dir
-lucene_index = autogenerated
-
-; indexer queue file
-; default: tmp/lucene_queue inside of Wikidot dir
-lucene_queue = autogenerated
-
-; indexer lock file
-; it is used to have flock on it -- indicates
-; something exclusive happens
-; default: tmp/lucene_lock inside of Wikidot dir
-lucene_lock = autogenerated
 
 ; whether to highlight found words (when searching from Google, Yahoo or Wikidot)
 ; default: false
 highlight = false
 
-; whether to use java external program to search in Lucene index
-; default: false -- use PHP implementation (very fast anyway)
-; set to true to increase search performance (but you need to install java)
-; also this will help if you get memory exhausted errors when searching
-use_java = false
-
 
 ;;;;
 ; mail settings -- used for sending notifications and registration confirmation
@@ -119,16 +109,16 @@ host = 127.0.0.1
 ; SMTP port
 port = 25
 
+; SMTP needs authenticating?
+; if true, you NEED to set user and password
+auth = false
+
 ; SMTP user
 user = 
 
 ; SMTP password
 password = 
 
-; SMTP needs authenticating?
-; if true, you NEED to set user and password
-auth = false
-
 ; e-mail hostname -- used in mail headers
 ; default: the same as host
 hostname = auto-generated</diff>
      <filename>conf/full-example-of-wikidot.ini</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>78ab64a2df5ec0e749e63e5ee09d4e2c4064e75e</id>
    </parent>
  </parents>
  <author>
    <name>Piotr Gabryjeluk</name>
    <login></login>
    <email>piotr@wikidot.com</email>
  </author>
  <url>http://github.com/gabrys/wikidot/commit/8c865a3acf14517bea5cf3e71e77b568b614c856</url>
  <id>8c865a3acf14517bea5cf3e71e77b568b614c856</id>
  <committed-date>2009-06-23T05:45:19-07:00</committed-date>
  <authored-date>2009-06-23T05:45:19-07:00</authored-date>
  <message>updated the full-example-of-wikidot.ini to match the recent changes</message>
  <tree>044fc146a4084565cb2b4bd64196d776574b66f3</tree>
  <committer>
    <name>Piotr Gabryjeluk</name>
    <login></login>
    <email>piotr@wikidot.com</email>
  </committer>
</commit>
