Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2b7e0f6

Browse files
committed
minorsymfony#3497 Fix highlighting (WouterJ)
This PR was merged into the 2.3 branch.Discussion----------Fix highlightingInitial idea was to fix the highlighting. While doing that, others thingsalso got a fix:* indenting* missing formats* some `...` in XML elements* missing comments in other formats| Q | A| --- | ---| Doc fix? | yes| New docs? | no| Applies to | all| Fixed tickets | partiallysymfony#1886Commits-------7c0cf89 Fixed (mostly) yaml code blocks2a43a97 Fixed YAML code blocks in the book
2 parents30f94a6 +7c0cf89 commit2b7e0f6

File tree

39 files changed

+185
-138
lines changed

39 files changed

+185
-138
lines changed

‎book/propel.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ configuration file (``config.yml``):
5555
5656
propel:
5757
dbal:
58-
driver:"%database_driver%"
59-
user:"%database_user%"
60-
password:"%database_password%"
61-
dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
58+
driver:"%database_driver%"
59+
user:"%database_user%"
60+
password:"%database_password%"
61+
dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
6262
6363
Now that Propel knows about your database, Symfony2 can create the database for
6464
you:

‎book/security.rst‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):
4545
security:
4646
firewalls:
4747
secured_area:
48-
pattern:^/
48+
pattern:^/
4949
anonymous:~
5050
http_basic:
5151
realm:"Secured Demo Area"
@@ -300,11 +300,11 @@ First, enable form login under your firewall:
300300
security:
301301
firewalls:
302302
secured_area:
303-
pattern:^/
303+
pattern:^/
304304
anonymous:~
305305
form_login:
306-
login_path:login
307-
check_path:login_check
306+
login_path:login
307+
check_path:login_check
308308
309309
..code-block::xml
310310
@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
373373
374374
# app/config/routing.yml
375375
login:
376-
path:/login
377-
defaults:{ _controller: AcmeSecurityBundle:Security:login }
376+
path:/login
377+
defaults:{ _controller: AcmeSecurityBundle:Security:login }
378378
login_check:
379-
path:/login_check
379+
path:/login_check
380380
381381
..code-block::xml
382382
@@ -637,8 +637,8 @@ see :doc:`/cookbook/security/form_login`.
637637
638638
firewalls:
639639
login_firewall:
640-
pattern:^/login$
641-
anonymous:~
640+
pattern:^/login$
641+
anonymous:~
642642
secured_area:
643643
pattern:^/
644644
form_login:~
@@ -1094,13 +1094,14 @@ aren't stored anywhere in a database. The actual user object is provided
10941094
by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).
10951095

10961096
..tip::
1097+
10971098
Any user provider can load users directly from configuration by specifying
10981099
the ``users`` configuration parameter and listing the users beneath it.
10991100

11001101
..caution::
11011102

11021103
If your username is completely numeric (e.g. ``77``) or contains a dash
1103-
(e.g. ``user-name``), you should usethat alternative syntax when specifying
1104+
(e.g. ``user-name``), you should usean alternative syntax when specifying
11041105
users in YAML:
11051106

11061107
..code-block::yaml

‎book/translation.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ by the routing system using the special ``_locale`` parameter:
452452
..code-block::yaml
453453
454454
contact:
455-
path:/{_locale}/contact
456-
defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }
455+
path:/{_locale}/contact
456+
defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }
457457
requirements:
458458
_locale:en|fr|de
459459

‎components/config/definition.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ applied to it (like: "the value for ``auto_connect`` must be a boolean value"):
2121
default_connection:mysql
2222
connections:
2323
mysql:
24-
host:localhost
25-
driver:mysql
24+
host:localhost
25+
driver:mysql
2626
username:user
2727
password:pass
2828
sqlite:
29-
host:localhost
30-
driver:sqlite
31-
memory:true
29+
host:localhost
30+
driver:sqlite
31+
memory:true
3232
username:user
3333
password:pass
3434
@@ -473,9 +473,9 @@ in this config:
473473
..code-block::yaml
474474
475475
connection:
476-
name:my_mysql_connection
477-
host:localhost
478-
driver:mysql
476+
name:my_mysql_connection
477+
host:localhost
478+
driver:mysql
479479
username:user
480480
password:pass
481481

