diff mbox series

[ovs-dev] ovn: Add the documentation for the DHCP opt 'wpad' in proper section

Message ID 20180918172943.16832-1-nusiddiq@redhat.com
State Accepted
Headers show
Series [ovs-dev] ovn: Add the documentation for the DHCP opt 'wpad' in proper section | expand

Commit Message

Numan Siddique Sept. 18, 2018, 5:29 p.m. UTC
From: Numan Siddique <nusiddiq@redhat.com>

The commit "6f01617442" added the documenation for the DHCPv4 option
252 in the wrong section. This patch fixes it.

Fixes: 6f01617442 ("ovn: Add DHCP support for option 252.")
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
---
 ovn/ovn-nb.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

Comments

Mark Michelson Sept. 20, 2018, 9:11 p.m. UTC | #1
Thanks for the assist, Numan!

Acked-by: Mark Michelson <mmichels@redhat.com>

On 09/18/2018 01:29 PM, nusiddiq@redhat.com wrote:
> From: Numan Siddique <nusiddiq@redhat.com>
> 
> The commit "6f01617442" added the documenation for the DHCPv4 option
> 252 in the wrong section. This patch fixes it.
> 
> Fixes: 6f01617442 ("ovn: Add DHCP support for option 252.")
> Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
> ---
>   ovn/ovn-nb.xml | 21 ++++++++++++++-------
>   1 file changed, 14 insertions(+), 7 deletions(-)
> 
> diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> index 441a2deae..8564ed39c 100644
> --- a/ovn/ovn-nb.xml
> +++ b/ovn/ovn-nb.xml
> @@ -1992,13 +1992,6 @@
>             </p>
>           </column>
>   
> -        <column name="options" key="wpad">
> -          <p>
> -            The DHCPv4 option code for this option is 252. This option is used
> -            as part of web proxy auto discovery to provide a URL for a web
> -            proxy.
> -          </p>
> -        </column>
>         </group>
>   
>         <group title="Boolean DHCP Options">
> @@ -2063,6 +2056,20 @@
>             for this option is 59.
>           </column>
>         </group>
> +
> +      <group title="String DHCP Options">
> +        <p>
> +          These options accept a string value.
> +        </p>
> +
> +        <column name="options" key="wpad">
> +          <p>
> +            The DHCPv4 option code for this option is 252. This option is used
> +            as part of web proxy auto discovery to provide a URL for a web
> +            proxy.
> +          </p>
> +        </column>
> +      </group>
>       </group>
>   
>       <group title="DHCPv6 options">
>
Ben Pfaff Sept. 20, 2018, 9:18 p.m. UTC | #2
Thanks, Numan and Mark.  I applied this to master and branch-2.10.

On Thu, Sep 20, 2018 at 05:11:36PM -0400, Mark Michelson wrote:
> Thanks for the assist, Numan!
> 
> Acked-by: Mark Michelson <mmichels@redhat.com>
> 
> On 09/18/2018 01:29 PM, nusiddiq@redhat.com wrote:
> >From: Numan Siddique <nusiddiq@redhat.com>
> >
> >The commit "6f01617442" added the documenation for the DHCPv4 option
> >252 in the wrong section. This patch fixes it.
> >
> >Fixes: 6f01617442 ("ovn: Add DHCP support for option 252.")
> >Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
> >---
> >  ovn/ovn-nb.xml | 21 ++++++++++++++-------
> >  1 file changed, 14 insertions(+), 7 deletions(-)
> >
> >diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
> >index 441a2deae..8564ed39c 100644
> >--- a/ovn/ovn-nb.xml
> >+++ b/ovn/ovn-nb.xml
> >@@ -1992,13 +1992,6 @@
> >            </p>
> >          </column>
> >-        <column name="options" key="wpad">
> >-          <p>
> >-            The DHCPv4 option code for this option is 252. This option is used
> >-            as part of web proxy auto discovery to provide a URL for a web
> >-            proxy.
> >-          </p>
> >-        </column>
> >        </group>
> >        <group title="Boolean DHCP Options">
> >@@ -2063,6 +2056,20 @@
> >            for this option is 59.
> >          </column>
> >        </group>
> >+
> >+      <group title="String DHCP Options">
> >+        <p>
> >+          These options accept a string value.
> >+        </p>
> >+
> >+        <column name="options" key="wpad">
> >+          <p>
> >+            The DHCPv4 option code for this option is 252. This option is used
> >+            as part of web proxy auto discovery to provide a URL for a web
> >+            proxy.
> >+          </p>
> >+        </column>
> >+      </group>
> >      </group>
> >      <group title="DHCPv6 options">
> >
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff mbox series

Patch

diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
index 441a2deae..8564ed39c 100644
--- a/ovn/ovn-nb.xml
+++ b/ovn/ovn-nb.xml
@@ -1992,13 +1992,6 @@ 
           </p>
         </column>
 
-        <column name="options" key="wpad">
-          <p>
-            The DHCPv4 option code for this option is 252. This option is used
-            as part of web proxy auto discovery to provide a URL for a web
-            proxy.
-          </p>
-        </column>
       </group>
 
       <group title="Boolean DHCP Options">
@@ -2063,6 +2056,20 @@ 
           for this option is 59.
         </column>
       </group>
+
+      <group title="String DHCP Options">
+        <p>
+          These options accept a string value.
+        </p>
+
+        <column name="options" key="wpad">
+          <p>
+            The DHCPv4 option code for this option is 252. This option is used
+            as part of web proxy auto discovery to provide a URL for a web
+            proxy.
+          </p>
+        </column>
+      </group>
     </group>
 
     <group title="DHCPv6 options">