X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=e67aeecb1a46e9bbb3f3a34c0fa93f519cf75cf5;hp=d7d60e52c24b6d685348fb7655a8725a7a93b6dc;hb=0dfaa0060711a8332c8eb9f1e10f48fe182d3650;hpb=b9ba4dabbab8a58a044ec42655e11e65bd3ecc47

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d7d60e52c..e67aeecb1 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -407,6 +407,7 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><option>-n</option></term>
                                 <term><option>--network-veth</option></term>
 
                                 <listitem><para>Create a virtual
@@ -442,6 +443,32 @@
                                 of <literal>ve-</literal>.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>-p</option></term>
+                                <term><option>--port=</option></term>
+
+                                <listitem><para>If private networking
+                                is enabled, maps an IP port on the
+                                host onto an IP port on the
+                                container. Takes a protocol specifier
+                                (either <literal>tcp</literal> or
+                                <literal>udp</literal>), separated by
+                                a colon from a host port number in the
+                                range 1 to 65535, separated by a colon
+                                from a container port number in the
+                                range from 1 to 65535. The protocol
+                                specifier and its separating colon may
+                                be omitted, in which case
+                                <literal>tcp</literal> is assumed.
+                                The container port number and its
+                                colon may be ommitted, in which case
+                                the same port as the host port is
+                                implied. This option is only supported
+                                if private networking is used, such as
+                                <option>--network-veth</option> or
+                                <option>--network-bridge=</option>.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-Z</option></term>
                                 <term><option>--selinux-context=</option></term>
@@ -535,7 +562,7 @@
                                 at the same location. <literal>try-host</literal>
                                 and <literal>try-guest</literal> do the same
                                 but do not fail if the host does not have
-                                persistant journalling enabled.
+                                persistent journalling enabled.
                                 If <literal>auto</literal> (the default),
                                 and the right subdirectory of
                                 <filename>/var/log/journal</filename>
@@ -780,7 +807,7 @@
                 <example>
                         <title>Boot a minimal Fedora distribution in a container</title>
 
-                        <programlisting># yum -y --releasever=19 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
+                        <programlisting># yum -y --releasever=21 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
 # systemd-nspawn -bD /srv/mycontainer</programlisting>
 
                         <para>This installs a minimal Fedora distribution into