From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Witten Newsgroups: gmane.emacs.bugs Subject: bug#11689: [PATCH 09/14] etc/tutorials/TUTORIAL: Replace occurences of `--' with more appropriate text Date: Wed, 13 Jun 2012 00:08:50 -0000 Message-ID: <500ff5a743a140b28578d0f79b4b8f46-mfwitten@gmail.com> References: <1c1914fbe9e641219e6fff6d7fe92428-mfwitten@gmail.com> NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1339547742 14520 80.91.229.3 (13 Jun 2012 00:35:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 13 Jun 2012 00:35:42 +0000 (UTC) To: 11689@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 13 02:35:40 2012 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 1SebYa-0006Pr-O5 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Jun 2012 02:35:32 +0200 Original-Received: from localhost ([::1]:45892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebYa-0006uq-Ee for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Jun 2012 20:35:32 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebYR-0006W5-5J for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:35:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SebYO-0007QH-Vt for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:35:22 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebYO-0007Q2-Qp for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:35:20 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Sebb2-0006PS-Tf for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:38:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Witten Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jun 2012 00:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11689 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133954786124531 (code B ref -1); Wed, 13 Jun 2012 00:38:04 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jun 2012 00:37:41 +0000 Original-Received: from localhost ([127.0.0.1]:40120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sebae-0006NW-Ld for submit@debbugs.gnu.org; Tue, 12 Jun 2012 20:37:41 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51512) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SebV0-0006Cc-5a for submit@debbugs.gnu.org; Tue, 12 Jun 2012 20:31:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SebSJ-0005Wc-GR for submit@debbugs.gnu.org; Tue, 12 Jun 2012 20:29:05 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:54565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebSJ-0005WW-9a for submit@debbugs.gnu.org; Tue, 12 Jun 2012 20:29:03 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebSH-00064R-3L for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:29:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SebSE-0005Vt-QG for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:29:00 -0400 Original-Received: from mail-wi0-f177.google.com ([209.85.212.177]:51040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SebSE-0005VY-EZ for bug-gnu-emacs@gnu.org; Tue, 12 Jun 2012 20:28:58 -0400 Original-Received: by wibhm14 with SMTP id hm14so9693wib.12 for ; Tue, 12 Jun 2012 17:28:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:date:from:to:message-id:in-reply-to:references; bh=38p7POuTLUw/85eYeiztLKjuGqxYieHU7T3daVK/ufc=; b=fi80ykOoFOtwAXOtb00u1BuIDMnr4xdXj9UGuypX+W/7RO8K6rmZNVP6vKSd+uDYtE CbIiMsg1kP8vFt8xXtAsLgXdJyH8wnHpIFIt3hWaMcSE+shjz9H51X0QSYUvhvNJxreD 8Y14dscm799Aa8560llksWZvMqOqGGgvXCz5bJeBCUCWRF30aFT04mMpsLctoYCiwHhA 6eRLK+h9MBE/TjofF7qSTTWIKknt9EcjVui3O+mgmH9vlOcTLlDg2QSCNnZfMp7khcz0 xVO7jBeH3M0ij9jRfBI4TQvf6AGH4X077BWSB7FLsPf6nV/DXwYm1mGQpHdZ7RwLpa5M qgNw== Original-Received: by 10.216.226.233 with SMTP id b83mr851289weq.204.1339547333665; Tue, 12 Jun 2012 17:28:53 -0700 (PDT) Original-Received: from gmail.com (tor-exit-router35-readme.formlessnetworking.net. [199.48.147.35]) by mx.google.com with ESMTPS id fm1sm8574914wib.10.2012.06.12.17.28.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 17:28:52 -0700 (PDT) In-Reply-To: <1c1914fbe9e641219e6fff6d7fe92428-mfwitten@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Mailman-Approved-At: Tue, 12 Jun 2012 20:37:33 -0400 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 (newer, 2) 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:60913 Archived-At: Date: Tue, 12 Jun 2012 03:47:39 +0000 Under TeX and Texinfo, `---' is actually what is meant to be an em dash, so that would be a better choice than `--', and is thus used to replace `--' a few times. However, other occurrences of `--' have been replaced entirely with other punctuation (such as `:' or `;' or `,') or verbiage in order to make the intention clearer. --- etc/tutorials/TUTORIAL | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index a754b47..ba89417 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -204,7 +204,7 @@ For instance, C-u 8 C-f moves forward eight characters. Most commands use the numeric argument as a repeat count, but some commands use it in some other way. Several commands (but none of -those you have learned so far) use it as a flag--the presence of a +those you have learned so far) use it as a flag---the presence of a prefix argument, regardless of its value, makes the command do something different. @@ -311,7 +311,7 @@ the last character typed. There may also be another key on your keyboard labeled , but that's not the one we refer to as . ->> Do this now--type a few characters, then delete them by +>> Do this now; type a few characters, then delete them by typing a few times. Don't worry about this file being changed; you will not alter the master tutorial. This is your personal copy of it. @@ -344,7 +344,7 @@ Remember that most Emacs commands can be given a repeat count; this includes text characters. Repeating a text character inserts it several times. ->> Try that now -- type C-u 8 * to insert ********. +>> Try that now; type C-u 8 * to insert ********. You've now learned the most basic way of typing something in Emacs and correcting errors. You can delete by words or lines @@ -381,7 +381,7 @@ the text between the two positions. The difference between "killing" and "deleting" is that "killed" text can be reinserted (at any position), whereas "deleted" things cannot -be reinserted in this way (you can, however, undo a deletion--see below). +be reinserted in this way (you can, however, undo a deletion---see below). Reinsertion of killed text is called "yanking". Generally, the commands that can remove a lot of text kill the text (they are set up so that you can yank the text), while the commands that remove just one @@ -630,8 +630,8 @@ These are commands that are generally useful but are used less than the commands you have already learned about. You have already seen a few of them: the file commands C-x C-f to Find and C-x C-s to Save, for example. Another example is the command to end the Emacs -session--this is the command C-x C-c. (Do not worry about losing -changes you have made; C-x C-c offers to save each changed file before +session: C-x C-c. (Do not worry about losing changes you have +made; C-x C-c offers to save each changed file before it kills Emacs.) If you are using a graphical display, you don't need any special @@ -640,7 +640,7 @@ with the mouse or with window manager commands. However, if you're using a text terminal which can only show one application at a time, you need to "suspend" Emacs to move to any other application. -C-z is the command to exit Emacs *temporarily*--so that you can go +C-z is the command to exit Emacs *temporarily*, so that you can go back to the same Emacs session afterward. When Emacs is running on a text terminal, C-z "suspends" Emacs; that is, it returns to the shell but does not destroy the Emacs job. In the most common shells, you @@ -671,7 +671,7 @@ Emacs will complete the name. ( is the Tab key, usually found above the CapsLock or Shift key near the left edge of the keyboard.) Submit the command name with . -The replace-string command requires two arguments--the string to be +The replace-string command requires two arguments: the string to be replaced, and the string to replace it with. You must end each argument with . @@ -720,7 +720,7 @@ The mode line says something like this: This line gives useful information about the status of Emacs and the text you are editing. -You already know what the filename means--it is the file you have +You already know what the filename means: it is the file you have found. NN% indicates your current position in the buffer text; it means that NN percent of the buffer is above the top of the screen. If the top of the buffer is on the screen, it will say "Top" instead @@ -857,8 +857,8 @@ This erases the "u" from the search string, and the cursor moves back to the first occurrence of "c". If you are in the middle of a search and type a control or meta -character (with a few exceptions--characters that are special in a -search, such as C-s and C-r), the search is terminated. +character, the search is terminated---with a few exceptions; characters +such as C-s and C-r are special during a search. C-s starts a search that looks for any occurrence of the search string AFTER the current cursor position. If you want to search for @@ -872,7 +872,7 @@ the search is reversed. One of the nice features of Emacs is that you can display more than one window on the screen at the same time. (Note that Emacs uses the -term "frames"--described in the next section--for what some other +term "frames"---described in the next section---for what some other applications call "windows". The Emacs manual contains a Glossary of Emacs terms.) @@ -917,8 +917,8 @@ in its own right, not a modifier key. >> Type C-x 1 (in the top window) to get rid of the bottom window. (If you had typed C-x 1 in the bottom window, that would get rid -of the top one. Think of this command as "Keep just one -window--the window I am already in.") +of the top one. Think of this command as "Keep just one window, +namely the window I am already in.") You do not have to display the same buffer in both windows. If you use C-x C-f to find a file in one window, the other window does not @@ -1011,7 +1011,7 @@ The message should be something like this: This tells you the "name of the function". Since function names are chosen to indicate what the command does, they can serve as -very brief documentation--sufficient to remind you of commands you +very brief documentation sufficient to remind you of commands you have already learned. Multi-character commands such as C-x C-s and (if you have no META or @@ -1095,7 +1095,7 @@ The manual also describes many other Emacs features. To exit Emacs use C-x C-c. This tutorial is meant to be understandable to all new users, so if -you found something unclear, don't sit and blame yourself - complain! +you found something unclear, don't sit and blame yourself---complain! * COPYING -- 1.7.10.2.484.gcd07cc5