From patchwork Tue Dec 25 23:11:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 208132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CB6172C0092 for ; Wed, 26 Dec 2012 10:11:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752321Ab2LYXLn (ORCPT ); Tue, 25 Dec 2012 18:11:43 -0500 Received: from ares07.inai.de ([5.9.24.206]:38912 "EHLO ares07.inai.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752510Ab2LYXLf (ORCPT ); Tue, 25 Dec 2012 18:11:35 -0500 Received: by ares07.inai.de (Postfix, from userid 25121) id 5544296A0FAA; Wed, 26 Dec 2012 00:11:32 +0100 (CET) From: Jan Engelhardt To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH 12/13] doc: document the -4 and -6 options Date: Wed, 26 Dec 2012 00:11:28 +0100 Message-Id: <1356477089-13241-13-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356477089-13241-1-git-send-email-jengelh@inai.de> References: <1356477089-13241-1-git-send-email-jengelh@inai.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jan Engelhardt --- iptables/ip6tables.8.in | 9 +++++++++ iptables/iptables.8.in | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index dfeebe6..c274e91 100644 --- a/iptables/ip6tables.8.in +++ b/iptables/ip6tables.8.in @@ -240,6 +240,15 @@ Give a (currently very brief) description of the command syntax. The following parameters make up a rule specification (as used in the add, delete, insert, replace and append commands). .TP +\fB\-4\fP, \fB\-\-ipv4\fP +If a rule using the \fB\-4\fP option is inserted with (and only with) +ip6tables-restore, it will be silently ignored. Any other uses will throw an +error. This option allows to put both IPv4 and IPv6 rules in a single rule file +for use with both iptables-restore and ip6tables-restore. +.TP +\fB\-6\fP, \fB\-\-ipv6\fP +This option has no effect in ip6tables and ip6tables-restore. +.TP [\fB!\fP] \fB\-p\fP, \fB\-\-protocol\fP \fIprotocol\fP The protocol of the rule or of the packet to check. The specified protocol can be one of \fBtcp\fP, \fBudp\fP, \fBudplite\fP, diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in index 9276cf9..22a8478 100644 --- a/iptables/iptables.8.in +++ b/iptables/iptables.8.in @@ -243,6 +243,15 @@ Give a (currently very brief) description of the command syntax. The following parameters make up a rule specification (as used in the add, delete, insert, replace and append commands). .TP +\fB\-4\fP, \fB\-\-ipv4\fP +This option has no effect in iptables and iptables-restore. +.TP +\fB\-6\fP, \fB\-\-ipv6\fP +If a rule using the \fB\-6\fP option is inserted with (and only with) +iptables-restore, it will be silently ignored. Any other uses will throw an +error. This option allows to put both IPv4 and IPv6 rules in a single rule file +for use with both iptables-restore and ip6tables-restore. +.TP [\fB!\fP] \fB\-p\fP, \fB\-\-protocol\fP \fIprotocol\fP The protocol of the rule or of the packet to check. The specified protocol can be one of \fBtcp\fP, \fBudp\fP, \fBudplite\fP,