Move the most relevant options to the top of the default config file

(people may not want to read the whole file to setup their account)

1 files changed, 34 insertions, 35 deletions

diff --git a/data/default_config.cfg b/data/default_config.cfg
index 367a5607..90140a5e 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -4,6 +4,39 @@
 
 [Poezio]
 
+# Jabber identifier. Specify it only if you want to connect using an existing
+# account on a server. This is optional and useful only for some features,
+# like room administration, nickname registration.
+# The 'server' option will be ignored if you specify a JID (Jabber identifier)
+# It should be in the form nickname@server.tld
+jid =
+
+# A password is needed only if you specified a jid. It will be ignored otherwise
+# If you leave this empty, the password will be asked at each startup
+password =
+
+# the nick you will use when joining a room with no associated nick
+# If this is empty, the $USER environnement variable will be used
+default_nick =
+
+# the rooms you will join automatically on startup, with associated nickname or not
+# format : room@server.tld/nickname:room2@server.tld/nickname2
+# default_nick will be used if "/nickname" is not specified
+rooms =
+
+# a list of words (separated by a colon (:)) that will be
+# highlighted if said by someone on a room
+highlight_on =
+
+# Colon-separated list of plugins to load on startup
+plugins_autoload =
+
+# the resource you will use
+# If it's empty, your resource will be chosen (most likely randomly) by the server
+# It is not recommended to use a resource that is easy to guess, because it can lead
+# to presence leak.
+resource =
+
 # The server used for anonymous connection.
 # Make sure the server you're using accepts anonymous authentication
 server = anon.jeproteste.info
@@ -39,33 +72,12 @@ connection_check_interval = 60
 # The timeout value of those pings
 connection_timeout_delay = 10
 
-# the resource you will use
-# If it's empty, your resource will be chosen (most likely randomly) by the server
-# It is not recommended to use a resource that is easy to guess, because it can lead
-# to presence leak.
-resource =
-
-# the nick you will use when joining a room with no associated nick
-# If this is empty, the $USER environnement variable will be used
-default_nick =
-
 # Send the initial presence
 # true, unless you want to be invisible from your roster
 # warning: this disables any presence sending other than MUCs or directed
 # presences via /presence
 send_initial_presence = true
 
-# Jabber identifier. Specify it only if you want to connect using an existing
-# account on a server. This is optional and useful only for some features,
-# like room administration, nickname registration.
-# The 'server' option will be ignored if you specify a JID (Jabber identifier)
-# It should be in the form nickname@server.tld
-jid =
-
-# A password is needed only if you specified a jid. It will be ignored otherwise
-# If you leave this empty, the password will be asked at each startup
-password =
-
 # The status (show) poezio will send when connecting.
 # can be: xa,dnd,away,available,chat.
 # An empty or invalid value will mean available.
@@ -88,11 +100,6 @@ custom_host =
 # You should not need this in a "normal" use case.
 custom_port =
 
-# the rooms you will join automatically on startup, with associated nickname or not
-# format : room@server.tld/nickname:room2@server.tld/nickname2
-# default_nick will be used if "/nickname" is not specified
-rooms =
-
 # the method that poezio will use to store your bookmarks online
 # possible values are: privatexml, pep
 # You should not have to modify this, but if you have to, please do.
@@ -123,10 +130,6 @@ show_timestamps = true
 # e.g. words = "anticonstitutionnellement:I protest:I like bananas:"
 words =
 
-# a list of words (separated by a colon (:)) that will be
-# highlighted if said by someone on a room
-highlight_on =
-
 # XHTML-IM is an XMPP extension letting users send messages
 # containing XHTML and CSS formating. We can use this to make
 # colored text for example.
@@ -232,9 +235,6 @@ plugins_dir =
 # $XDG_CONFIG_HOME/poezio/plugins. You can specify another directory here.
 plugins_conf_dir =
 
-# Colon-separated list of plugins to load on startup
-plugins_autoload =
-
 # the full path to the photo (avatar) you want to use
 # it should be less than 16Ko
 # The avatar is not set by default, because it slows
@@ -311,7 +311,6 @@ roster_group_sort = name
 # - invite (when you receive an invitation for joining a MUC)
 beep_on = highlight private invite
 
-
 # Theme
 
 # If themes_dir is not set, logs will searched for in $XDG_DATA_HOME/poezio/themes,
@@ -422,7 +421,7 @@ send_time = true
 separate_history = false
 
 # The language you specify using.
-# This *may* be ysed by an automated entity to send you tailored replies
+# This *may* be used by an automated entity to send you tailored replies
 # If you don't understand, leave en.
 lang = en