Permalink
Browse files

Merge pull request #34 from jay754/master

Fixed lots of broken links
  • Loading branch information...
2 parents 8b4a275 + 8599d00 commit 284ff52eeee86da25c497c695367c2dbde4753b8 @jacobian jacobian committed Apr 12, 2013
Showing with 44 additions and 30 deletions.
  1. +1 −1 appendixA.rst
  2. +1 −1 appendixB.rst
  3. +1 −1 appendixC.rst
  4. +1 −1 appendixD.rst
  5. +1 −1 appendixE.rst
  6. +1 −1 appendixF.rst
  7. +1 −1 appendixG.rst
  8. +3 −1 chapter01.rst
  9. +3 −1 chapter02.rst
  10. +3 −1 chapter03.rst
  11. +3 −1 chapter04.rst
  12. +3 −1 chapter05.rst
  13. +3 −1 chapter06.rst
  14. +4 −2 chapter07.rst
  15. +1 −1 chapter08.rst
  16. +1 −1 chapter09.rst
  17. +1 −1 chapter10.rst
  18. +1 −1 chapter11.rst
  19. +2 −2 chapter12.rst
  20. +1 −1 chapter13.rst
  21. +1 −1 chapter14.rst
  22. +1 −1 chapter15.rst
  23. +1 −1 chapter16.rst
  24. +1 −1 chapter17.rst
  25. +1 −1 chapter18.rst
  26. +1 −1 chapter19.rst
  27. +2 −2 chapter20.rst
