From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 1 Jun 2011 06:57:38 +0000 (+0200)
Subject: Merge from trunk
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a74b79e0f2c495ebffba938b34fc9e300750443;p=emacs.git

Merge from trunk
---

9a74b79e0f2c495ebffba938b34fc9e300750443
diff --cc doc/lispref/ChangeLog
index 3aa84ae62f6,83cee10f899..c43a3fbbf38
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,12 -1,8 +1,17 @@@
+ 2011-05-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+ 
+ 	* processes.texi (Process Information): Document
+ 	`process-alive-p'.
+ 
 +2011-05-30  Martin Rudalics  <rudalics@gmx.at>
 +
 +	* windows.texi (Windows and Frames, Window Sizes)
 +	(Resizing Windows): Minor rewrites.
 +	(Splitting Windows): Provide additional examples.  Rewrite
 +	parts on window-splits and window-nest.
 +	(Deleting Windows, Window Parameters, Side Windows): Minor
 +	rewrites.
 +
  2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
  
  	* help.texi (Accessing Documentation):