[sagenb] 75/179: Rearrange config variable descriptions

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit 88abcf37002d37eef08907fbf69579050623137a
Author: Keshav Kini <keshav.kini at gmail.com>
Date:   Mon Apr 1 17:41:06 2013 -0700

    Rearrange config variable descriptions
---
 sagenb/notebook/server_conf.py | 68 +++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/sagenb/notebook/server_conf.py b/sagenb/notebook/server_conf.py
index cfd8279..4671600 100644
--- a/sagenb/notebook/server_conf.py
+++ b/sagenb/notebook/server_conf.py
@@ -63,12 +63,6 @@ G_LDAP = _('LDAP')
 
 defaults_descriptions = {
 
-    'word_wrap_cols': {
-        DESC : _('Number of word-wrap columns'),
-        GROUP : G_APPEARANCE,
-        TYPE : T_INTEGER,
-        },
-
     'max_history_length': {
         DESC : _('Maximum history length'),
         GROUP : G_SERVER,
@@ -76,18 +70,21 @@ defaults_descriptions = {
         },
 
     'idle_timeout': {
+        POS : 1,
         DESC : _('Idle timeout for normal worksheets (seconds)'),
         GROUP : G_SERVER,
         TYPE : T_INTEGER,
         },
 
     'pub_timeout': {
+        POS : 2,
         DESC : _('Idle timeout for published worksheets (seconds)'),
         GROUP : G_SERVER,
         TYPE : T_INTEGER,
         },
 
     'doc_timeout': {
+        POS : 3,
         DESC : _('Idle timeout for live documentation (seconds)'),
         GROUP : G_SERVER,
         TYPE : T_INTEGER,
@@ -129,21 +126,42 @@ defaults_descriptions = {
         TYPE : T_STRING,
         },
 
+    'ulimit': {
+        DESC : _('Worksheet process limits'),
+        GROUP : G_SERVER,
+        TYPE : T_STRING,
+        },
+
+    'model_version': {
+        DESC : _('Model Version'),
+        GROUP : G_SERVER,
+        TYPE : T_INFO,
+        },
+
+
+    'word_wrap_cols': {
+        DESC : _('Number of word-wrap columns'),
+        GROUP : G_APPEARANCE,
+        TYPE : T_INTEGER,
+        },
+
     'pretty_print': {
         DESC : _('Pretty print (typeset) output'),
         GROUP : G_APPEARANCE,
         TYPE : T_BOOL,
         },
 
-    'ulimit': {
-        DESC : _('Worksheet process limits'),
-        GROUP : G_SERVER,
-        TYPE : T_STRING,
+    'default_language': {
+        DESC : _('Default Language'),
+        GROUP : G_APPEARANCE,
+        TYPE : T_CHOICE,
+        CHOICES : get_languages(),
         },
 
-    'email': {
-        POS : 3,
-        DESC : _('Require e-mail for account registration'),
+
+    'openid': {
+        POS: 1,
+        DESC : _('Allow OpenID authentication (requires python ssl module)'),
         GROUP : G_AUTH,
         TYPE : T_BOOL,
         },
@@ -155,9 +173,9 @@ defaults_descriptions = {
         TYPE : T_BOOL,
         },
 
-    'openid': {
-        POS: 1,
-        DESC : _('Allow OpenID authentication (requires python ssl module)'),
+    'email': {
+        POS : 3,
+        DESC : _('Require e-mail for account registration'),
         GROUP : G_AUTH,
         TYPE : T_BOOL,
         },
@@ -189,17 +207,6 @@ defaults_descriptions = {
         TYPE : T_STRING,
         },
 
-    'default_language': {
-        DESC : _('Default Language'),
-        GROUP : G_APPEARANCE,
-        TYPE : T_CHOICE,
-        CHOICES : get_languages(),
-        },
-    'model_version': {
-        DESC : _('Model Version'),
-        GROUP : G_SERVER,
-        TYPE : T_INFO,
-        },
 
     'auth_ldap': {
         POS : 1,
@@ -207,42 +214,49 @@ defaults_descriptions = {
         GROUP : G_LDAP,
         TYPE : T_BOOL,
         },
+
     'ldap_uri': {
         POS : 2,
         DESC : _('LDAP URI'),
         GROUP : G_LDAP,
         TYPE : T_STRING,
         },
+
     'ldap_binddn': {
         POS : 3,
         DESC : _('Bind DN'),
         GROUP : G_LDAP,
         TYPE : T_STRING,
         },
+
     'ldap_bindpw': {
         POS : 4,
         DESC : _('Bind Password'),
         GROUP : G_LDAP,
         TYPE : T_STRING,
         },
+
     'ldap_gssapi': {
         POS : 5,
         DESC : _('Use GSSAPI instead of Bind DN/Password'),
         GROUP : G_LDAP,
         TYPE : T_BOOL,
         },
+
     'ldap_basedn': {
         POS : 6,
         DESC : _('Base DN'),
         GROUP : G_LDAP,
         TYPE : T_STRING,
         },
+
     'ldap_username_attrib': {
         POS : 7,
         DESC: _('Username Attribute (i.e. cn, uid or userPrincipalName)'),
         GROUP : G_LDAP,
         TYPE : T_STRING,
         },
+
     'ldap_timeout': {
         POS : 8,
         DESC: _('Query timeout (seconds)'),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git