commit f50bd4be884feeae2c3d91b88da01dd678e17641
parent b43648aae293466a61f6c0670fc0a0351e09a43b
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date: Fri, 14 Apr 2006 20:15:44 +0000
clarify some help text and documentation
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3379 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -35,6 +35,10 @@ CVS code -
command. New function parse_include(); changes to
parse_rcfile(), do_nanorc(), nanorc.5, and nanorc.sample.
(Victor Ananievsky, Brand Huntsman and DLR)
+ - Change references to the "help menu" to the "help text
+ display" refer to display, for clarity. Changes to
+ shortcut_init(), configure.ac, and faq.html. (DLR, suggested
+ by Benno Schulenberg)
- files.c:
open_file()
- Remove redundant wording in the error message when we try to
@@ -53,6 +57,10 @@ CVS code -
prepending fails. (DLR)
- Simplify the routine for closing the file just before we
indicate success on the statusbar. (DLR)
+ global.c:
+ shortcut_init()
+ - Change the cursor position display help text to use "display"
+ instead of "show", for consistency. (DLR)
- rcfile.c:
parse_argument()
- Rename variable ptr_bak to ptr_save, for consistency. (DLR)
diff --git a/configure.ac b/configure.ac
@@ -89,7 +89,7 @@ AC_ARG_ENABLE(tiny,
[if test x$enableval = xyes; then
AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
- AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help menu.])
+ AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routine.])
AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse functions.])
AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable setting of the operating directory (chroot of sorts).])
@@ -107,7 +107,7 @@ fi])
AC_ARG_ENABLE(help,
[ --disable-help Disable help function],
[if test x$enableval != xyes; then
- AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help menu.])
+ AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
fi])
AC_ARG_ENABLE(justify,
diff --git a/doc/faq.html b/doc/faq.html
@@ -77,7 +77,7 @@
<p>The <a href="http://www.debian.org/">Debian GNU/Linux</a> distribution, known for its strict standards in distributing truly "free" software (i.e. software with no restrictions on redistribution), would not include a binary package for Pine or Pico. Many people had a serious dilemma: they loved these programs, but they were not truly free software in the <a href="http://www.gnu.org/philosophy/free-sw.html">GNU</a> sense of the word.</p>
<p><b>The event...</b></p>
<p>It was in late 1999 when Chris Allegretta (our hero) was yet again complaining to himself about the less-than-perfect license Pico was distributed under, the 1000 makefiles that came with it and how just a few small improvements could make it the Best Editor in the World (TM). Having been a convert from Slackware to Debian, he missed having a simple binary package that included Pine and Pico, and had grown tired of downloading them himself.</p>
- <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help menu, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
+ <p>Finally something snapped inside and Chris coded and hacked like a madman for many hours straight one weekend to make a (barely usable) Pico clone, at the time called TIP (Tip Isn't Pico). The program could not be invoked without a filename, could not save files, had no help text display, spell checker, and so forth. But over time it improved, and with the help of a few great coders it matured to the (hopefully) stable state it is today.</p>
<p>In February 2001, nano was declared an official GNU program by Richard Stallman. Nano also reached its first production release on March 22, 2001.</p></blockquote>
<h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
<blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
@@ -250,7 +250,8 @@
<blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
<h2><a name="8"></a>8. ChangeLog</h2>
<blockquote>
-<p>2006/03/16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
+<p>2006/04/14 - Clarify section 1.4: help menu -> help text display. (DLR, suggested by Benno Schulenberg)<br>
+2006/03/16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
2005/11/21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
2005/11/19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
2005/08/27 - Update email address. (DLR)<br>
diff --git a/src/global.c b/src/global.c
@@ -305,7 +305,7 @@ void shortcut_init(bool unjustify)
#endif
#ifndef DISABLE_HELP
const char *nano_cancel_msg = N_("Cancel the current function");
- const char *nano_help_msg = N_("Invoke the help menu");
+ const char *nano_help_msg = N_("Display the help text");
const char *nano_exit_msg =
#ifdef ENABLE_MULTIBUFFER
N_("Close the current file buffer/Exit from nano")
@@ -327,7 +327,7 @@ void shortcut_init(bool unjustify)
const char *nano_uncut_msg =
N_("Uncut from the cutbuffer into the current line");
const char *nano_cursorpos_msg =
- N_("Show the position of the cursor");
+ N_("Display the position of the cursor");
const char *nano_spell_msg =
N_("Invoke the spell checker, if available");
const char *nano_gotoline_msg = N_("Go to line and column number");
