From owner-freebsd-doc  Sun Oct 20 12:30: 6 2002
Delivered-To: freebsd-doc@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1D4EB37B401
	for <freebsd-doc@hub.freebsd.org>; Sun, 20 Oct 2002 12:30:04 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FABE43E6E
	for <freebsd-doc@hub.freebsd.org>; Sun, 20 Oct 2002 12:30:03 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g9KJU1x3093368
	for <freebsd-doc@freefall.freebsd.org>; Sun, 20 Oct 2002 12:30:01 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g9KJU1ux093367;
	Sun, 20 Oct 2002 12:30:01 -0700 (PDT)
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E417D37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 20 Oct 2002 12:21:13 -0700 (PDT)
Received: from www.reppep.com (www.reppep.com [66.92.104.200])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7682D43E6E
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 20 Oct 2002 12:21:13 -0700 (PDT)
	(envelope-from pepper@reppep.com)
Received: by www.reppep.com (Postfix, from userid 501)
	id C2425AA8B; Sun, 20 Oct 2002 15:23:00 -0400 (EDT)
Message-Id: <20021020192300.C2425AA8B@www.reppep.com>
Date: Sun, 20 Oct 2002 15:23:00 -0400 (EDT)
From: Chris Pepper <pepper@rockefeller.edu>
Reply-To: Chris Pepper <pepper@rockefeller.edu>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Alexandre Peixoto <alexandref@tcoip.com.br>
X-Send-Pr-Version: 3.113
Subject: docs/44312: Typos in /usr/src/share/examples/ipfw/change_rules.sh
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org


>Number:         44312
>Category:       docs
>Synopsis:       Typos in /usr/src/share/examples/ipfw/change_rules.sh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 20 12:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Chris Pepper
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD www.reppep.com 4.7-STABLE FreeBSD 4.7-STABLE #4: Sun Oct 20 01:54:39 EDT 2002 root@www.reppep.com:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Comments in /usr/src/share/examples/ipfw/change_rules.sh have various typos.
	
>How-To-Repeat:
	more /usr/src/share/examples/ipfw/change_rules.sh
	
>Fix:
	Apply this patch.

--- change_rules.sh.patch begins here ---
--- /usr/src/share/examples/ipfw/change_rules.sh	Tue Oct  9 09:20:25 2001
+++ change_rules.sh.fixed	Sun Oct 20 15:20:45 2002
@@ -30,7 +30,7 @@
 #
 # Invoke this script to edit ${firewall_script}. It will call ${EDITOR},
 # or vi(1) if the environment variable is not set, for you to edit
-# ${firewall_script}, asks for confirmation and then run
+# ${firewall_script}, ask for confirmation, and then run
 # ${firewall_script}. You can then examine the output of ipfw list and
 # confirm whether you want the new version or not.
 #
@@ -39,14 +39,14 @@
 # flush is present in it).
 #
 # If the new rules are confirmed, they'll replace ${firewall_script} and
-# the previous ones will be copied to ${firewall_script}.{date}. A mail
-# will also be sent to root with the unified diffs of the rule change.
+# the previous ones will be copied to ${firewall_script}.{date}. Mail
+# will also be sent to root with a unified diff of the rule change.
 #
-# Non-approved rules are kept in ${firewall_script}.new, and you are
+# Unapproved rules are kept in ${firewall_script}.new, and you are
 # offered the option of changing them instead of the present rules when
 # you call this script.
 #
-# It is suggested improving this script by using some version control
+# This script could be improved by using version control
 # software.
 
 if [ -r /etc/defaults/rc.conf ]; then
@@ -121,8 +121,8 @@
 
 cat <<!
 The rules will be changed now. If the message 'Type y to keep the new
-rules' do not appear on the screen or the y key is not pressed in 30
-seconds, the former rules will be restored.
+rules' does not appear on the screen or the y key is not pressed in 30
+seconds, the current rules will be restored.
 The TCP/IP connections might be broken during the change. If so, restore
 the ssh/telnet connection being used.
 !
@@ -144,7 +144,7 @@
 cp ${edit_file} ${edit_file}.$DATE
 mv ${edit_file}.new ${edit_file} 
 cat <<!
-The new rules are now default. The previous rules have been preserved in
+The new rules are now installed. The previous rules have been preserved in
 the file ${edit_file}.$DATE
 !
 diff -F "^# .*[A-Za-z]" -u ${edit_file}.$DATE ${edit_file} \
--- change_rules.sh.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
 	

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message