Ticket #26483: 26483-init.diff

docs/intro/tutorial01.txt

@@ -102 +102 @@
   anything inside it (e.g. ``mysite.urls``).
 
 * :file:`mysite/__init__.py`: An empty file that tells Python that this
-  directory should be considered a Python package. (Read `more about
-  packages`_ in the official Python docs if you're a Python beginner.)
+  directory should be considered a Python package. If you're a Python beginner,
+  read :ref:`more about packages <tut-packages>` in the official Python docs.
 
 * :file:`mysite/settings.py`: Settings/configuration for this Django
   project.  :doc:`/topics/settings` will tell you all about how settings
@@ -116 +116 @@
 * :file:`mysite/wsgi.py`: An entry-point for WSGI-compatible web servers to
   serve your project. See :doc:`/howto/deployment/wsgi/index` for more details.
 
-.. _more about packages: https://docs.python.org/tutorial/modules.html#packages
-
 The development server
 ======================
 

docs/ref/settings.txt

@@ -924 +924 @@
 
 A list of formats that will be accepted when inputting data on a date field.
 Formats will be tried in order, using the first valid one. Note that these
-format strings use Python's datetime_ module syntax, not the format strings
-from the ``date`` Django template tag.
+format strings use Python's :ref:`datetime module syntax
+<strftime-strptime-behavior>`, not the format strings from the :tfilter:`date`
+template filter.
 
 When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
 precedence and will be applied instead.
 
 See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`.
 
-.. _datetime: https://docs.python.org/library/datetime.html#strftime-strptime-behavior
-
 .. setting:: DATETIME_FORMAT
 
 ``DATETIME_FORMAT``
@@ -972 +971 @@
 
 A list of formats that will be accepted when inputting data on a datetime
 field. Formats will be tried in order, using the first valid one. Note that
-these format strings use Python's datetime_ module syntax, not the format
-strings from the ``date`` Django template tag.
+these format strings use Python's :ref:`datetime module syntax
+<strftime-strptime-behavior>`, not the format strings from the :tfilter:`date`
+template filter.
 
 When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher
 precedence and will be applied instead.

docs/ref/utils.txt

@@ -619 +619 @@
 
 .. function:: format_html(format_string, *args, **kwargs)
 
-    This is similar to `str.format`_, except that it is appropriate for
+    This is similar to :meth:`str.format`, except that it is appropriate for
     building up HTML fragments. All args and kwargs are passed through
-    :func:`conditional_escape` before being passed to ``str.format``.
+    :func:`conditional_escape` before being passed to ``str.format()``.
 
     For the case of building up small HTML fragments, this function is to be
-    preferred over string interpolation using ``%`` or ``str.format`` directly,
-    because it applies escaping to all arguments - just like the Template system
-    applies escaping by default.
+    preferred over string interpolation using ``%`` or ``str.format()``
+    directly, because it applies escaping to all arguments - just like the
+    template system applies escaping by default.
 
     So, instead of writing::
 
-        mark_safe("%s <b>%s</b> %s" % (some_html,
-                                        escape(some_text),
-                                        escape(some_other_text),
-                                        ))
+        mark_safe("%s <b>%s</b> %s" % (some_html, escape(some_text), escape(some_other_text)))
 
     You should instead use::
 
-        format_html("{} <b>{}</b> {}",
-                    mark_safe(some_html), some_text, some_other_text)
+        format_html("{} <b>{}</b> {}", mark_safe(some_html), some_text, some_other_text)
 
     This has the advantage that you don't need to apply :func:`escape` to each
     argument and risk a bug and an XSS vulnerability if you forget one.
 
     Note that although this function uses ``str.format`` to do the
-    interpolation, some of the formatting options provided by `str.format`_
+    interpolation, some of the formatting options provided by :meth:`str.format`
     (e.g. number formatting) will not work, since all arguments are passed
     through :func:`conditional_escape` which (ultimately) calls
     :func:`~django.utils.encoding.force_text` on the values.
 
-    .. _str.format: https://docs.python.org/library/stdtypes.html#str.format
-
 .. function:: format_html_join(sep, format_string, args_generator)
 
     A wrapper of :func:`format_html`, for the common case of a group of
@@ -661 +655 @@
     ``args_generator`` should be an iterator that returns the sequence of
     ``args`` that will be passed to :func:`format_html`. For example::
 
-        format_html_join('\n', "<li>{} {}</li>", ((u.first_name, u.last_name)
-                                                    for u in users))
+        format_html_join('\n', "<li>{} {}</li>", ((u.first_name, u.last_name) for u in users))
 
 .. function:: strip_tags(value)