Merge branch 'new-docs' of https://github.com/appdotnet/api-spec into new-docs

Author: orianmarx

content/docs/basics/pagination.md

@@ -1,5 +1,5 @@
 ---
-title: "Data Formats"
+title: "Pagination"
 ---
 
 # Pagination
@@ -104,4 +104,4 @@ Responses from paginated streams will include the following fields in the `meta`
             <td>If <code>more</code> is <code>true</code>, there are more matches available for the given query than would fit within <code>count</code> objects. If <code>more</code> is <code>false</code>, there are no more matches available.</td>
         </tr>
     </tbody>
-</table>
+</table>

content/docs/meta/annotations.md

@@ -7,7 +7,7 @@ title: "Annotations"
 * TOC
 {:toc}
 
-Annotations are metadata that can be attached to Users, Posts, Channels, or Messages. This allows developers and users to add extra information to App.net objects outside of the fields App.net has already defined.
+Annotations are metadata that can be attached to Users, Posts, Channels, Messages, or Files. This allows developers and users to add extra information to App.net objects outside of the fields App.net has already defined.
 
 ## What's so great about annotations?
 
@@ -52,7 +52,7 @@ In general, annotations are a list of objects that have a ```type``` and a ```va
 
 ### Annotations in App.net objects
 
-All objects that support annotations (User, Post, Channel, Message) have an `annotations` field which will contain a list of individual annotation objects if they are present.
+All objects that support annotations (User, Post, Channel, Message, File) have an `annotations` field which will contain a list of individual annotation objects if they are present.
 
 #### Example: annotations field in a Post
 
@@ -91,7 +91,7 @@ All objects that support annotations (User, Post, Channel, Message) have an `ann
 
 ### Limits
 
-- Each object (User, Post, Channel, Message) is allowed at most 8192 bytes worth of annotations (in total, when serialized as JSON).
+- Each object (User, Post, Channel, Message, File) is allowed at most 8192 bytes worth of annotations (in total, when serialized as JSON).
 - Post and Message annotations are immutable and can only be added at creation time.
 - A Post or Message can have multiple annotations of the same "type". 
 - User and Channel annotations are mutable and can be updated at any time.
@@ -100,13 +100,13 @@ All objects that support annotations (User, Post, Channel, Message) have an `ann
 
 ### Creating, Updating and Deleting
 
-For Posts, Messages, and Channels, you can create annotations when you create the object. You must pass JSON objects that include annotations matching the above schema. Please see the documentation for [creating Posts](/docs/resources/post/lifecycle/#create-a-post), [Messages](/docs/resources/message/lifecycle/#create-a-message), and [Channels](/docs/resources/channel/lifecycle/#create-a-channel).
+For Posts, Messages, Channels, and Files, you can create annotations when you create the object. You must pass JSON objects that include annotations matching the above schema. Please see the documentation for [creating Posts](/docs/resources/post/lifecycle/#create-a-post), [Messages](/docs/resources/message/lifecycle/#create-a-message), [Channels](/docs/resources/channel/lifecycle/#create-a-channel), or [Files](/docs/resources/file/lifecycle/#create-a-file).
 
-To add or update User or Channel annotations, you [update a User's profile](/docs/resources/user/profile/#update-a-user) or [update a Channel](/docs/resources/channel/lifecycle/#update-a-channel) and pass in the annotations you want to add or update. To delete an annotation, omit the `value` key for the annotation type you want to delete. For example, to delete a user's blog url, specify `{"type": "net.app.core.directory.blog"}`.
+To add or update User or Channel annotations, you [update a User's profile](/docs/resources/user/profile/#update-a-user), [update a Channel](/docs/resources/channel/lifecycle/#update-a-channel), or [update a File](/docs/resources/file/lifecycle/#update-a-file) and pass in the annotations you want to add or update. To delete an annotation, omit the `value` key for the annotation type you want to delete. For example, to delete a user's blog url, specify `{"type": "net.app.core.directory.blog"}`.
 
 ### Retrieving 
 
-Since annotations can be up to 8192 bytes, they are never included by default. When making a request for Users, Posts, Channels or Messages, you can use the parameter `include_annotations=1` to receive all applicable annotations. When requesting Users or Posts you can use `include_user_annotations=1` or `include_post_annotations=1` to include just those annotations. When requesting Channels or Messages you can use `include_channel_annotations=1` or `include_message_annotations=1` to include just those annotations.
+Since annotations can be up to 8192 bytes, they are never included by default. When making a request for Users, Posts, Channels, Messages, or Files, you can use the parameter `include_annotations=1` to receive all applicable annotations. When requesting Users or Posts you can use `include_user_annotations=1` or `include_post_annotations=1` to include just those annotations. When requesting Channels or Messages you can use `include_channel_annotations=1` or `include_message_annotations=1` to include just those annotations. When requesting Files you can use `include_file_annotations=1` or `include_user_annotations=1` to include just those annotations.
 
 ### Displaying
 

content/docs/resources/file/index.md

@@ -42,17 +42,17 @@ A file uploaded by a User and hosted by App.net.
         <tr>
             <td><code>derived_files</code></td>
             <td>object</td>
-            <td>An object containing any other Files that were created using this File as input. Please see the section on <a href="#derived_files">derived Files</a> for more information.</td>
+            <td>An object containing any other Files that were created using this File as input. Please see the section on <a href="#derived-files">Derived Files</a> for more information.</td>
         </tr>
         <tr>
             <td><code>file_token</code></td>
             <td>string</td>
-            <td>[Optional] A token that can be used to modify a File. Only present upon creation time, if a write file token was specified when fetching this file or if you have the files scope. Please see the section on <a href="#file_authorization">File authorization</a> for more information.</td>
+            <td>[Optional] A token that can be used to modify a File. Only present upon creation time, if a write file token was specified when fetching this file or if you have the files scope. Please see the section on <a href="#file-authorization">File Authorization</a> for more information.</td>
         </tr>
         <tr>
             <td><code>file_token_read</code></td>
             <td>string</td>
-            <td>[Optional] A token that can be used to access a File. Only present when <code>public</code> is <code>true</code> or if a read token was specified when fetching this File. Please see the section on <a href="#file_authorization">File authorization</a> for more information.</td>
+            <td>[Optional] A token that can be used to access a File. Only present when <code>public</code> is <code>true</code> or if a read token was specified when fetching this File. Please see the section on <a href="#file-authorization">File Authorization</a> for more information.</td>
         </tr>
         <tr>
             <td><code>id</code></td>

content/docs/resources/stream/lifecycle.md

@@ -27,7 +27,7 @@ A JSON object representing the stream to create. See [the stream object](/docs/r
 > 
 > Content-Type: application/json
 > 
-> DATA {"object_types": ["post"], "type": "long_poll", "id": "1", "filter_id": "1", "key": "rollout_stream"}
+> DATA {"object_types": ["post"], "type": "long_poll", "filter_id": "1", "key": "rollout_stream"}
 
 ~~~js
 {