Index: docs/faq/usage.txt
===================================================================
--- docs/faq/usage.txt	(revision 8695)
+++ docs/faq/usage.txt	(working copy)
@@ -45,21 +45,24 @@
 How do I use image and file fields?
 -----------------------------------
 
-Using a ``FileField`` or an ``ImageField`` in a model takes a few steps:
+Using a :class:`~django.db.models.FileField` or an 
+:class:`~django.db.models.ImageField` in a model takes a few steps:
 
-    #. In your settings file, define ``MEDIA_ROOT`` as the full path to
-       a directory where you'd like Django to store uploaded files. (For
-       performance, these files are not stored in the database.) Define
-       ``MEDIA_URL`` as the base public URL of that directory. Make sure that
-       this directory is writable by the Web server's user account.
+    #. In your settings file, you'll need to define :setting:`MEDIA_ROOT` as the
+       full path to a directory where you'd like Django to store uploaded files.
+       (For performance, these files are not stored in the database.) Define
+       :setting:`MEDIA_URL` as the base public URL of that directory. Make sure
+       that this directory is writable by the Web server's user account.
 
-    #. Add the ``FileField`` or ``ImageField`` to your model, making sure
-       to define the ``upload_to`` option to tell Django to which subdirectory
-       of ``MEDIA_ROOT`` it should upload files.
+    #. Add the :class:`~django.db.models.FileField` or 
+       :class:`~django.db.models.ImageField` to your model, making sure to 
+       define the :attr:`~django.db.models.FileField.upload_to` option to tell 
+       Django to which subdirectory of :setting:`MEDIA_ROOT` it should upload 
+       files.
 
