From 0be6dde81721e4a61caf45422987c599ebfcfe56 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 28 Dec 2023 19:52:15 +0100 Subject: [PATCH] Corrected code-block directives in docs. --- docs/ref/contrib/gis/tutorial.txt | 15 ++++++++------- docs/ref/models/expressions.txt | 4 +--- docs/ref/request-response.txt | 5 ++--- docs/ref/templates/builtins.txt | 7 +++---- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt index d1c4cdb8e49..eb62df56a86 100644 --- a/docs/ref/contrib/gis/tutorial.txt +++ b/docs/ref/contrib/gis/tutorial.txt @@ -252,7 +252,7 @@ model: This command should produce the following output: -.. console:: +.. code-block:: sql BEGIN; -- @@ -686,12 +686,13 @@ __ https://spatialreference.org/ref/epsg/32140/ .. code-block:: pycon - from django.db import connection - # or if you're querying a non-default database: - from django.db import connections - connection = connections['your_gis_db_alias'] - - City.objects.raw('SELECT id, name, %s as point from myapp_city' % (connection.ops.select % 'point')) + >>> from django.db import connection + >>> # or if you're querying a non-default database: + >>> from django.db import connections + >>> connection = connections["your_gis_db_alias"] + >>> City.objects.raw( + ... "SELECT id, name, %s as point from myapp_city" % (connection.ops.select % "point") + ... ) You should only use raw queries when you know exactly what you're doing. diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index 4b7881ae588..9d85442d9ca 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -755,9 +755,7 @@ should avoid them if possible. your SQL with user-provided data. You also must not quote placeholders in the SQL string. This example is - vulnerable to SQL injection because of the quotes around ``%s``: - - .. code-block:: pycon + vulnerable to SQL injection because of the quotes around ``%s``:: RawSQL("select col from sometable where othercol = '%s'") # unsafe! diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 0a73e644dad..15e0639fae4 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -1090,13 +1090,12 @@ Custom response classes ~~~~~~~~~~~~~~~~~~~~~~~ If you find yourself needing a response class that Django doesn't provide, you -can create it with the help of :py:class:`http.HTTPStatus`. For example: - -.. code-block:: pycon +can create it with the help of :py:class:`http.HTTPStatus`. For example:: from http import HTTPStatus from django.http import HttpResponse + class HttpResponseNoContent(HttpResponse): status_code = HTTPStatus.NO_CONTENT diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 6af68aebcae..03c8e61d207 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -519,11 +519,10 @@ Use of both ``and`` and ``or`` clauses within the same tag is allowed, with {% if athlete_list and coach_list or cheerleader_list %} -will be interpreted like: +will be interpreted like:: -.. code-block:: pycon - - if (athlete_list and coach_list) or cheerleader_list + if (athlete_list and coach_list) or cheerleader_list: + ... Use of actual parentheses in the :ttag:`if` tag is invalid syntax. If you need them to indicate precedence, you should use nested :ttag:`if` tags.