Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[djangoproject.com] Updated links to point to the new docs. Fixes #8604.

git-svn-id: http://code.djangoproject.com/svn/djangoproject.com@8876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2c1ccc9e553fc8c76086458c5ed1d5f61053b839 1 parent 6ee18a6
jacob authored
View
2  django_website/templates/base.html
@@ -28,7 +28,7 @@ <h1 id="logo"><a href="/"><img src="http://media.djangoproject.com/img/site/hdr_
<ul id="nav-global">
<li id="nav-homepage"><a href="http://www.djangoproject.com/">Home</a></li>
<li id="nav-download"><a href="http://www.djangoproject.com/download/">Download</a></li>
- <li id="nav-documentation"><a href="http://www.djangoproject.com/documentation/">Documentation</a></li>
+ <li id="nav-documentation"><a href="http://docs.djangoproject.com/">Documentation</a></li>
<li id="nav-weblog"><a href="http://www.djangoproject.com/weblog/">Weblog</a></li>
<li id="nav-community"><a href="http://www.djangoproject.com/community/">Community</a></li>
<li id="nav-code"><a href="http://code.djangoproject.com/">Code</a></li>
View
2  django_website/templates/base_community.html
@@ -50,7 +50,7 @@
<h2>Get help</h2>
<ul>
-<li><strong><a href="/documentation/faq/">Check our FAQ</a> first</strong>. If you have a basic question that's not answered by the FAQ, <a href="http://code.djangoproject.com/simpleticket">file a ticket</a> to tell us you think it should be in there.</li>
+<li><strong><a href="http://docs.djangoproject.com/en/dev/faq/">Check our FAQ</a> first</strong>. If you have a basic question that's not answered by the FAQ, <a href="http://code.djangoproject.com/simpleticket">file a ticket</a> to tell us you think it should be in there.</li>
<li><strong>Chat live with other Django users</strong> in the <a href="irc://irc.freenode.net/django">#django IRC channel on irc.freenode.net</a>.</li>
<li><strong>Ask questions</strong> on the <a href="http://groups-beta.google.com/group/django-users">django-users mailing list</a>.</li>
</ul>
View
29 django_website/templates/flatpages/homepage.html
@@ -9,24 +9,24 @@
{% block content %}
<h1>Meet Django</h1>
<h2 class="deck">Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design.</h2>
-<p>Developed and used over two years by a fast-moving online-news operation, Django was designed to handle two challenges: the intensive deadlines of a newsroom and the stringent requirements of the <a href="/documentation/faq/#who-s-behind-this">experienced Web developers who wrote it</a>. It lets you build high-performing, elegant Web applications quickly.</p>
+<p>Developed and used over two years by a fast-moving online-news operation, Django was designed to handle two challenges: the intensive deadlines of a newsroom and the stringent requirements of the experienced Web developers who wrote it. It lets you build high-performing, elegant Web applications quickly.</p>
<p>Django focuses on automating as much as possible and adhering to the <a href="http://c2.com/cgi/wiki?DontRepeatYourself"><abbr title="Don't Repeat Yourself">DRY</abbr> principle</a>.</p>
-<p>Dive in by <a href="/documentation/overview/">reading the overview &rarr;</a></p>
-<p>When you're ready to code, read the <a href="/documentation/install/">installation guide</a> and <a href="/documentation/tutorial1/">tutorial</a>.</p>
+<p>Dive in by <a href="http://docs.djangoproject.com/en/dev/intro/overview/">reading the overview &rarr;</a></p>
+<p>When you're ready to code, read the <a href="http://docs.djangoproject.com/en/dev/intro/install/">installation guide</a> and <a href="http://docs.djangoproject.com/en/dev/intro/tutorial01/">tutorial</a>.</p>
<div id="content-secondary">
<h2>The Django framework</h2>
<h3>Object-relational mapper</h3>
- <p>Define your <a href="http://www.djangoproject.com/documentation/model_api/">data models</a> entirely in Python. You get a rich, <a href="/documentation/db_api/">dynamic database-access API</a> for free &mdash; but you can still write SQL if needed.</p>
+ <p>Define your <a href="http://docs.djangoproject.com/en/dev/topics/db/models/">data models</a> entirely in Python. You get a rich, <a href="http://docs.djangoproject.com/en/dev/topics/db/queries/">dynamic database-access API</a> for free &mdash; but you can still write SQL if needed.</p>
<h3>Automatic admin interface</h3>
- <p>Save yourself the tedious work of creating interfaces for people to add and update content. <a href="http://www.djangoproject.com/documentation/tutorial2/">Django does that automatically</a>, and it's production-ready.</p>
+ <p>Save yourself the tedious work of creating interfaces for people to add and update content. <a href="http://docs.djangoproject.com/en/dev/intro/tutorial02/">Django does that automatically</a>, and it's production-ready.</p>
<h3>Elegant URL design</h3>
- <p>Design pretty, <a href="http://www.djangoproject.com/documentation/url_dispatch/">cruft-free URLs</a> with no framework-specific limitations. Be as flexible as you like.</p>
+ <p>Design pretty, <a href="http://docs.djangoproject.com/en/dev/topics/http/urls/">cruft-free URLs</a> with no framework-specific limitations. Be as flexible as you like.</p>
<h3>Template system</h3>
- <p>Use Django's powerful, extensible and designer-friendly <a href="http://www.djangoproject.com/documentation/templates/">template language</a> to separate design, content and Python code.</p>
+ <p>Use Django's powerful, extensible and designer-friendly <a href="http://docs.djangoproject.com/en/dev/topics/templates/">template language</a> to separate design, content and Python code.</p>
<h3>Cache system</h3>
- <p>Hook into memcached or other cache frameworks for <a href="http://www.djangoproject.com/documentation/cache/">super performance</a> &mdash; caching is as granular as you need.</p>
+ <p>Hook into memcached or other cache frameworks for <a href="http://docs.djangoproject.com/en/dev/topics/cache/">super performance</a> &mdash; caching is as granular as you need.</p>
<h3>Internationalization</h3>
- <p>Django has full support for <a href="http://www.djangoproject.com/documentation/i18n/">multi-language applications</a>, letting you specify translation strings and providing hooks for language-specific functionality.</p>
+ <p>Django has full support for <a href="http://docs.djangoproject.com/en/dev/topics/i18n/">multi-language applications</a>, letting you specify translation strings and providing hooks for language-specific functionality.</p>
</div>
<!-- END #content-secondary -->
{% endblock %}
@@ -40,12 +40,11 @@ <h2 class="deck">Django is a high-level Python Web framework that encourages rap
<p>Open source, <a href="http://code.djangoproject.com/browser/django/trunk/LICENSE">BSD license</a></p>
<h2>Documentation</h2>
<ul class="linklist">
- <li><a href="/documentation/install/">Installation guide</a></li>
- <li><a href="/documentation/tutorial1/">Tutorial</a></li>
- <li><a href="/documentation/model_api/">Models</a></li>
- <li><a href="/documentation/templates/">Templates</a></li>
- <li>New: <a href="http://www.djangobook.com/">The Django Book</a></li>
- <li><a href="/documentation/">More...</a></li>
+ <li><a href="http://docs.djangoproject.com/en/dev/intro/install/">Installation guide</a></li>
+ <li><a href="http://docs.djangoproject.com/en/dev/intro/tutorial01/">Tutorial</a></li>
+ <li><a href="http://docs.djangoproject.com/en/dev/#using-django">Using Django</a></li>
+ <li><a href="http://docs.djangoproject.com/en/dev/#reference">Reference</a></li>
+ <li><a href="http://docs.djangoproject.com/">More...</a></li>
</ul>
<h2>Sites that use Django</h2>
<dl>
Please sign in to comment.
Something went wrong with that request. Please try again.