-    #. All that will be stored in your database is a path to the file
-       (relative to ``MEDIA_ROOT``). You'll most likely want to use the
-       convenience ``get_<fieldname>_url`` function provided by Django. For
-       example, if your ``ImageField`` is called ``mug_shot``, you can get the
-       absolute URL to your image in a template with
-       ``{{ object.get_mug_shot_url }}``.
+    #. All that will be stored in your database is a path to the file 
+       (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
+       convenience :attr:`~django.core.files.File.url` attribute provided by
+       Django. For example, if your :class:`~django.db.models.ImageField` is
+       called ``mug_shot``, you can get the absolute URL to your image in a
+       template with ``{{ object.mug_shot.url }}``.
Index: docs/ref/files/file.txt
===================================================================
--- docs/ref/files/file.txt	(revision 8695)
+++ docs/ref/files/file.txt	(working copy)
@@ -12,16 +12,18 @@
 
 Django's ``File`` has the following attributes and methods:
 
-``File.path``
-~~~~~~~~~~~~~
+.. attribute:: File.name
 
+The name of file including the relative path from :setting:`MEDIA_ROOT`.
+
+.. attribute:: File.path
+
 The absolute path to the file's location on a local filesystem.
 
 :ref:`Custom file storage systems <howto-custom-file-storage>` may not store
 files locally; files stored on these systems will have a ``path`` of ``None``.
 
-``File.url``
-~~~~~~~~~~~~
+.. attribute:: File.url
 
 The URL where the file can be retrieved. This is often useful in :ref:`templates
 <topics-templates>`; for example, a bit of a template for displaying a ``Car``
@@ -29,13 +31,11 @@
 
     <img src='{{ car.photo.url }}' alt='{{ car.name }}' />
 
-``File.size``
-~~~~~~~~~~~~~
+.. attribute:: File.size
 
 The size of the file in bytes.
 
-``File.open(mode=None)``
-~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.open(mode=None)
 
 Open or reopen the file (which by definition also does ``File.seek(0)``). The
 ``mode`` argument allows the same values as Python's standard ``open()``.
@@ -43,19 +43,16 @@
 When reopening a file, ``mode`` will override whatever mode the file was
 originally opened with; ``None`` means to reopen with the original mode.
 
-``File.read(num_bytes=None)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.read(num_bytes=None)
 
 Read content from the file. The optional ``size`` is the number of bytes to
 read; if not specified, the file will be read to the end.
 
-``File.__iter__()``
-~~~~~~~~~~~~~~~~~~~
+.. method:: File.__iter__()
 
 Iterate over the file yielding one line at a time.
 
-``File.chunks(chunk_size=None)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.chunks(chunk_size=None)
 
 Iterate over the file yielding "chunks" of a given size. ``chunk_size`` defaults
 to 64 KB.
@@ -63,44 +60,40 @@
 This is especially useful with very large files since it allows them to be
 streamed off disk and avoids storing the whole file in memory.
 
-``File.multiple_chunks(chunk_size=None)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.multiple_chunks(chunk_size=None)
 
 Returns ``True`` if the file is large enough to require multiple chunks to
 access all of its content give some ``chunk_size``.
 
-``File.write(content)``
-~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.write(content)
 
 Writes the specified content string to the file. Depending on the storage system
 behind the scenes, this content might not be fully committed until ``close()``
 is called on the file.
 
-``File.close()``
-~~~~~~~~~~~~~~~~
+.. method:: File.close()
 
 Close the file.
 
 Additional ``ImageField`` attributes
 ------------------------------------
 
-``File.width`` and ``File.height``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. attribute:: File.width
+.. attribute:: File.height
 
 These attributes provide the dimensions of the image.
 
 Additional methods on files attached to objects
 -----------------------------------------------
 
-Any ``File`` that's associated with an object (as with ``Car.photo``, above)
+Any :class:`File` that's associated with an object (as with ``Car.photo``, above)
 will also have a couple of extra methods:
 
-``File.save(name, content, save=True)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.save(name, content, save=True)
 
 Saves a new file with the file name and contents provided. This will not replace
 the existing file, but will create a new file and update the object to point to
-it. If ``save`` is ``True``, the model's ``save()`` method will be called once
+it. ``save`` is ``True``, the model's ``save()`` method will be called once
 the file is saved. That is, these two lines::
 
     >>> car.photo.save('myphoto.jpg', contents, save=False)
@@ -110,8 +103,7 @@
 
     >>> car.photo.save('myphoto.jpg', contents, save=True)
 
-``File.delete(save=True)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. method:: File.delete(save=True)
 
 Remove the file from the model instance and delete the underlying file. The
 ``save`` argument works as above.
Index: docs/ref/models/fields.txt
===================================================================
--- docs/ref/models/fields.txt	(revision 8695)
+++ docs/ref/models/fields.txt	(working copy)
@@ -415,8 +415,8 @@
 .. attribute:: FileField.upload_to
     
     A local filesystem path that will be appended to your :setting:`MEDIA_ROOT`
-    setting to determine the output of the ``get_<fieldname>_url()`` helper
-    function.
+    setting to determine the value of the :attr:`~django.core.files.File.url`
+    attribute.
 
     This path may contain `strftime formatting`_, which will be replaced by the
     date/time of the file upload (so that uploaded files don't fill up the given
@@ -460,7 +460,7 @@
 The admin represents this field as an ``<input type="file">`` (a file-upload
 widget).
 
-Using a :class:`FileField` or an :class:`ImageField` (see below) in a model
+Using a :class:`FileField` or an :class:`ImageField` (see below) in a model 
 takes a few steps:
 
     1. In your settings file, you'll need to define :setting:`MEDIA_ROOT` as the
@@ -470,15 +470,15 @@
        that this directory is writable by the Web server's user account.
 
     2. Add the :class:`FileField` or :class:`ImageField` to your model, making
-       sure to define the :attr:`~FileField.upload_to` option to tell Django to
-       which subdirectory of :setting:`MEDIA_ROOT` it should upload files.
+       sure to define the :attr:`~FileField.upload_to` option to tell Django 
+       to which subdirectory of :setting:`MEDIA_ROOT` it should upload files.
 
     3. All that will be stored in your database is a path to the file
        (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
-       convenience ``get_<fieldname>_url`` function provided by Django. For
-       example, if your :class:`ImageField` is called ``mug_shot``, you can get
-       the absolute URL to your image in a template with ``{{
-       object.get_mug_shot_url }}``.
+       convenience :attr:`~django.core.files.File.url` function provided by 
+       Django. For example, if your :class:`ImageField` is called ``mug_shot``, 
+       you can get the absolute URL to your image in a template with 
+       ``{{ object.mug_shot.url }}``.
 
 For example, say your :setting:`MEDIA_ROOT` is set to ``'/home/media'``, and
 :attr:`~FileField.upload_to` is set to ``'photos/%Y/%m/%d'``. The ``'%Y/%m/%d'``
@@ -488,8 +488,9 @@
 ``/home/media/photos/2007/01/15``.
 
 If you want to retrieve the upload file's on-disk filename, or a URL that refers
-to that file, or the file's size, you can use the ``File.name``, ``File.url``
-and ``File.size`` attributes; see :ref:`topics-files`.
+to that file, or the file's size, you can use the 
+:attr:`~django.core.files.File.name`, :attr:`~django.core.files.File.url`
+and :attr:`~django.core.files.File.size` attributes; see :ref:`topics-files`.
 
 Note that whenever you deal with uploaded files, you should pay close attention
 to where you're uploading them and what type of files they are, to avoid
@@ -575,7 +576,7 @@
     Name of a model field which will be auto-populated with the height of the
     image each time the model instance is saved.
 
-.. attribute:: ImageField.width_field`
+.. attribute:: ImageField.width_field
 
     Name of a model field which will be auto-populated with the width of the
     image each time the model instance is saved.