View
@@ -932,4 +932,4 @@ The plural name for the object::
verbose_name_plural = "stories"
-If this isn't given, Django will use ``verbose_name`` + ``"s"``.
+If this isn't given, Django will use ``verbose_name`` + ``"s"``.
View
@@ -1369,4 +1369,4 @@ standpoint. For instructions, see Appendix A.
Finally, it's important to note that the Django database layer is merely an
interface to your database. You can access your database via other tools,
programming languages, or database frameworks -- there's nothing Django-specific
-about your database.
+about your database.
View
@@ -929,4 +929,4 @@ In addition to ``extra_context``, the template's context will be as follows:
* ``object``: The object. This variable's name depends on the
``template_object_name`` parameter, which is ``'object'`` by default. If
``template_object_name`` is ``'foo'``, this variable's name will be
- ``foo``.
+ ``foo``.
View
@@ -927,4 +927,4 @@ Different locales have different formats. For example, U.S. English would use
"January 2006," whereas another locale might use "2006/January."
See also ``DATE_FORMAT``, ``DATETIME_FORMAT``, ``TIME_FORMAT``, and
-``MONTH_DAY_FORMAT``.
+``MONTH_DAY_FORMAT``.
View
@@ -1424,4 +1424,4 @@ returns one of those strings according to the value (see Table F-4).
``None`` ``"yeah,no,maybe"`` ``maybe``
``None`` ``"yeah,no"`` ``"no"`` (converts None to False
if no mapping for None is given)
- ========== ====================== ==================================
+ ========== ====================== ==================================
View
@@ -730,4 +730,4 @@ distribution. It enables tab-completion of ``django-admin.py`` and
* Type ``django-admin.py``.
* Press [TAB] to see all available options.
* Type ``sql``, then [TAB], to see all available options whose names start
- with ``sql``.
+ with ``sql``.
View
@@ -535,4 +535,4 @@ URLconf, like so::
...
)
- handler500 = 'mysite.views.my_custom_error_view'
+ handler500 = 'mysite.views.my_custom_error_view'
View
@@ -360,5 +360,7 @@ to database design, to deployment -- feel free to ask questions online.
What's Next
-----------
-In :doc:`chapter02`, we'll get started with Django, covering installation and
+In `Chapter 2`_, we'll get started with Django, covering installation and
initial setup.
+
+.. _Chapter 2: chapter02.rst/
View
@@ -500,4 +500,6 @@ What's Next?
============
Now that you have everything installed and the development server running,
-you're ready to :doc:`learn the basics <chapter03>` of serving Web pages with Django.
+you're ready to :doc: learn the basics `Chapter 3`_, of serving Web pages with Django.
+
+.. _Chapter 3: chapter03.rst/
View
@@ -911,4 +911,6 @@ core concepts, but in the real world, this is nearly always a bad idea.
Django ships with a simple yet powerful template engine that allows you to
separate the design of the page from the underlying code. We'll dive into
-Django's template engine in the :doc:`next chapter <chapter04>`.
+Django's template engine in the next chapter `Chapter 4`_.
+
+.. _Chapter 4: chapter04.rst/
View
@@ -1610,5 +1610,7 @@ Many modern Web sites are *database-driven*: the content of the Web site is
stored in a relational database. This allows a clean separation of data and logic
(in the same way views and templates allow the separation of logic and display.)
-The :doc:`next chapter <chapter05>` covers the tools Django gives you to
+The next chapter `Chapter 5`_ covers the tools Django gives you to
interact with a database.
+
+.. _Chapter 4: chapter04.rst/
View
@@ -1379,5 +1379,7 @@ user-submitted form data.
But in some cases, you or your team might need to enter data manually, in which
case it would be helpful to have a Web-based interface for entering and
-managing data. The :doc:`next chapter <chapter06>` covers Django's admin interface, which exists
+managing data. The next chapter `Chapter 6`_ covers Django's admin interface, which exists
precisely for that reason.
+
+.. _Chapter 6: chapter06.rst/
View
@@ -984,5 +984,7 @@ What's Next?
============
So far we've created a few models and configured a top-notch interface for
-editing data. In the :doc:`next chapter <chapter07>`, we'll move on to the real "meat and potatoes"
+editing data. In the next chapter `Chapter 7`_, we'll move on to the real "meat and potatoes"
of Web development: form creation and processing.
+
+.. _Chapter 7: chapter07.rst/
View
@@ -1279,5 +1279,7 @@ After these first seven chapters, you should know enough to start writing your
own Django projects. The rest of the material in this book will help fill in the
missing pieces as you need them.
-We'll start in :doc:`chapter08` by doubling back and taking a closer look at views
-and URLconfs (introduced first in :doc:`chapter03`).
+We'll start in `Chapter 8`_, by doubling back and taking a closer look at views
+and URLconfs (introduced first in `chapter03`).
+
+.. _chapter 8: chapter08.rst/
View
@@ -1130,4 +1130,4 @@ This chapter has provided many advanced tips and tricks for views and URLconfs.
Next, in `Chapter 9`_, we'll give this advanced treatment to Django's template
system.
-.. _Chapter 9: ../chapter09/
+.. _Chapter 9: chapter09.rst/
View
@@ -1294,4 +1294,4 @@ What's Next
Continuing this section's theme of advanced topics, the `next chapter`_ covers
advanced usage of Django models.
-.. _next chapter: ../chapter10/
+.. _next chapter: chapter10.rst/
View
@@ -598,4 +598,4 @@ What's Next?
In the `next chapter`_, we'll show you Django's "generic views" framework, which
lets you save time in building Web sites that follow common patterns.
-.. _next chapter: ../chapter11/
+.. _next chapter: chapter11.rst/
View
@@ -518,4 +518,4 @@ recommended reading if you want to get the most out of this powerful feature.
This concludes the section of this book devoted to "advanced usage." In the
`next chapter`_, we cover deployment of Django applications.
-.. _next chapter: ../chapter12/
+.. _next chapter: chapter12.rst/
View
@@ -1073,7 +1073,7 @@ Of course, selecting memcached does you no good if you don't actually use it.
framework, and use it everywhere possible. Aggressive, preemptive caching is
usually the only thing that will keep a site up under major traffic.
-.. _Chapter 15: ../chapter15/
+.. _Chapter 15: chapter15.rst/
Join the Conversation
---------------------
@@ -1092,4 +1092,4 @@ What's Next?
The remaining chapters focus on other Django features that you may or may not
need, depending on your application. Feel free to read them in any order you
-choose.
+choose.
View
@@ -986,4 +986,4 @@ Next, we'll continue to dig deeper into the built-in tools Django gives you.
`Chapter 14`_ looks at all the tools you need to provide user-customized
sites: sessions, users, and authentication.
-.. _Chapter 14: ../chapter14/
+.. _Chapter 14: chapter14.rst/
View
@@ -1236,4 +1236,4 @@ available.
In the `next chapter`_, we'll take a look at Django's caching infrastructure,
which is a convenient way to improve the performance of your application.
-.. _next chapter: ../chapter15/
+.. _next chapter: chapter15.rst/
View
@@ -758,4 +758,4 @@ What's Next?
Django ships with a number of "contrib" packages -- optional features that can
make your life easier. We've already covered a few of these: the admin site
(Chapter 6) and the session/user framework (Chapter 14). The next chapter
-covers more of the "contributed" subframeworks.
+covers more of the "contributed" subframeworks.
View
@@ -946,4 +946,4 @@ and/or after every request and can modify requests and responses at will, to
extend the framework. In the `next chapter`_, we'll discuss Django's built-in
middleware and explain how you can write your own.
-.. _next chapter: ../chapter17/
+.. _next chapter: chapter17.rst/
View
@@ -389,4 +389,4 @@ Web developers and database-schema designers don't always have the luxury of
starting from scratch. In the `next chapter`_, we'll cover how to integrate with
legacy systems, such as database schemas you've inherited from the 1980s.
-.. _next chapter: ../chapter18/
+.. _next chapter: chapter18.rst/
View
@@ -299,4 +299,4 @@ framework (and the hard work of Django's volunteer translators). The
`next chapter`_ explains how to use this framework to provide localized Django
sites.
-.. _next chapter: ../chapter19/
+.. _next chapter: chapter19.rst/
View
@@ -940,4 +940,4 @@ What's Next?
The `final chapter`_ focuses on security -- how you can help secure your sites and
your users from malicious attackers.
-.. _final chapter: ../chapter20/
+.. _final chapter: chapter20.rst/
View
@@ -516,5 +516,5 @@ your Django projects.
We wish you the best of luck in running your Django site, whether it's a little
toy for you and a few friends, or the next Google.
-.. _Chapter 14: ../chapter14/
-.. _Chapter 16: ../chapter16/
+.. _Chapter 14: chapter14.rst/
+.. _Chapter 16: chapter16.rst/

0 comments on commit 284ff52

Please sign in to comment.