Loading docs/internals/committers.txt +1 −1 Original line number Diff line number Diff line Loading @@ -408,7 +408,7 @@ Anssi Kääriäinen Django as a great match for that use case. Anssi is interested in developing the object relational mapper (ORM) and all related features. He's also a fan of benckmarking and he tries keep all related features. He's also a fan of benchmarking and he tries keep Django as fast as possible. Florian Apolloner Loading docs/internals/contributing/localizing.txt +2 −2 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ translating or add a language that isn't yet translated, here's what to do: * Once you are a member of a team choose the translation resource you want to update on the team page. For example the "core" resource refers to the translation catalogue that contains all non-contrib translations. to the translation catalog that contains all non-contrib translations. Each of the contrib apps also have a resource (prefixed with "contrib"). .. note:: Loading docs/intro/tutorial01.txt +3 −3 Original line number Diff line number Diff line Loading @@ -435,7 +435,7 @@ this case, we've set the :attr:`~django.db.models.Field.default` value of Finally, note a relationship is defined, using :class:`~django.db.models.ForeignKey`. That tells Django each ``Choice`` is related to a single ``Question``. Django supports all the common database relationships: many-to-ones, many-to-manys and one-to-ones. many-to-one, many-to-many and one-to-one. .. _`Python path`: http://docs.python.org/tutorial/modules.html#the-module-search-path Loading Loading @@ -591,12 +591,12 @@ Now, run :djadmin:`migrate` again to create those model tables in your database: The :djadmin:`migrate` command takes all the migrations that haven't been applied (Django tracks which ones are applied using a special table in your database called ``django_migrations``) and runs them against your database - essentially, synchronising the changes you made to your models with the schema essentially, synchronizing the changes you made to your models with the schema in the database. Migrations are very powerful and let you change your models over time, as you develop your project, without the need to delete your database or tables and make new ones - it specialises in upgrading your database live, without make new ones - it specializes in upgrading your database live, without losing data. We'll cover them in more depth in a later part of the tutorial, but for now, remember the three-step guide to making model changes: Loading docs/ref/applications.txt +1 −1 Original line number Diff line number Diff line Loading @@ -157,7 +157,7 @@ Configurable attributes Short name for the application, e.g. ``'admin'`` This attribute allows relabelling an application when two applications This attribute allows relabeling an application when two applications have conflicting labels. It defaults to the last component of ``name``. It should be a valid Python identifier. Loading docs/ref/contrib/gis/geoip.txt +2 −2 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ The :class:`GeoIP` object is a ctypes wrapper for the `MaxMind GeoIP C API`__. [#]_ In order to perform IP-based geolocation, the :class:`GeoIP` object requires the GeoIP C libary and either the GeoIP `Country`__ or `City`__ the GeoIP C library and either the GeoIP `Country`__ or `City`__ datasets in binary format (the CSV files will not work!). These datasets may be `downloaded from MaxMind`__. Grab the ``GeoLiteCountry/GeoIP.dat.gz`` and ``GeoLiteCity.dat.gz`` files and unzip them in a directory corresponding to what Loading Loading @@ -96,7 +96,7 @@ Defaults to ``'GeoLiteCity.dat'``. The ``GeoIP`` object does not require any parameters to use the default settings. However, at the very least the :setting:`GEOIP_PATH` setting should be set with the path of the location of your GeoIP data sets. The following intialization keywords may be used to customize any of the following initialization keywords may be used to customize any of the defaults. =================== ======================================================= Loading Loading
docs/internals/committers.txt +1 −1 Original line number Diff line number Diff line Loading @@ -408,7 +408,7 @@ Anssi Kääriäinen Django as a great match for that use case. Anssi is interested in developing the object relational mapper (ORM) and all related features. He's also a fan of benckmarking and he tries keep all related features. He's also a fan of benchmarking and he tries keep Django as fast as possible. Florian Apolloner Loading
docs/internals/contributing/localizing.txt +2 −2 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ translating or add a language that isn't yet translated, here's what to do: * Once you are a member of a team choose the translation resource you want to update on the team page. For example the "core" resource refers to the translation catalogue that contains all non-contrib translations. to the translation catalog that contains all non-contrib translations. Each of the contrib apps also have a resource (prefixed with "contrib"). .. note:: Loading
docs/intro/tutorial01.txt +3 −3 Original line number Diff line number Diff line Loading @@ -435,7 +435,7 @@ this case, we've set the :attr:`~django.db.models.Field.default` value of Finally, note a relationship is defined, using :class:`~django.db.models.ForeignKey`. That tells Django each ``Choice`` is related to a single ``Question``. Django supports all the common database relationships: many-to-ones, many-to-manys and one-to-ones. many-to-one, many-to-many and one-to-one. .. _`Python path`: http://docs.python.org/tutorial/modules.html#the-module-search-path Loading Loading @@ -591,12 +591,12 @@ Now, run :djadmin:`migrate` again to create those model tables in your database: The :djadmin:`migrate` command takes all the migrations that haven't been applied (Django tracks which ones are applied using a special table in your database called ``django_migrations``) and runs them against your database - essentially, synchronising the changes you made to your models with the schema essentially, synchronizing the changes you made to your models with the schema in the database. Migrations are very powerful and let you change your models over time, as you develop your project, without the need to delete your database or tables and make new ones - it specialises in upgrading your database live, without make new ones - it specializes in upgrading your database live, without losing data. We'll cover them in more depth in a later part of the tutorial, but for now, remember the three-step guide to making model changes: Loading
docs/ref/applications.txt +1 −1 Original line number Diff line number Diff line Loading @@ -157,7 +157,7 @@ Configurable attributes Short name for the application, e.g. ``'admin'`` This attribute allows relabelling an application when two applications This attribute allows relabeling an application when two applications have conflicting labels. It defaults to the last component of ``name``. It should be a valid Python identifier. Loading
docs/ref/contrib/gis/geoip.txt +2 −2 Original line number Diff line number Diff line Loading @@ -11,7 +11,7 @@ The :class:`GeoIP` object is a ctypes wrapper for the `MaxMind GeoIP C API`__. [#]_ In order to perform IP-based geolocation, the :class:`GeoIP` object requires the GeoIP C libary and either the GeoIP `Country`__ or `City`__ the GeoIP C library and either the GeoIP `Country`__ or `City`__ datasets in binary format (the CSV files will not work!). These datasets may be `downloaded from MaxMind`__. Grab the ``GeoLiteCountry/GeoIP.dat.gz`` and ``GeoLiteCity.dat.gz`` files and unzip them in a directory corresponding to what Loading Loading @@ -96,7 +96,7 @@ Defaults to ``'GeoLiteCity.dat'``. The ``GeoIP`` object does not require any parameters to use the default settings. However, at the very least the :setting:`GEOIP_PATH` setting should be set with the path of the location of your GeoIP data sets. The following intialization keywords may be used to customize any of the following initialization keywords may be used to customize any of the defaults. =================== ======================================================= Loading