From ae40faf4e5295809425b75551d72f70f11e7ba73 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Sun, 27 Jul 2008 22:00:58 +0000
Subject: [PATCH] cosmetics (comment fixes & improvements, variable name)

---
 Nasal/IOrules     | 8 +++-----
 Nasal/globals.nas | 4 ++--
 Nasal/string.nas  | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Nasal/IOrules b/Nasal/IOrules
index f7a2a82a0..272ce1523 100644
--- a/Nasal/IOrules
+++ b/Nasal/IOrules
@@ -1,9 +1,7 @@
-# Permissions for Nasal's io.open() and parsexml(), and fgcommands
-# load[xml], save[xml]
-#
 # This file defines which file paths can be opened for reading and/or
-# writing using Nasal's io.open() command. The respective code can be
-# found in $FG_ROOT/Nasal/io.nas.
+# writing using Nasal's io.open() and parsexml() functions, as well as
+# the fgcommands load, save, loadxml, and savexml. The evaluation code
+# can be found in $FG_ROOT/Nasal/io.nas.
 #
 # Empty lines and lines starting with '#' are ignored. All other entries
 # must be of the form
diff --git a/Nasal/globals.nas b/Nasal/globals.nas
index fcaa8bc3a..c7f79fa10 100644
--- a/Nasal/globals.nas
+++ b/Nasal/globals.nas
@@ -70,10 +70,10 @@ var interpolate = func(node, val...) {
 # "always trigger on write" (1), and "trigger even when children are
 # written to" (2).
 #
-var setlistener = func(node, fun, init = 0, runtime = 1) {
+var setlistener = func(node, fn, init = 0, runtime = 1) {
     if(isa(node, props.Node)) node = node._g;
     var id = _setlistener(node, func(chg, lst, mode, is_child) {
-        fun(props.wrapNode(chg), props.wrapNode(lst), mode, is_child);
+        fn(props.wrapNode(chg), props.wrapNode(lst), mode, is_child);
     }, init, runtime);
     if(__.log_level <= 2) {
         var c = caller(1);
diff --git a/Nasal/string.nas b/Nasal/string.nas
index 03424b2cb..03e2452e5 100644
--- a/Nasal/string.nas
+++ b/Nasal/string.nas
@@ -186,7 +186,7 @@ match = func(str, patt) {
 # Removes superfluous slashes, empty and "." elements, expands
 # all ".." elements, and turns all backslashes into slashes.
 # The result will start with a slash if it started with a slash
-# or backslash, it will end without slash. Should be applied on
+# or backslash, it will end without slash. Should be applied to
 # absolute property or file paths, otherwise ".." elements might
 # be resolved wrongly.
 #