‎components/dependency_injection/parameters.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ making the class of a service a parameter:
134134
135135
services:
136136
mailer:
137-
class:'%mailer.class%'
138-
arguments:['%mailer.transport%']
137+
class:"%mailer.class%"
138+
arguments:["%mailer.transport%"]
139139
140140
..code-block::xml
141141

‎components/dependency_injection/parentservices.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The service config for these classes would look something like this:
6262
my_email_formatter:
6363
# ...
6464
newsletter_manager:
65-
class:"%newsletter_manager.class%"
65+
class:"%newsletter_manager.class%"
6666
calls:
6767
-[setMailer, ["@my_mailer"]]
6868
-[setEmailFormatter, ["@my_email_formatter"]]
@@ -196,7 +196,7 @@ a parent for a service.
196196
-[setEmailFormatter, ["@my_email_formatter"]]
197197
198198
newsletter_manager:
199-
class:"%newsletter_manager.class%"
199+
class:"%newsletter_manager.class%"
200200
parent:mail_manager
201201
202202
greeting_card_manager:
@@ -321,13 +321,13 @@ to the ``NewsletterManager`` class, the config would look like this:
321321
-[setEmailFormatter, ["@my_email_formatter"]]
322322
323323
newsletter_manager:
324-
class:"%newsletter_manager.class%"
324+
class:"%newsletter_manager.class%"
325325
parent:mail_manager
326326
calls:
327327
-[setMailer, ["@my_alternative_mailer"]]
328328
329329
greeting_card_manager:
330-
class:"%greeting_card_manager.class%"
330+
class:"%greeting_card_manager.class%"
331331
parent:mail_manager
332332
333333
..code-block::xml

‎components/dependency_injection/types.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Another possibility is just setting public fields of the class directly::
184184
my_mailer:
185185
# ...
186186
newsletter_manager:
187-
class:NewsletterManager
187+
class:NewsletterManager
188188
properties:
189189
mailer:"@my_mailer"
190190

‎cookbook/assetic/apply_to_option.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ An example configuration might look like this:
2020
assetic:
2121
filters:
2222
coffee:
23-
bin:/usr/bin/coffee
24-
node:/usr/bin/node
25-
node_paths:[/usr/lib/node_modules/]
23+
bin:/usr/bin/coffee
24+
node:/usr/bin/node
25+
node_paths:[/usr/lib/node_modules/]
2626
2727
..code-block::xml
2828
@@ -130,10 +130,10 @@ applied to all ``.coffee`` files:
130130
assetic:
131131
filters:
132132
coffee:
133-
bin:/usr/bin/coffee
134-
node:/usr/bin/node
135-
node_paths:[/usr/lib/node_modules/]
136-
apply_to:"\.coffee$"
133+
bin:/usr/bin/coffee
134+
node:/usr/bin/node
135+
node_paths:[/usr/lib/node_modules/]
136+
apply_to:"\.coffee$"
137137
138138
..code-block::xml
139139

‎cookbook/assetic/uglifyjs.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ your JavaScripts:
7575
7676
<!-- app/config/config.xml-->
7777
<assetic:config>
78+
<!-- bin: the path to the uglifyjs executable-->
7879
<assetic:filter
7980
name="uglifyjs2"
8081
bin="/usr/local/bin/uglifyjs" />
@@ -86,6 +87,7 @@ your JavaScripts:
8687
$container->loadFromExtension('assetic', array(
8788
'filters' => array(
8889
'uglifyjs2' => array(
90+
// the path to the uglifyjs executable
8991
'bin' => '/usr/local/bin/uglifyjs',
9092
),
9193
),

‎cookbook/bundles/override.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ in the core FrameworkBundle:
5353
5454
# app/config/config.yml
5555
parameters:
56-
translator.class:Acme\HelloBundle\Translation\Translator
56+
translator.class:Acme\HelloBundle\Translation\Translator
5757
5858
..code-block::xml
5959

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp