api/server/MAINTAINERS: add proppy and vieux

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
removed expect from mkimage-arch since it was not working

Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com> (github: NikolaMandic)
Update gorilla/context

Race condition was fixed recently
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master

* 'master' of https://github.com/NikolaMandic/docker:
  removed expect from mkimage-arch since it was not working

Conflicts:
	contrib/mkimage-arch.sh

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Merge pull request #6784 from tianon/NikolaMandic-master

Update contrib/mkimage-arch.sh to remove use of "expect" since the output of pacstrap has changed
Merge pull request #6749 from LK4D4/update_gorilla_context

Update gorilla/context
Fixed typographical erros in the documentation

Used the RETF rules provided by Wikipedia to fix some typographical
errors in the Markdown files of the documentation with the following
script:

https://github.com/openstack/openstack-doc-tools/tree/master/cleanup/retf

Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: berendt)

Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de> (github: SvenDowideit)
blindly make all uses of e\.?g\.? into e.g.,

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Merge pull request #6764 from SvenDowideit/pr_out_blindly_make_all_uses_of_e_g_into_e_g_

blindly make all uses of e\.?g\.? into e.g.,
Merge pull request #6366 from proppy/add-proppy-server

api/MAINTAINERS: add proppy for server/
Merge branch 'master' into 6738-dscarticle
conform to char length
Merge branch '6738-dscarticle' of https://github.com/anweiss/docker into 6738-dscarticle