From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: GnuTLS docs Date: Mon, 09 Apr 2012 14:41:19 -0400 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87398clpdc.fsf@lifelogs.com> 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> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333996902 32393 80.91.229.3 (9 Apr 2012 18:41:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 9 Apr 2012 18:41:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 09 20:41:41 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 1SHJX1-00025Z-LP for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 20:41:39 +0200 Original-Received: from localhost ([::1]:41626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHJX1-0007zn-1k for ged-emacs-devel@m.gmane.org; Mon, 09 Apr 2012 14:41:39 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:39582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHJWw-0007zi-R7 for emacs-devel@gnu.org; Mon, 09 Apr 2012 14:41:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHJWv-0000jy-2s for emacs-devel@gnu.org; Mon, 09 Apr 2012 14:41:34 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:47629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHJWu-0000jc-SR for emacs-devel@gnu.org; Mon, 09 Apr 2012 14:41:33 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SHJWp-0001yw-Vq for emacs-devel@gnu.org; Mon, 09 Apr 2012 20:41:27 +0200 Original-Received: from c-76-28-40-19.hsd1.vt.comcast.net ([76.28.40.19]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Apr 2012 20:41:27 +0200 Original-Received: from tzz by c-76-28-40-19.hsd1.vt.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 09 Apr 2012 20:41:27 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 33 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: c-76-28-40-19.hsd1.vt.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130004 (Ma Gnus v0.4) Emacs/24.0.95 (gnu/linux) Cancel-Lock: sha1:Y1O5X+XpC9iHl00J7xDs+DfyMWI= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:149532 Archived-At: On Mon, 09 Apr 2012 13:28:07 -0400 Glenn Morris wrote: GM> Ted Zlatanov wrote: >> I didn't want to assume it was OK and I'm not experienced at merging >> commits between Bazaar branches. GM> Well, that's the thing. There would not have been a need for you to GM> merge it between branches. Just install it in emacs-24 and let Someone GM> merge it to the trunk along with all the other emacs-24 changes. Now GM> Someone needs to backport it to emacs-24, so this way is slightly more GM> work (and leads to a slightly messier history). It's not a big deal; but GM> if you aren't sure where something should go, just ask first. I really was trying to be careful; sorry for the trouble. There are actually two commits I made today, one of which (the GnuTLS handshake limit) also should be backported but I didn't have approval. GM> Also, it was recently noticed that $< is not portable in ordinary GM> make rules, so please replace all uses of that with its expansion. >> >> Sorry, I don't understand what you mean. Is there an example I should >> follow? GM> The ones in the emacs-24 branch doc Makefiles. :) (I read that thread today; IMHO we should stick with $< ) 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? Thanks Ted