Merge branch 'master' of github.com:KhronosGroup/EGL-Registry
diff --git a/api/EGL/eglplatform.h b/api/EGL/eglplatform.h
index 29ab288..5ab49c1 100644
--- a/api/EGL/eglplatform.h
+++ b/api/EGL/eglplatform.h
@@ -116,6 +116,12 @@
 typedef intptr_t EGLNativePixmapType;
 typedef intptr_t EGLNativeWindowType;
 
+#elif defined(__unix__) && defined(EGL_NO_X11)
+
+typedef void             *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
 #elif defined(__unix__) || defined(USE_X11)
 
 /* X11 (tentative)  */
diff --git a/sdk/docs/man/eglCreatePbufferSurface.xml b/sdk/docs/man/eglCreatePbufferSurface.xml
index e4f183d..7183543 100755
--- a/sdk/docs/man/eglCreatePbufferSurface.xml
+++ b/sdk/docs/man/eglCreatePbufferSurface.xml
@@ -296,7 +296,7 @@
             <constant>EGL_RENDERABLE_TYPE</constant> attribute of
             <parameter>config</parameter> does not include at least one
             of <constant>EGL_OPENGL_ES_BIT</constant>,
-            <constant>EGL_OPENGL_ES2_BIT</constant>), or
+            <constant>EGL_OPENGL_ES2_BIT</constant>, or
             <constant>EGL_OPENGL_ES3_BIT</constant>),
         </para>
         <para>
diff --git a/sdk/docs/man/eglCreatePixmapSurface.xml b/sdk/docs/man/eglCreatePixmapSurface.xml
index 1e2f9c4..72469f4 100755
--- a/sdk/docs/man/eglCreatePixmapSurface.xml
+++ b/sdk/docs/man/eglCreatePixmapSurface.xml
@@ -56,8 +56,8 @@
     </refsect1>
     <refsect1 xml:id="description"><title>Description</title>
         <para>
-            <function>eglCreatePixmapSurface</function> creates an on-screen
-            EGL window surface and returns a handle to it. The behavior of
+            <function>eglCreatePixmapSurface</function> creates an off-screen
+            EGL pixmap surface and returns a handle to it. The behavior of
             <function>eglCreatePixmapSurface</function> is identical to that
             of
             <citerefentry><refentrytitle>eglCreatePlatformPixmapSurface</refentrytitle></citerefentry>
diff --git a/sdk/docs/man/html/eglCreatePbufferSurface.xhtml b/sdk/docs/man/html/eglCreatePbufferSurface.xhtml
index be90560..aad7c3e 100644
--- a/sdk/docs/man/html/eglCreatePbufferSurface.xhtml
+++ b/sdk/docs/man/html/eglCreatePbufferSurface.xhtml
@@ -351,7 +351,7 @@
             <code class="constant">EGL_RENDERABLE_TYPE</code> attribute of
             <em class="parameter"><code>config</code></em> does not include at least one
             of <code class="constant">EGL_OPENGL_ES_BIT</code>,
-            <code class="constant">EGL_OPENGL_ES2_BIT</code>), or
+            <code class="constant">EGL_OPENGL_ES2_BIT</code>, or
             <code class="constant">EGL_OPENGL_ES3_BIT</code>),
         </p>
         <p>
diff --git a/sdk/docs/man/html/eglCreatePixmapSurface.xhtml b/sdk/docs/man/html/eglCreatePixmapSurface.xhtml
index cbbeae3..19b72cd 100644
--- a/sdk/docs/man/html/eglCreatePixmapSurface.xhtml
+++ b/sdk/docs/man/html/eglCreatePixmapSurface.xhtml
@@ -97,8 +97,8 @@
       <div class="refsect1" id="description">
         <h2>Description</h2>
         <p>
-            <code class="function">eglCreatePixmapSurface</code> creates an on-screen
-            EGL window surface and returns a handle to it. The behavior of
+            <code class="function">eglCreatePixmapSurface</code> creates an off-screen
+            EGL pixmap surface and returns a handle to it. The behavior of
             <code class="function">eglCreatePixmapSurface</code> is identical to that
             of
             <a class="citerefentry" href="eglCreatePlatformPixmapSurface.xhtml"><span class="citerefentry"><span class="refentrytitle">eglCreatePlatformPixmapSurface</span></span></a>