diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt index 8314b3d351..6ecfd5fffd 100644 --- a/docs/intro/overview.txt +++ b/docs/intro/overview.txt @@ -184,7 +184,7 @@ Design your URLs A clean, elegant URL scheme is an important detail in a high-quality web application. Django encourages beautiful URL design and doesn't put any cruft -in URLs, like ``.php`` or ``.asp``. +in URLs. To design URLs for an app, you create a Python module called a :doc:`URLconf `. A table of contents for your app, it contains a mapping @@ -289,7 +289,7 @@ lookup and function calls. Note ``{{ article.pub_date|date:"F j, Y" }}`` uses a Unix-style "pipe" (the "|" character). This is called a template filter, and it's a way to filter the value of a variable. In this case, the date filter formats a Python datetime object in -the given format (as found in PHP's date function). +the given format. You can chain together as many filters as you'd like. You can write :ref:`custom template filters `. You can write diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 4cfd1d8f71..be6c66e319 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1597,13 +1597,8 @@ If ``value`` is ``"String with spaces"``, the output will be Formats a date according to the given format. -Uses a similar format to PHP's `date() -`_ function with some -differences. - .. note:: - These format characters are not used in Django outside of templates. They - were designed to be compatible with PHP to ease transitioning for designers. + These format characters are not used in Django outside of templates. .. _date-and-time-formatting-specifiers: @@ -1657,10 +1652,7 @@ Format character Description Example output ``i`` Minutes. ``'00'`` to ``'59'`` ``s`` Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` ``u`` Microseconds. ``000000`` to ``999999`` -``a`` ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'`` - this is slightly different than PHP's - output, because this includes periods - to match Associated Press style.) +``a`` ``'a.m.'`` or ``'p.m.'``. ``A`` ``'AM'`` or ``'PM'``. ``'AM'`` ``f`` Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'`` with minutes left off if they're zero. diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt index e670292ca8..b5cf4f596c 100644 --- a/docs/topics/http/sessions.txt +++ b/docs/topics/http/sessions.txt @@ -1009,7 +1009,7 @@ Session IDs in URLs =================== The Django sessions framework is entirely, and solely, cookie-based. It does -not fall back to putting session IDs in URLs as a last resort, as PHP does. +not fall back to putting session IDs in URLs as a last resort. This is an intentional design decision. Not only does that behavior make URLs ugly, it makes your site vulnerable to session-ID theft via the "Referer" header.