From 0901b4a15e343ddec28675ee129b291159619122 2006-11-21 20:49:55
From: vivainio
Date: 2006-11-21 20:49:55
Subject: [PATCH] update changelog
---

diff --git a/IPython/Magic.py b/IPython/Magic.py
index acd4baa..9302f8f 100644
--- a/IPython/Magic.py
+++ b/IPython/Magic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Magic functions for InteractiveShell.
 
-$Id: Magic.py 1918 2006-11-21 20:19:13Z vivainio $"""
+$Id: Magic.py 1921 2006-11-21 20:49:55Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -36,11 +36,16 @@ from cStringIO import StringIO
 from getopt import getopt,GetoptError
 from pprint import pprint, pformat
 
-# profile isn't bundled by default in Debian for license reasons
+# cProfile was added in Python2.5
 try:
-    import profile,pstats
+    import cProfile as profile
+    import pstats
 except ImportError:
-    profile = pstats = None
+    # profile isn't bundled by default in Debian for license reasons
+    try:
+        import profile,pstats
+    except ImportError:
+        profile = pstats = None
 
 # Homebrewed
 import IPython
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4aaa680..f58da48 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,4 @@
+
 2006-11-21  Ville Vainio  <vivainio@gmail.com>
 
 	* upgrade_dir.py: Now actually overwrites a nonmodified user file
@@ -10,6 +11,20 @@
 	of os.path.join, expansion of 'foo' was broken on win32 
 	if there was one directory with name 'foobar'. 
 
+	* A bunch of patches from Kirill Smelkov:
+	
+	* [patch 9/9] doc: point bug-tracker URL to IPythons trac-tickets.
+
+	* [patch 7/9] Implement %page -r (page in raw mode) - 
+
+	* [patch 5/9] ScientificPython webpage has moved
+
+	* [patch 4/9] The manual mentions %ds, should be %dhist
+
+	* [patch 3/9] Kill old bits from %prun doc.
+
+	* [patch 1/9] Fix typos here and there.
+
 2006-11-08  Ville Vainio  <vivainio@gmail.com>
 
 	* completer.py (attr_matches): catch all exceptions raised 
diff --git a/doc/manual_base.lyx b/doc/manual_base.lyx
index d93d1f9..9758c7b 100644
--- a/doc/manual_base.lyx
+++ b/doc/manual_base.lyx
@@ -438,11 +438,15 @@ Profiler support.
 profile.run()
 \family default 
 ) or complete programs under the profiler's control.
- While this is possible with the standard 
+ While this is possible with standard 
+\family typewriter 
+cProfile
+\family default 
+ or 
 \family typewriter 
 profile
 \family default 
- module, IPython wraps this functionality with magic commands (see 
+ modules, IPython wraps this functionality with magic commands (see 
 \family typewriter 
 `%prun'
 \family default