Ticket #8701: 8701-v2.diff

File 8701-v2.diff, 9.3 KB (added by richardb, 7 years ago)

Another patch; more complete.

  • django/conf/global_settings.py

     
    257257FILE_UPLOAD_PERMISSIONS = None
    258258
    259259# Default formatting for date objects. See all available format strings here:
    260 # http://www.djangoproject.com/documentation/templates/#now
     260# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
    261261DATE_FORMAT = 'N j, Y'
    262262
    263263# Default formatting for datetime objects. See all available format strings here:
    264 # http://www.djangoproject.com/documentation/templates/#now
     264# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
    265265DATETIME_FORMAT = 'N j, Y, P'
    266266
    267267# Default formatting for time objects. See all available format strings here:
    268 # http://www.djangoproject.com/documentation/templates/#now
     268# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
    269269TIME_FORMAT = 'P'
    270270
    271271# Default formatting for date objects when only the year and month are relevant.
    272272# See all available format strings here:
    273 # http://www.djangoproject.com/documentation/templates/#now
     273# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
    274274YEAR_MONTH_FORMAT = 'F Y'
    275275
    276276# Default formatting for date objects when only the month and day are relevant.
    277277# See all available format strings here:
    278 # http://www.djangoproject.com/documentation/templates/#now
     278# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
    279279MONTH_DAY_FORMAT = 'F j'
    280280
    281281# Do you want to manage transactions manually?
  • django/contrib/redirects/README.TXT

     
    33For full documentation, see either of these:
    44
    55    * The file django/docs/redirects.txt in the Django distribution
    6     * http://www.djangoproject.com/documentation/redirects/ on the Web
     6    * http://docs.djangoproject.com/en/dev/ref/contrib/redirects/ on the Web
    77
    88Both have identical content.
     9 No newline at end of file
  • django/contrib/flatpages/README.TXT

     
    33For full documentation, see either of these:
    44
    55    * The file docs/flatpages.txt in the Django distribution
    6     * http://www.djangoproject.com/documentation/flatpages/ on the Web
     6    * http://docs.djangoproject.com/en/dev/ref/contrib/flatpages/ on the Web
    77
    88Both have identical content.
  • docs/intro/whatsnext.txt

     
    110110----------
    111111
    112112The most recent version of the Django documentation lives at
    113 http://www.djangoproject.com/documentation/ . These HTML pages are generated
     113http://docs.djangoproject.com/en/dev/. These HTML pages are generated
    114114automatically from the text files in source control. That means they reflect the
    115115"latest and greatest" in Django -- they include the very latest corrections and
    116116additions, and they discuss the latest Django features, which may only be
     
    232232    * The `main documentation Web page`_ includes links to documentation for
    233233      all previous versions.
    234234
    235 .. _main documentation Web page: http://www.djangoproject.com/documentation/
     235.. _main documentation Web page: http://docs.djangoproject.com/en/dev/
  • docs/releases/1.0-beta-2.txt

     
    114114Django's online documentation also includes pointers on how to
    115115contribute to Django:
    116116
    117     http://www.djangoproject.com/documentation/contributing/
     117    :ref:`contributing to Django<internals-contributing>`
    118118
    119119Contributions on any level -- developing code, writing
    120120documentation or simply triaging tickets and helping to test proposed
  • docs/releases/1.0-beta.txt

     
    148148Django's online documentation also includes pointers on how to
    149149contribute to Django:
    150150
    151     http://www.djangoproject.com/documentation/contributing/
     151    :ref:`contributing to Django<internals-contributing>`
    152152
    153153Contributions on any level -- developing code, writing
    154154documentation or simply triaging tickets and helping to test proposed
  • docs/releases/1.0-alpha-1.txt

     
    3333    and redesigned with extensibility and customization in mind. Full
    3434    documentation for the admin application is available online in the
    3535    official Django documentation:
    36    
    37          http://www.djangoproject.com/documentation/admin/
    3836
     37                :ref:`admin reference<ref-contrib-admin>`
     38
    3939Improved Unicode handling
    4040    Django's internals have been refactored to use Unicode throughout;
    4141    this drastically simplifies the task of dealing with
     
    4444    third-party libraries and systems which may or may not handle
    4545    Unicode gracefully. Details are available in Django's
    4646    Unicode-handling documentation:
    47    
    48          http://www.djangoproject.com/documentation/unicode/
    4947
     48         :ref:`unicode reference<ref-unicode>`
     49
    5050An improved Django ORM
    5151    Django's object-relational mapper -- the component which provides
    5252    the mapping between Django model classes and your database, and
     
    6969    marked as safe (requiring no escaping) or unsafe (requiring
    7070    escaping). A full guide to this feature is in the documentation
    7171    for the Django template system:
    72    
    73         http://www.djangoproject.com/documentation/templates/#automatic-html-escaping
    7472
     73        :ref:`template autoescape <ref-templates-builtins-autoescape>`
     74
    7575There are many more new features, many bugfixes and many enhancements
    7676to existing features from previous releases. The ``newforms`` library,
    7777for example, has undergone massive improvements including several
     
    8787Django 1.0 release, and a comprehensive list of backwards-incompatible
    8888changes is also available on the Django wiki for those who want to
    8989begin developing and testing their upgrade process:
    90    
     90
    9191    http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
    9292
    9393
     
    158158Django's online documentation also includes pointers on how to
    159159contribute to Django:
    160160
    161     http://www.djangoproject.com/documentation/contributing/
     161    :ref:`contributing to Django<internals-contributing>`
    162162
    163163Contributions on any level -- developing code, writing
    164164documentation or simply triaging tickets and helping to test proposed
  • docs/releases/1.0-alpha-2.txt

     
    131131Django's online documentation also includes pointers on how to
    132132contribute to Django:
    133133
    134     http://www.djangoproject.com/documentation/contributing/
     134    :ref:`contributing to Django<internals-contributing>`
    135135
    136136Contributions on any level -- developing code, writing
    137137documentation or simply triaging tickets and helping to test proposed
  • docs/man/django-admin.1

     
    168168Full descriptions of all these options, with examples, as well as documentation
    169169for the rest of the Django framework, can be found on the Django site:
    170170.sp
    171 .I http://www.djangoproject.com/documentation/
     171.I http://docs.djangoproject.com/en/dev/
    172172.sp
    173173or in the distributed documentation.
    174174.SH "AUTHORS/CREDITS"
  • docs/man/daily_cleanup.1

     
    2222.SH "SEE ALSO"
    2323The sessions documentation:
    2424.sp
    25 .I http://www.djangoproject.com/documentation/sessions/
     25.I http://docs.djangoproject.com/en/dev/topics/http/sessions/
    2626
    2727.SH "AUTHORS/CREDITS"
    2828Originally developed at World Online in Lawrence, Kansas, USA. Refer to the
  • docs/ref/templates/builtins.txt

     
    1616
    1717.. templatetag:: autoescape
    1818
     19.. _ref-templates-builtins-autoescape:
     20
    1921autoescape
    2022~~~~~~~~~~
    2123
  • README

     
    22and clean, pragmatic design.
    33
    44All documentation is in the "docs" directory and online at
    5 http://www.djangoproject.com/documentation/.  If you're just getting started,
     5http://docs.djangoproject.com/en/dev/.  If you're just getting started,
    66here's how we recommend you read the docs:
    77
    88    * First, read docs/install.txt for instructions on installing Django.
Back to Top