From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: GnuTLS docs Date: Mon, 09 Apr 2012 15:17:56 -0400 Message-ID: <6dy5q4yasb.fsf@fencepost.gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <87y5qa72vm.fsf_-_@lifelogs.com> <834nsycjs0.fsf@gnu.org> <87y5qa5chf.fsf@lifelogs.com> <83pqblc2ih.fsf@gnu.org> <87pqbl6c9l.fsf@lifelogs.com> <83d37lb3nu.fsf@gnu.org> <87d37hofbs.fsf@lifelogs.com> <83k41p8ibl.fsf@gnu.org> <878vi5nlbg.fsf@lifelogs.com> <834nst848o.fsf@gnu.org> <87r4vxm4l2.fsf@lifelogs.com> <1rk41oubfu.fsf@fencepost.gnu.org> <87fwcclua9.fsf@lifelogs.com> <87398clpdc.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1333999085 17170 80.91.229.3 (9 Apr 2012 19:18:05 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 9 Apr 2012 19:18:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 09 21:18:05 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SHK6F-0001Cp-EW for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 21:18:03 +0200 Original-Received: from localhost ([::1]:56854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHK6E-0001Ak-PM for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 15:18:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:34196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHK6B-00018I-UA for emacs-devel@gnu.org; Mon, 09 Apr 2012 15:18:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHK6A-0002qV-77 for emacs-devel@gnu.org; Mon, 09 Apr 2012 15:17:59 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:48647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHK6A-0002qQ-4j for emacs-devel@gnu.org; Mon, 09 Apr 2012 15:17:58 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SHK68-000357-Q8; Mon, 09 Apr 2012 15:17:56 -0400 X-Spook: JPL MIT-LL ASO Elvis Crypto AG infowar LABLINK lynch X-Ran: EGMaZt?Io0B0-?XD^{PciDPXEdX{I~y~/eYj"L}sl+M,AxOst>$r:WD[%WlIoJ<}x_G"qx X-Hue: green X-Attribution: GM In-Reply-To: <87398clpdc.fsf@lifelogs.com> (Ted Zlatanov's message of "Mon, 09 Apr 2012 14:41:19 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.10 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149534 Archived-At: Ted Zlatanov wrote: > Just to confirm, you're asking me to be inconsistent with the trunk > doc/misc/Makefile in order to make the merge easier, and to make the > doc/misc/Makefile commit in the "trunk" branch? I guess just leave it as it is in the trunk now. Someone will fix it after it gets backported to emacs-24, then merge the fix back to the trunk.