Skip to content

Replace entry/section by "article" #10086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/http_foundation/session_configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Configuring Sessions and Save Handlers
======================================

This section deals with how to configure session management and fine tune it
This article deals with how to configure session management and fine tune it
to your specific needs. This documentation covers save handlers, which
store and retrieve session data, and configuring session behavior.

Expand Down
4 changes: 2 additions & 2 deletions components/security/firewall.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ certain action or resource of the application::

.. note::

Read the dedicated sections to learn more about :doc:`/components/security/authentication`
Read the dedicated articles to learn more about :doc:`/components/security/authentication`
and :doc:`/components/security/authorization`.

.. _firewall:
Expand Down Expand Up @@ -148,5 +148,5 @@ context works:
#. Once a user is authenticated, you'll use :doc:`/components/security/authorization`
to deny access to certain resources.

Read the next sections to find out more about :doc:`/components/security/authentication`
Read the next articles to find out more about :doc:`/components/security/authentication`
and :doc:`/components/security/authorization`.
2 changes: 1 addition & 1 deletion deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ setup:
Application Lifecycle: Continuous Integration, QA, etc.
-------------------------------------------------------

While this entry covers the technical details of deploying, the full lifecycle
While this article covers the technical details of deploying, the full lifecycle
of taking code from development up to production may have more steps:
deploying to staging, QA (Quality Assurance), running tests, etc.

Expand Down
2 changes: 1 addition & 1 deletion doctrine/event_listeners_subscribers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ to the tag like so:
.. note::

  Marking an event listener as ``lazy`` has nothing to do with lazy service
definitions which are described :doc:`in their own section </service_container/lazy_services>`
definitions which are described :doc:`in their own article </service_container/lazy_services>`

