From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.bugs Subject: bug#13965: info.info conflict between emacs and texinfo Date: Mon, 01 Apr 2013 09:11:48 +0200 Message-ID: References: <201303312321.r2VNLkox020803@freefriends.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1364800342 4558 80.91.229.3 (1 Apr 2013 07:12:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Apr 2013 07:12:22 +0000 (UTC) Cc: 13965@debbugs.gnu.org, bug-texinfo@gnu.org To: karl@freefriends.org (Karl Berry) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 01 09:12:49 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1UMYv8-00038D-Sw for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Apr 2013 09:12:47 +0200 Original-Received: from localhost ([::1]:40627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMYuk-0002It-Ap for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Apr 2013 03:12:22 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMYub-0002HY-Cf for bug-gnu-emacs@gnu.org; Mon, 01 Apr 2013 03:12:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UMYuZ-0007Nx-Gi for bug-gnu-emacs@gnu.org; Mon, 01 Apr 2013 03:12:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UMYuZ-0007Nr-DG for bug-gnu-emacs@gnu.org; Mon, 01 Apr 2013 03:12:11 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UMYxK-0002U9-8X for bug-gnu-emacs@gnu.org; Mon, 01 Apr 2013 03:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Andreas Schwab Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Apr 2013 07:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 13965 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 13965-submit@debbugs.gnu.org id=B13965.13648004789504 (code B ref 13965); Mon, 01 Apr 2013 07:15:02 +0000 Original-Received: (at 13965) by debbugs.gnu.org; 1 Apr 2013 07:14:38 +0000 Original-Received: from localhost ([127.0.0.1]:55321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UMYwv-0002TE-IO for submit@debbugs.gnu.org; Mon, 01 Apr 2013 03:14:38 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:50910) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UMYws-0002T4-2v for 13965@debbugs.gnu.org; Mon, 01 Apr 2013 03:14:36 -0400 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3ZfPqd32s5z3hhgQ; Mon, 1 Apr 2013 09:11:41 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3ZfPqd1G4LzbdsF; Mon, 1 Apr 2013 09:11:41 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 24GBlQSb7T-h; Mon, 1 Apr 2013 09:11:39 +0200 (CEST) X-Auth-Info: sb9TeRA/xLuqy9dUUN9rUE0qnaix1z7hQvofE0tjed8= Original-Received: from linux.local (ppp-88-217-115-29.dynamic.mnet-online.de [88.217.115.29]) by mail.mnet-online.de (Postfix) with ESMTPA; Mon, 1 Apr 2013 09:11:39 +0200 (CEST) Original-Received: by linux.local (Postfix, from userid 501) id C52ED1E5576; Mon, 1 Apr 2013 09:11:48 +0200 (CEST) X-Yow: Ask me the DIFFERENCE between PHIL SILVERS and ALEXANDER HAIG!! In-Reply-To: <201303312321.r2VNLkox020803@freefriends.org> (Karl Berry's message of "Sun, 31 Mar 2013 23:21:46 GMT") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:73057 Archived-At: karl@freefriends.org (Karl Berry) writes: > I know. I keep them synced. No, you don't. --- texinfo-5.1/doc/info.texi 2013-02-19 23:25:28.000000000 +0100 +++ emacs-24.3/doc/misc/info.texi 2013-01-01 21:37:17.000000000 +0100 @@ -14,25 +14,18 @@ This file describes how to use Info, the on-line, menu-driven GNU documentation system. -Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc. +Copyright @copyright{} 1989, 1992, 1996--2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no -Invariant Sections, with the Front-Cover texts being ``A GNU -Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the -license is included in the section entitled ``GNU Free Documentation -License'' in the Emacs manual. +Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +and with the Back-Cover Texts as in (a) below. A copy of the license +is included in the section entitled ``GNU Free Documentation License''. (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and -modify this GNU manual. Buying copies from the FSF supports it in -developing GNU and promoting software freedom.'' - -This document is part of a collection distributed under the GNU Free -Documentation License. If you want to distribute this document -separately from the collection, you can do so by adding a copy of the -license to the document, as described in section 6 of the license. +modify this GNU manual.'' @end quotation @end copying @@ -78,12 +71,13 @@ @end ifinfo @end ifnottex -@insertcopying +@insertcopying @menu * Getting Started:: Getting started using an Info reader. * Advanced:: Advanced Info commands. * Expert Info:: Info commands for experts. +* GNU Free Documentation License:: The license for this documentation. * Index:: An index of topics, commands, and variables. @end menu @@ -264,7 +258,7 @@ @format >> If you are in Emacs and have a mouse, and if you already practiced - typing @kbd{n} to get to the next node, click now with the left + typing @kbd{n} to get to the next node, click now with the left mouse button on the @samp{Next} link to do the same ``the mouse way''. @end format @@ -324,7 +318,7 @@ we call ``Backspace or DEL'' in this manual is labeled differently on different keyboards. Look for a key which is a little ways above the @key{ENTER} or @key{RET} key and which you normally use outside Emacs -to erase the character before the cursor, i.e.@: the character you +to erase the character before the cursor, i.e., the character you typed last. It might be labeled @samp{Backspace} or @samp{<-} or @samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to allow you to ``move around'' in a node that does not all fit on the @@ -1504,6 +1498,10 @@ To check an Info file, do @kbd{M-x Info-validate} while looking at any node of the file with Emacs Info mode. +@node GNU Free Documentation License +@appendix GNU Free Documentation License +@include doclicense.texi + @node Index @unnumbered Index Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."