Merge branch 'osd_changes' into master

Conflicts:
	DOCS/man/en/options.rst

1 files changed, 7 insertions, 4 deletions

diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst
index 6248073944..67832fe862 100644
--- a/DOCS/man/en/vo.rst
+++ b/DOCS/man/en/vo.rst
@@ -58,6 +58,8 @@ x11 (X11 only)
     Shared memory video output driver without hardware acceleration that works
     whenever X11 is present.
 
+    *NOTE*: this is a fallback only, and shouldn't be normally used.
+
 vdpau (X11 only)
     Uses the VDPAU interface to display and optionally also decode video.
     Hardware decoding is used with ``--vc=ffmpeg12vdpau``,
@@ -171,8 +173,8 @@ direct3d_shaders (Windows only)
         Never render YUV video with more than 8 bits per component.
         (Using this flag will force software conversion to 8 bit.)
 
-    disable-eosd
-        Disable EOSD rendering for subtitles.
+    disable-osd
+        Disable OSD rendering for subtitles.
         (Using this flag might force the insertion of the 'ass' video filter,
         which will render the subtitles in software.)
 
@@ -233,8 +235,9 @@ opengl
     OpenGL video output driver. It supports extended scaling methods, dithering
     and color management.
 
-    By default, it tries to use fast and fail-safe settings. Use the driver
-    ``opengl-hq`` to use this driver with a high quality rendering preset.
+    By default, it tries to use fast and fail-safe settings. Use the alias
+    ``opengl-hq`` to use this driver with defaults set for high quality
+    rendering.
 
     Requires at least OpenGL 2.1 and the GL_ARB_texture_rg extension. For older
     drivers, ``opengl-old`` may work.