Make the example values in the default ipython_config.py the same as the default settings.

IPython/config/default/ipython_config.py

@@ -154,8 +154,8 b' c = get_config()'
 #-----------------------------------------------------------------------------
 
 # Enable logging output as well as input to the database.
-# c.HistoryManager.db_log_output = True
+# c.HistoryManager.db_log_output = False
 
-# Only write to the database every 40 commands - this can save disk access (and
-# hence power) over the default of writing on every command.
-# c.HistoryManager.db_cache_size = 40
+# Only write to the database every n commands - this can save disk
+# access (and hence power) over the default of writing on every command.
+# c.HistoryManager.db_cache_size = 0

IPython/core/tests/test_magic.py

@@ -163,8 +163,6 b' def test_macro():'
     # List macros.
     assert "test" in ip.magic("macro")
 
-# XXX This should be a doctest, but the doctest logic doesn't seem to do
-# dynamic transformations (like expanding macros). Doing it like this for now.
 def test_macro_run():
     """Test that we can run a multi-line macro successfully."""
     ip = get_ipython()