MERGE DS_RPC_BRANCH into MAIN:

configDialog.py
    AutoIndent merged 21Jul

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index 2d05ed2dc07c916be57f3905454bbab8e817a151..f14f81d508769c674fe8ee1797c35d233745d952 100644 (file)
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -125,9 +125,9 @@ class ConfigDialog(Toplevel):
         labelIndentSizeTitle=Label(frameIndentSize,
                 text='Choose indentation size :')
         labelSpaceNumTitle=Label(frameIndentSize,justify=LEFT,
-                text='when tab key inserts spaces,\nspaces per indent')
+                text='indent width')
         self.scaleSpaceNum=Scale(frameIndentSize,variable=self.spaceNum,
-                orient='horizontal',tickinterval=2,from_=2,to=10)
+                orient='horizontal',tickinterval=2,from_=2,to=16)
         #labeltabColsTitle=Label(frameIndentSize,justify=LEFT,
         #        text='when tab key inserts tabs,\ncolumns per tab')
         #self.scaleTabCols=Scale(frameIndentSize,variable=self.tabCols,