Merge pull request #1799 from jengelh/doc

doc: typo and ortho fixes

1 files changed, 12 insertions, 12 deletions

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 46a47b2d95..410886f841 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -194,7 +194,7 @@
         refers to TCP sockets, <constant>SOCK_DGRAM</constant> (i.e.
         <varname>ListenDatagram=</varname>) to UDP.</para>
 
-        <para>These options may be specified more than once in which
+        <para>These options may be specified more than once, in which
         case incoming traffic on any of the sockets will trigger
         service activation, and all listed sockets will be passed to
         the service, regardless of whether there is incoming traffic
@@ -268,7 +268,7 @@
         implementation of USB gadget functions. This expects an
         absolute file system path as the argument. Behavior otherwise
         is very similar to the <varname>ListenFIFO=</varname>
-        directive above. Use this to open FunctionFS endpoint
+        directive above. Use this to open the FunctionFS endpoint
         <filename>ep0</filename>. When using this option, the
         activated service has to have the
         <varname>USBFunctionDescriptors=</varname> and
@@ -375,10 +375,10 @@
         to work unmodified with systemd socket
         activation.</para>
 
-        <para>For IPv4 and IPv6 connections the <varname>REMOTE_ADDR</varname>
-        environment variable will contain the remote IP, and <varname>REMOTE_PORT</varname>
+        <para>For IPv4 and IPv6 connections, the <varname>REMOTE_ADDR</varname>
+        environment variable will contain the remote IP address, and <varname>REMOTE_PORT</varname>
         will contain the remote port. This is the same as the format used by CGI.
-        For SOCK_RAW the port is the IP protocol.</para></listitem>
+        For SOCK_RAW, the port is the IP protocol.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -386,7 +386,7 @@
         <listitem><para>Takes a boolean argument. May only be used in
         conjunction with <varname>ListenSpecial=</varname>. If true,
         the specified special file is opened in read-write mode, if
-        false in read-only mode. Defaults to false.</para></listitem>
+        false, in read-only mode. Defaults to false.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -418,7 +418,7 @@
 
       <varlistentry>
         <term><varname>KeepAliveTimeSec=</varname></term>
-        <listitem><para>Takes time (in seconds) as argument . The connection needs to remain
+        <listitem><para>Takes time (in seconds) as argument. The connection needs to remain
         idle before TCP starts sending keepalive probes. This controls the TCP_KEEPIDLE
         socket option (see
         <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@@ -432,7 +432,7 @@
         <term><varname>KeepAliveIntervalSec=</varname></term>
         <listitem><para>Takes time (in seconds) as argument between
         individual keepalive probes, if the socket option SO_KEEPALIVE
-        has been set on this socket seconds as argument. This controls
+        has been set on this socket. This controls
         the TCP_KEEPINTVL socket option (see
         <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>
         and the <ulink
@@ -443,7 +443,7 @@
 
       <varlistentry>
         <term><varname>KeepAliveProbes=</varname></term>
-        <listitem><para>Takes integer as argument. It's the number of
+        <listitem><para>Takes an integer as argument. It is the number of
         unacknowledged probes to send before considering the
         connection dead and notifying the application layer. This
         controls the TCP_KEEPCNT socket option (see
@@ -752,14 +752,14 @@
         <term><varname>FileDescriptorName=</varname></term>
         <listitem><para>Assigns a name to all file descriptors this
         socket unit encapsulates. This is useful to help activated
-        services to identify specific file descriptors, if multiple
+        services identify specific file descriptors, if multiple fds
         are passed. Services may use the
         <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>
         call to acquire the names configured for the received file
         descriptors. Names may contain any ASCII character, but must
-        exclude control characters or <literal>:</literal>, and must
+        exclude control characters and <literal>:</literal>, and must
         be at most 255 characters in length. If this setting is not
-        used the file descriptor name defaults to the name of the
+        used, the file descriptor name defaults to the name of the
         socket unit, including its <filename>.socket</filename>
         suffix.</para></listitem>
       </varlistentry>