From 13e2ad2840e81478aad5a49239b602550c5ec5d6 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Tue, 29 Mar 2016 11:26:37 +0200
Subject: [PATCH] Documentation work

---
 docs/intro.dox | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/intro.dox b/docs/intro.dox
index 301185c4..6f0a2291 100644
--- a/docs/intro.dox
+++ b/docs/intro.dox
@@ -197,6 +197,7 @@ function:
  - @ref glfwDestroyCursor
  - @ref glfwPollEvents
  - @ref glfwWaitEvents
+ - @ref glfwWaitEventsTimeout
  - @ref glfwTerminate
 
 These functions may be made reentrant in future minor or patch releases, but
@@ -242,8 +243,15 @@ may be called from any thread:
  - @ref glfwExtensionSupported
  - @ref glfwGetProcAddress
 
-The timer may be accessed from any thread, but this is not synchronized by GLFW.
-The following timer related functions may be called from any thread:        
+The raw timer may be queried from any thread.  The following raw timer related
+functions may be called from any thread:
+
+ - @ref glfwGetTimerFrequency
+ - @ref glfwGetTimerValue
+
+The regular timer may be queried from any thread, but this is not synchronized
+by GLFW with calls to @ref glfwSetTime.  The following timer related functions
+may be called from any thread:
 
  - @ref glfwGetTime