Merge branch 'master' of https://github.com/appdotnet/api-spec

Conflicts: README.md annotations.md auth.md intents.md migrations.md objects.md resources/README.md resources/filters.md resources/posts.md resources/streams.md resources/token.md resources/users.md responses.md
appdotnet · Dec 15, 2012 · 2d7c184 · 2d7c184
2 parents 56e0717 + 326fbec
commit 2d7c184
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@
 
 This is the former home of the App.net API Documentation. To view the current documentation please visit [developers.app.net](developers.app.net). If you'd like to see the source for our current documentation please switch the [new-docs](https://github.com/appdotnet/api-spec/tree/new-docs) branch.
 
-You should continue to use the [issue tracker](https://github.com/appdotnet/api-spec/issues) to report bugs and provide feedback on the API.
+You should continue to use the [issue tracker](https://github.com/appdotnet/api-spec/issues) to report bugs and provide feedback on the API.
diff --git a/annotations.md b/annotations.md
@@ -1,3 +1,3 @@
 # Annotations  #
 
-**This documentation has moved to http://developers.app.net/docs/meta/annotations/**
+**This documentation has moved to http://developers.app.net/docs/meta/annotations/**
diff --git a/auth.md b/auth.md
@@ -1,3 +1,3 @@
 # Authentication
 
-**This documentation has move to http://developers.app.net/docs/authentication/**
+**This documentation has move to http://developers.app.net/docs/authentication/**
diff --git a/intents.md b/intents.md
@@ -1,3 +1,3 @@
 # Web Intents
 
-**This documentation has moved to http://developers.app.net/docs/other/web-intents/**
+**This documentation has moved to http://developers.app.net/docs/other/web-intents/**
diff --git a/migrations.md b/migrations.md
@@ -1,3 +1,3 @@
 # Migrations
 
-**This documentation has moved to http://developers.app.net/docs/basics/migrations/**
+**This documentation has moved to http://developers.app.net/docs/basics/migrations/**
diff --git a/objects.md b/objects.md
@@ -12,4 +12,4 @@
 - [Filter](http://developers.app.net/docs/resources/filter/)
 - [Interaction](http://developers.app.net/docs/resources/interaction/)
 - [Stream Marker](http://developers.app.net/docs/resources/stream-marker/)
-- [Token](http://developers.app.net/docs/resources/token/)
+- [Token](http://developers.app.net/docs/resources/token/)
diff --git a/resources/README.md b/resources/README.md
@@ -1,3 +1,3 @@
 # Resources
 
-**This documentation has moved to http://developers.app.net/docs/resources/**
+**This documentation has moved to http://developers.app.net/docs/resources/**
diff --git a/resources/posts.md b/resources/posts.md
@@ -1,3 +1,3 @@
 # Posts
 
-**This documentation has moved to http://developers.app.net/docs/resources/post/**
+**This documentation has moved to http://developers.app.net/docs/resources/post/**
diff --git a/resources/streams.md b/resources/streams.md
@@ -1,3 +1,3 @@
 # Streams
 
-**This documentation has moved to http://developers.app.net/docs/resources/stream/**
+**This documentation has moved to http://developers.app.net/docs/resources/stream/**
diff --git a/resources/token.md b/resources/token.md
@@ -1,3 +1,3 @@
 # Token
 
-**This documentation has moved to http://developers.app.net/docs/resources/token/**
+**This documentation has moved to http://developers.app.net/docs/resources/token/**
diff --git a/resources/users.md b/resources/users.md
@@ -1,3 +1,3 @@
 # Users 
 
-**This documentation has moved to http://developers.app.net/docs/resources/user/**
+**This documentation has moved to http://developers.app.net/docs/resources/user/**
diff --git a/responses.md b/responses.md
@@ -1,3 +1,3 @@
 # Responses
 
-**This documentation has moved to http://developers.app.net/docs/basics/responses/**
+**This documentation has moved to http://developers.app.net/docs/basics/responses/**