diff --git a/IPython/config/default/ipython_config.py b/IPython/config/default/ipython_config.py
index 2fa5def..58d4f03 100644
--- a/IPython/config/default/ipython_config.py
+++ b/IPython/config/default/ipython_config.py
@@ -154,8 +154,8 @@ 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
diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index 9e4851c..3444600 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -163,8 +163,6 @@ 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()