Merge.

Trundle · Trundle · commit cfd167d89bde · 2011-07-16T17:55:19.000+02:00
diff --git a/README b/README
@@ -110,7 +110,7 @@ See the sample-config file for a list of available options.
 You should save your config file as ~/.bpython/config or specify
 at the command line:
 
-bpython -c /path/to/bpython/config
+bpython --config /path/to/bpython/config
 
 Known Bugs
 ==========
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -72,7 +72,7 @@ def processExited(self, reason):
         set_win_size(slave, 25, 80)
         reactor.spawnProcess(Protocol(), sys.executable,
             (sys.executable, "-m", "bpython." + self.backend,
-             "-c",  TEST_CONFIG),
+             "--config",  TEST_CONFIG),
             env=dict(TERM="vt100"),
             usePTY=(master, slave, os.ttyname(slave)))
         return result
diff --git a/doc/bpython.1 b/doc/bpython.1
@@ -55,8 +55,6 @@ Unlike other curses apps, bpython dumps the screen data to stdout when you quit,
 The long and short forms of options, shown here as alternatives, are
 equivalent. If bpython sees an argument it does not know, execution falls
 back to the regular Python interpreter.
-.IP "\fB\-c\fR \fIconfig\fR" 4
-.PD 0
 .IP "\fB\-\-config=\fR\fIconfig\fR" 4
 .PD
 Use \fIconfig\fR instead of default config file.
