diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 300a5fd81..c50ba6a4a 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -290,6 +290,30 @@ ACCEPT  net     $FW      tcp     www     #This is an end-of-line comment</progra
     </example>
   </section>
 
+  <section id="Names">
+    <title>Names</title>
+
+    <para>When you define an object in Shorewall (<ulink
+    url="manpages/shorewall-zones.html">Zone</ulink>, <link
+    linkend="Logical">Logical Interface</link>, <ulink
+    url="ipsets.html">ipsets</ulink>, <ulink
+    url="Actions.html">Actions</ulink>, etc., you give it a name. Shorewall
+    names start with a letter and consist of letters, digits or underscores
+    ("_"). Except for Zone names, Shorewall does not impose a limit on name
+    length.</para>
+
+    <para>When an ipset is referenced, the name must be preceded by a plus
+    sign ("+").</para>
+
+    <para>The last character of an interface may also be a plus sign to
+    indicate a wildcard name.</para>
+
+    <para>Physical interface names match names shown by 'ip link ls'; if the
+    name includes an at sign ("@"), do not include that character or any
+    character that follows. For example, "sit1@NONE" is referred to as simply
+    'sit1".</para>
+  </section>
+
   <section id="COMMENT">
     <title>Attach Comment to Netfilter Rules</title>
 
diff --git a/docs/support.xml b/docs/support.xml
index 56f0e8ddb..d19603304 100644
--- a/docs/support.xml
+++ b/docs/support.xml
@@ -428,9 +428,7 @@ State:Stopped (Thu Mar 30 14:08:11 PDT 2006)</programlisting>
     below).</para>
 
     <para>For <emphasis role="bold">quick questions</emphasis>, there is also
-    a #shorewall channel at irc.freenode.net. <emphasis role="bold">You must
-    have a registered Nic on freenode in order to post on the
-    channel.</emphasis></para>
+    a #shorewall channel at irc.freenode.net. </para>
   </section>
 
   <section id="Users">
diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml
index ab4478509..19cae2552 100644
--- a/manpages/shorewall-rules.xml
+++ b/manpages/shorewall-rules.xml
@@ -1317,7 +1317,7 @@
           <para>Add the tupple (source IP, dest port, dest IP) of an incoming
           SSH connection to the ipset S:</para>
 
-          <programlisting>        ADD(S:dst,src,dst)           net              fw             tcp         22</programlisting>
+          <programlisting>        ADD(+S:dst,src,dst)           net              fw             tcp         22</programlisting>
         </listitem>
       </varlistentry>
     </variablelist>
diff --git a/manpages/shorewall-zones.xml b/manpages/shorewall-zones.xml
index 56fc78690..6d6b84260 100644
--- a/manpages/shorewall-zones.xml
+++ b/manpages/shorewall-zones.xml
@@ -38,10 +38,11 @@
         role="bold">,</emphasis><emphasis>parent-zone</emphasis>]...]</term>
 
         <listitem>
-          <para>Name of the <emphasis>zone</emphasis>. The names "all",
-          "none", "SOURCE" and "DEST" are reserved and may not be used as zone
-          names. The maximum length of a zone name is determined by the
-          setting of the LOGFORMAT option in <ulink
+          <para>Name of the <emphasis>zone</emphasis>. Must start with a
+          letter and consist of letters, digits or '_'. The names "all",
+          "none", "any", "SOURCE" and "DEST" are reserved and may not be used
+          as zone names. The maximum length of a zone name is determined by
+          the setting of the LOGFORMAT option in <ulink
           url="shorewall.conf.html">shorewall.conf</ulink>(5). With the
           default LOGFORMAT, zone names can be at most 5 characters
           long.</para>
@@ -68,7 +69,8 @@
               <listitem>
                 <para>The canonical name for the chain containing the rules
                 for traffic going from zone 1 to zone 2 is "&lt;zone
-                1&gt;2&lt;zone 2&gt;".</para>
+                1&gt;2&lt;zone 2&gt;" or "&lt;zone 1&gt;-&lt;zone
+                2&gt;".</para>
               </listitem>
 
               <listitem>