From 059e522ded947ecbc2c0db24378ec872b0c98d6b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 2 May 2011 16:37:59 -0700 Subject: [PATCH] Back out 0x documentation part of change --- Shorewall/releasenotes.txt | 3 +-- manpages/shorewall-tcclasses.xml | 6 ++---- manpages6/shorewall6-tcclasses.xml | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 8127d597a..f051fa33d 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -40,8 +40,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES ERROR: Unknown INTERFACE (A) : /etc/shorewall/tcclasses - This has been corrected by requiring that class numbers - containing a-f or A-F must be prefaced by '0x'. + This has been corrected. b) Shorewall reserves class number 1 for the root class of the queuing discipline. Definining class 1 in diff --git a/manpages/shorewall-tcclasses.xml b/manpages/shorewall-tcclasses.xml index b021e4ade..a6c1bc24c 100644 --- a/manpages/shorewall-tcclasses.xml +++ b/manpages/shorewall-tcclasses.xml @@ -126,10 +126,8 @@ url="http://www.shorewall.net/FAQ.htm#faq18">http://www.shorewall.net/FAQ.htm#faq18 You may specify the interface number rather than the interface - name; if the class number is not numeric (e.g, contains a-f or A-f), - then it must be preceded by '0x' (e.g., 0xA). If the classify option is given for the interface in - classify option is + given for the interface in shorewall-tcdevices(5), then you must also specify an interface class (an integer that must be unique within classes associated with this interface). If the diff --git a/manpages6/shorewall6-tcclasses.xml b/manpages6/shorewall6-tcclasses.xml index 7e4f9a902..c7ead115c 100644 --- a/manpages6/shorewall6-tcclasses.xml +++ b/manpages6/shorewall6-tcclasses.xml @@ -126,10 +126,8 @@ url="http://www.shorewall.net/FAQ.htm#faq18">http://www.shorewall.net/FAQ.htm#faq18 You may specify either the interface number or the interface - name; if the class number is not numeric (e.g, contains a-f or A-f), - then it must be preceded by '0x' (e.g., 0xA). If the classify option is given for the interface in - classify option is + given for the interface in shorewall6-tcdevices(5), then you must also specify an interface class (an integer that must be unique within classes associated with this interface).