.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
.. _`the Doctrine Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#entity-listeners
8 changes: 4 additions & 4 deletions doctrine/repository.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
How to Create custom Repository Classes
=======================================

In the previous sections, you began constructing and using more complex queries
from inside a controller. In order to isolate, reuse and test these queries,
it's a good practice to create a custom repository class for your entity.
Methods containing your query logic can then be stored in this class.
Constructing and using complex queries inside controllers complicate the
maintenance of your application. In order to isolate, reuse and test these
queries, it's a good practice to create a custom repository class for your
entity. Methods containing your query logic can then be stored in this class.

To do this, add the repository class name to your entity's mapping definition:

Expand Down
2 changes: 1 addition & 1 deletion form/create_custom_field_type.rst
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ section explains how more complex field types solve this problem.
Creating your Field Type as a Service
-------------------------------------

So far, this entry has assumed that you have a very simple custom field type.
So far, this article has assumed that you have a very simple custom field type.
But if you need access to configuration, a database connection, or some other
service, then you'll want to register your custom type as a service. For
example, suppose that you're storing the shipping parameters in configuration:
Expand Down
4 changes: 2 additions & 2 deletions form/dynamic_form_modification.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
How to Dynamically Modify Forms Using Form Events
=================================================

Often times, a form can't be created statically. In this entry, you'll learn
Often times, a form can't be created statically. In this article, you'll learn
how to customize your form based on three common use-cases:

1) :ref:`form-events-underlying-data`
Expand Down Expand Up @@ -74,7 +74,7 @@ Suppose now, that you don't want the user to be able to change the ``name`` valu
once the object has been created. To do this, you can rely on Symfony's
:doc:`EventDispatcher component </components/event_dispatcher>`
system to analyze the data on the object and modify the form based on the
Product object's data. In this entry, you'll learn how to add this level of
Product object's data. In this article, you'll learn how to add this level of
flexibility to your forms.

Adding an Event Listener to a Form Class
Expand Down
6 changes: 3 additions & 3 deletions form/form_collections.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
How to Embed a Collection of Forms
==================================

In this entry, you'll learn how to create a form that embeds a collection
In this article, you'll learn how to create a form that embeds a collection
of many other forms. This could be useful, for example, if you had a ``Task``
class and you wanted to edit/create/remove many ``Tag`` objects related to
that Task, right inside the same form.

.. note::

In this entry, it's loosely assumed that you're using Doctrine as your
In this article, it's loosely assumed that you're using Doctrine as your
database store. But if you're not using Doctrine (e.g. Propel or just
a database connection), it's all very similar. There are only a few parts
of this tutorial that really care about "persistence".
Expand Down Expand Up @@ -224,7 +224,7 @@ great, your user can't actually add any new tags yet.

.. caution::

In this entry, you embed only one collection, but you are not limited
In this article, you embed only one collection, but you are not limited
to this. You can also embed nested collection as many levels down as you
like. But if you use Xdebug in your development setup, you may receive
a ``Maximum function nesting level of '100' reached, aborting!`` error.
Expand Down
2 changes: 1 addition & 1 deletion introduction/http_fundamentals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ resource - the most common HTTP methods are:
Delete the resource from the server (used by APIs).

With this in mind, you can imagine what an HTTP request might look like to
delete a specific blog entry, for example:
delete a specific blog post, for example:

.. code-block:: text

Expand Down
2 changes: 1 addition & 1 deletion routing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Routing Examples

A *route* is a map from a URL path to a controller. For example, suppose
you want to match any URL like ``/blog/my-post`` or ``/blog/all-about-symfony``
and send it to a controller that can look up and render that blog entry.
and send it to a controller that can look up and render that blog post.
The route is simple:

.. configuration-block::
Expand Down
2 changes: 1 addition & 1 deletion security/acl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ the ACL system comes in.
:doc:`voters </security/voters>`. A voter is passed the object
being voted on, which you can use to make complex decisions and effectively
implement your own ACL. Enforcing authorization (e.g. the ``isGranted()``
part) will look similar to what you see in this entry, but your voter
part) will look similar to what you see in this article, but your voter
class will handle the logic behind the scenes, instead of the ACL system.

Imagine you are designing a blog system where your users can comment on your
Expand Down
4 changes: 2 additions & 2 deletions security/api_key_authentication.rst
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ to store authentication in the session, keep reading!
Storing Authentication in the Session
-------------------------------------

So far, this entry has described a situation where some sort of authentication
So far, this article has described a situation where some sort of authentication
token is sent on every request. But in some situations (like an OAuth flow),
the token may be sent on only *one* request. In this case, you will want to
authenticate the user and store that authentication in the session so that
Expand Down Expand Up @@ -667,7 +667,7 @@ of the user to make sure it's not out-of-date. But regardless of your requiremen
Only Authenticating for Certain URLs
------------------------------------

This entry has assumed that you want to look for the ``apikey`` authentication
This article has assumed that you want to look for the ``apikey`` authentication
on *every* request. But in some situations (like an OAuth flow), you only
really need to look for authentication information once the user has reached
a certain URL (e.g. the redirect URL in OAuth).
Expand Down
2 changes: 1 addition & 1 deletion security/custom_authentication_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ How to Create a custom Authentication Provider

.. tip::

Creating a custom authentication system is hard, and this entry will walk
Creating a custom authentication system is hard, and this article will walk
you through that process. But depending on your needs, you may be able
to solve your problem in a simpler manner, or via a community bundle:

Expand Down
2 changes: 1 addition & 1 deletion security/custom_password_authenticator.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ How to Create a Custom Form Password Authenticator
flexible way to accomplish custom authentication tasks like this.

Imagine you want to allow access to your website only between 2pm and 4pm
UTC. In this entry, you'll learn how to do this for a login form (i.e. where
UTC. In this article, you'll learn how to do this for a login form (i.e. where
your user submits their username and password).

The Password Authenticator
Expand Down
4 changes: 2 additions & 2 deletions security/custom_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ the configured user provider to return a user object for a given username.
Symfony then checks whether the password of this user is correct and generates
a security token so the user stays authenticated during the current session.
Out of the box, Symfony has four user providers: ``memory``, ``entity``,
``ldap`` and ``chain``. In this entry you'll see how you can create your
``ldap`` and ``chain``. In this article you'll see how you can create your
own user provider, which could be useful if your users are accessed via a
custom database, a file, or - as shown in this example - a web service.

Expand Down Expand Up @@ -328,7 +328,7 @@ is compared to the hashed password returned by your ``getPassword()`` method.

If your external users have their passwords salted via a different method,
then you'll need to do a bit more work so that Symfony properly encodes
the password. That is beyond the scope of this entry, but would include
the password. That is beyond the scope of this article, but would include
sub-classing ``MessageDigestPasswordEncoder`` and overriding the
``mergePasswordAndSalt()`` method.

Expand Down
2 changes: 1 addition & 1 deletion security/entity_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ and :ref:`user serialization to the session <security-serialize-equatable>`
1) Create your User Entity
--------------------------

For this entry, suppose that you already have a ``User`` entity inside an
For this article, suppose that you already have a ``User`` entity inside an
``AppBundle`` with the following fields: ``id``, ``username``, ``password``,
``email`` and ``isActive``::

Expand Down
2 changes: 1 addition & 1 deletion service_container/scopes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This article is all about scopes, a somewhat advanced topic related to the
is to inject the ``request_stack`` service instead and access the current
Request by calling the
:method:`Symfony\\Component\\HttpFoundation\\RequestStack::getCurrentRequest`
method (see :doc:`/service_container/request`). The rest of this entry
method (see :doc:`/service_container/request`). The rest of this article
talks about scopes in a theoretical and more advanced way. If you're
dealing with scopes for the ``request`` service, simply inject ``request_stack``.

Expand Down
2 changes: 1 addition & 1 deletion setup/new_project_git.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ How to Create and Store a Symfony Project in Git

.. tip::

Though this entry is specifically about Git, the same generic principles
Though this article is specifically about Git, the same generic principles
will apply if you're storing your project in Subversion.

Once you've read through :doc:`/page_creation` and become familiar with
Expand Down
2 changes: 1 addition & 1 deletion setup/new_project_svn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ How to Create and Store a Symfony Project in Subversion

.. tip::

This entry is specifically about Subversion, and based on principles found
This article is specifically about Subversion, and based on principles found
in :doc:`/setup/new_project_git`.

Once you've read through :doc:`/page_creation` and become familiar with
Expand Down