From 313f26f7186d6094ffb33fbeccf3379b460b1f17 Mon Sep 17 00:00:00 2001
From: Alois Mahdal <netvor@vornet.cz>
Date: Oct 07 2020 17:49:45 +0000
Subject: Fix and improve texts in ypbind(8) #1886133


Fix typos & basic grammar and try to re-phrase some sentences in
sections added to ypbind(8).

List of changes:

 *  Fixed typos.

 *  Fixed grammar errors.

 *  Fixed '45s' spelling.

 *  Simplified part about wait timeout.

 *  Re-phrased the intro to avoid mentioning "In Fedora"; this really
    is about systemd (which is also used on rhel7/8 and more Fedora
    derivatives.)

 *  Simplified part about DHCP and PEERNIS.

---

diff --git a/ypbind-2.5-helpman.patch b/ypbind-2.5-helpman.patch
index 1d5c663..c6cb3fd 100644
--- a/ypbind-2.5-helpman.patch
+++ b/ypbind-2.5-helpman.patch
@@ -59,24 +59,23 @@ diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
  exit.</para>
  
 +<para>
-+In Fedora we use systemd for starting services. We need to finish starting
-+process of <command>ypbind</command> service not before service is fully
++When systemd is used for starting services, we need to finish starting
++process of <command>ypbind</command> service not before service is considered fully
 +started, which means <command>ypbind</command> daemon is prepared to answer.
-+There is a test script <filename>/usr/libexec/ypbind-post-waitbind</filename>
-+used in ypbind.service, that waits for <command>ypbind</command> daemon to be
-+fully connected to NIS server and waits by default up to 45s.  Sometimes this
-+is not enough, because network set up can take longer than 45s during boot, so
-+starting ypbind.service fails. User can increase the timeout by setting an
++In ypbind.service, there is a test script <filename>/usr/libexec/ypbind-post-waitbind</filename>
++that will wait for <command>ypbind</command> daemon to be fully connected
++to NIS server.  The default time to wait is 45 seconds, so in case network set up
++takes longer, starting of ypbind.service fails.  User can increase the timeout by setting an
 +environment variable NISTIMEOUT in <filename>/etc/sysconfig/ypbind</filename>.
 +For example NISTIMEOUT=180 means <command>ypbind</command> will wait up to 180
 +seconds for binding to a NIS server.  Another option is to enable
-+NetworkManager-wait- online.service, which will make <command>ypbind</command>
++NetworkManager-wait-online.service, which will make <command>ypbind</command>
 +to wait until network is properly set up.
 +</para>
 +
 +<para>
-+In case something needs to be changed in the ypbind.service, it is adviced not
-+to change the ypbind.service directly, but rather to create a new file under
++In case something needs to be changed in the ypbind.service, it is advised not
++to change the ypbind.service directly, but rather create a new file under
 +<filename>/etc/systemd/system/ypbind.service.d/</filename>, i.e. if we need to
 +start <command>ypbind</command> before service foo.service, we can create file
 +<filename>/etc/systemd/system/ypbind.service.d/wait-foo.conf</filename> with
@@ -90,7 +89,7 @@ diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
 +</programlisting>
 +</para>
 +<para>
-+If you need to pass other arguments to <command>ypbind</command> daemon withing
++If you need to pass other arguments to <command>ypbind</command> daemon within
 +systemd unit file, you can set these arguments as OTHER_YPBIND_OPTS environment
 +variable in <filename>/etc/sysconfig/ypbind</filename>. For example in order to
 +set a fixed port <command>ypbind</command> should run on, you can specify
@@ -98,13 +97,13 @@ diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
 +</para>
 +
 +<para>
-+DHCP client by defualt changes <filename>/etc/yp.conf</filename> in case DHCP
-+server sends NIS configuration in the respond. In that case
-+<filename>/etc/dhcp/dhclient.d/nis.sh</filename> changes
-+<filename>/etc/yp.conf</filename> according such configuration and creates a
-+back-up copy of the original configuration file into
-+<filename>/var/lib/dhclient/nis.conf.predhclient.$interface</filename>.  In
-+order to disable changing <filename>/etc/yp.conf</filename> by DHCP client, add
++DHCP client by default can change <filename>/etc/yp.conf</filename>.  In case DHCP
++server sends NIS configuration in the response,
++<filename>/etc/dhcp/dhclient.d/nis.sh</filename> will update
++<filename>/etc/yp.conf</filename> with configuration from the DHCP response and create a
++back-up copy of the original configuration file named
++<filename>/var/lib/dhclient/nis.conf.predhclient.$interface</filename>.
++To disable changing <filename>/etc/yp.conf</filename> by DHCP client, add
 +PEERNIS=no into <filename>/etc/sysconfig/network</filename>.
 +</para>
 +
@@ -120,7 +119,7 @@ diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml
 +  <listitem>
 +<para>Lets
 +<command>ypbind</command>
-+listen on a specified port number, rather than asking portmapper to assingn a
++listen on a specified port number, rather than asking portmapper to assign a
 +port for it.</para>
 +  </listitem>
 +  </varlistentry>