diff --git a/TODO b/TODO
index 2c1ffe995..5ba104ff5 100644
--- a/TODO
+++ b/TODO
@@ -12,12 +12,9 @@ Daniel:
     - ``OauthAuthentication``
     - ``DigestAuthentication``
 - More integration tests (intermediate, advanced, composite, non-model)
-- Documentation.
-
 
 
 Long Term
 ---------
 
 - HTML browsing
-- Thread safety
diff --git a/docs/filtering_sorting.rst b/docs/resources.rst
similarity index 100%
rename from docs/filtering_sorting.rst
rename to docs/resources.rst
diff --git a/docs/toc.rst b/docs/toc.rst
index 08e7fd47f..24c24aded 100644
--- a/docs/toc.rst
+++ b/docs/toc.rst
@@ -6,13 +6,16 @@ Table Of Contents
    
    index
    tutorial
+   
    settings
    authentication
    caching
    cookbook
-   filtering_sorting
+   resources
    serialization
    throttling
+   
+   who_uses
 
 
 Indices and tables
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index e5254a4e4..f1f6b97aa 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -324,7 +324,7 @@ more features, like:
   * :doc:`authentication`
   * :doc:`caching`
   * :doc:`throttling`
-  * :doc:`filtering_sorting`
+  * :doc:`resources` (filtering & sorting)
   * :doc:`serialization`
 
 Tastypie is also very easy to override and extend. For some common patterns and