aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--README.md2
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index c7bf0a8f..e1c1403c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,11 @@
*~
.*
-assetplatform.egg-info/*
coverage.xml
env
docs/build
html
htmlcov
-examples/media/pygments/[A-Za-z0-9]*
-examples/media/objectstore/[A-Za-z0-9]*
build/*
dist/*
xmlrunner/*
@@ -18,3 +15,4 @@ djangorestframework.egg-info/*
MANIFEST
!.gitignore
+!.travis.yml
diff --git a/README.md b/README.md
index 3b819e45..50ef4508 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[twitter]: https://twitter.com/_tomchristie
-[docs]: docs/index.md
+[docs]: https://github.com/tomchristie/django-rest-framework/blob/restframework2/docs/index.md
[urlobject]: https://github.com/zacharyvoase/urlobject
[markdown]: http://pypi.python.org/pypi/Markdown/
[pyyaml]: http://pypi.python.org/pypi/PyYAML