diff options
author | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:34:04 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:38:58 +0200 |
commit | 4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch) | |
tree | 30ee606da82b0cbcb11ebb303196afb29f4e65e7 /iptables/iptables-apply.8 | |
parent | ec40b897289745da3d67de2cb14be30353003922 (diff) | |
parent | 7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff) |
Merge branch 'master' of git://git.inai.de/iptables
Conflicts:
extensions/GNUmakefile.in
Resolution: trivial, since this was a fuzz 3.
Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.
Diffstat (limited to 'iptables/iptables-apply.8')
-rw-r--r-- | iptables/iptables-apply.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/iptables-apply.8 b/iptables/iptables-apply.8 index 8208fd0f..66eaf57a 100644 --- a/iptables/iptables-apply.8 +++ b/iptables/iptables-apply.8 @@ -18,7 +18,7 @@ connection, the user will not be able to answer affirmatively. In this case, the script rolls back to the previous ruleset after the timeout expired. The timeout can be set with \fB\-t\fP. .PP -When called as ip6tables\-apply, the script will use +When called as \fBip6tables\-apply\fP, the script will use ip6tables\-save/\-restore instead. .SH OPTIONS .TP |