Merge branch 'master' of github.com:netoptimizer/prototype-kernel

netoptimizer · Feb 15, 2017 · d5aa025 · d5aa025
2 parents 337fca8 + da75cf4
commit d5aa025
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/kernel/Documentation/README.rst b/kernel/Documentation/README.rst
@@ -1,7 +1,7 @@
 Documentation
 =============
 
-This documentation is avail at: `prototype-kernel.readthedocs.io`_
+This documentation is available at: `prototype-kernel.readthedocs.io`_
 
 Files in this `Documentation/`_ directory is (like the kernel) based on
 `reStructuredText`_ files and `Sphinx`_ can be used for generating
@@ -15,7 +15,7 @@ To generate pretty `Sphinx`_ documentation locally simply run ::
 
  make html
 
-The generate output will be located in ``_build/html/index.html``.
+The generated output will be located in ``_build/html/index.html``.
 
 .. _Read The Docs: https://prototype-kernel.readthedocs.io
 .. _prototype-kernel.readthedocs.io: https://prototype-kernel.readthedocs.io

diff --git a/kernel/Documentation/networking/XDP/implementation/missing_features.rst b/kernel/Documentation/networking/XDP/implementation/missing_features.rst
@@ -17,11 +17,11 @@ Initial support for XDP head adjustment added to net-next in this commit:
 
 Initial support only covers driver mlx4.
 
-.. TODO:: Update document once feature is avail in a kernel release.
+.. TODO:: Update document once feature is available in a kernel release.
 	  Plus, keep track of drivers supporting this feature.
 
 .. TODO:: Create new section under :doc:`userspace_api` that describe
-          howo use this and point to sample programs.
+          howto use this and point to sample programs.
 
 The eBPF program gets a new helper function called: ``bpf_xdp_adjust_head``
 

diff --git a/kernel/Documentation/networking/XDP/use-cases/xdp_use_case_ddos_scrubber.rst b/kernel/Documentation/networking/XDP/use-cases/xdp_use_case_ddos_scrubber.rst
@@ -61,7 +61,7 @@ is allowed through.  This is usually the base case, once the attack
 starts.
 
 Thus, they have need for analysing the traffic that gets forwarded
-with :ref:`XDP_TX`. (ISSUE) The is currently no way to sample or dump
+with :ref:`XDP_TX`. (ISSUE) There is currently no way to sample or dump
 the :ref:`XDP_TX` traffic.
 
 A physical solution could be to do switch-port mirroring of the

diff --git a/kernel/Documentation/networking/XDP/use-cases/xdp_use_case_load_balancer.rst b/kernel/Documentation/networking/XDP/use-cases/xdp_use_case_load_balancer.rst
@@ -71,7 +71,7 @@ XDP has a speed advantage.  The XDP load balance forwarding decision
 happens **very** early, before the OS has spent/invested too many
 cycles on the packet.  This means the XDP load balancing functionality
 should not increase the load on the server significantly.  Thus, it
-should okay to run the service and LB on the same server.  One can
+should be okay to run the service and LB on the same server.  One can
 even imagine having a feedback loop into the LB-program decision,
 based on whether the service is struggling to keep up.