Commit Graph

50 Commits

Author SHA1 Message Date
Vijay Dev
41231ef6c6 Merge branch 'master' of github.com:rails/docrails
Conflicts:
	actionpack/lib/action_controller/metal/mime_responds.rb
	actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb
	activerecord/lib/active_record/type/value.rb
2014-08-19 16:28:53 +00:00
yuuji.yaginuma
2ba1670f37 [ci skip] Fix sample code in Layouts and Rendering guide 2014-08-17 22:42:03 +09:00
Hendy Tanata
71c7fd1013 Uppercase HTML in docs.
[skip ci]
2014-08-08 14:27:05 -07:00
Anton Cherepanov
e2960fb293 Small typo 2014-06-23 23:15:58 +06:00
John Kelly Ferguson
d02c810e29 Rename Posts to Articles in Guides, continuation of 2d446e77 / #13774 [ci skip] 2014-05-21 23:01:45 -04:00
Prem Sichanugrist
ed88a601f7
Do note remove Content-Type when render :body
`render :body` should just not set the `Content-Type` header. By
removing the header, it breaks the compatibility with other parts.

After this commit, `render :body` will returns `text/html` content type,
sets by default from `ActionDispatch::Response`, and it will preserve
the overridden content type if you override it.

Fixes #14197, #14238

This partially reverts commit 3047376870d4a7adc7ff15c3cb4852e073c8f1da.
2014-03-05 10:33:52 -05:00
Prem Sichanugrist
76be30fe40 Update guides for new rendering options
* Introduces `:plain`, `:html`, `:body` render option.
* Update guide to use `render :plain` instead of `render :text`.
2014-02-18 12:11:41 -05:00
Vijay Dev
72e11abeaf Simplify doc [ci skip]
The `as` option was already explained in a previous example
and doesn't need to be repeated. Explain only the `locals` option
which the example is meant for.
2014-02-09 23:58:09 +05:30
Vijay Dev
ccd908f9ce Merge pull request #13630 from seapy/master
Fixed typo [ci skip]
2014-02-09 23:51:46 +05:30
leriksen
951bb848be [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users 2014-01-10 12:08:17 +11:00
seapy
6c252b5cb9 Fixed typo [ci skip]
singular is more suited to
2014-01-08 21:57:25 +09:00
Kuldeep Aggarwal
e10f91000b Improved documents [ci skip] 2013-12-14 22:49:00 +05:30
Akshay Vishnoi
ef0f633c66 Typo and grammatical fixes [ci skip] 2013-12-02 19:35:02 +05:30
Juanito Fatas
825e350faa [ci skip] Fix curl response output and use strong parameters in update action. 2013-11-13 02:33:04 +08:00
Satoshi Ebisawa
c883fedc47 Fix status code in documents [ci skip]
RFC 6585 Additional HTTP Status Codes
http://www.ietf.org/rfc/rfc6585.txt
2013-08-01 17:17:45 +09:00
blahedo
726530689e Cleaned up wording and tags.
Replaced <br /> with <br> for consistency; Added note about
singular/plural distinction (which was previously confusing to a Rails
noob); Rephrased explanation of how form is routed to controller, again
to reduce confusion; and added explanation to replace incorrect link.
[ci skip]
2013-07-06 18:36:23 -04:00
Cristian Planas
93fd780a88 Using preferred find_by syntax in guides 2013-07-01 01:38:46 +02:00
Carlos Antonio da Silva
bd277ac6ef Fix layouts and rendering guide example using flash.now instead
Thanks @lintzchiang. [ci skip]
2013-06-28 09:08:24 -03:00
Chase DuBois
b1286d3918 Align table of HTTP status codes with set supported by current Rack 2013-04-14 16:33:41 -07:00
Chase DuBois
1ed40d7c2e Clarify arguments of head method 2013-04-14 13:37:30 -07:00
Prathamesh Sonpatki
be1af1b896 Fixed typo [ci skip] 2013-04-15 00:34:29 +05:30
Iain Beeston
5495bac354 Tried to make the response status code table more readable
By making it the last thing in it's section and adding pseudo row headers
2013-04-14 18:30:53 +10:00
Iain Beeston
800d3427a5 Added a table of html status symols 2013-04-07 08:11:54 +10:00
Weston Platter
af8a788ab7 [layout/rendering guide] move sentence to new line to follow convention in other guides. 2013-04-04 00:11:21 -05:00
Weston Platter
5282a8243a [layout/rendering guide] remove redundant wording 2013-04-03 23:48:06 -05:00
Limon Lin
6e0aafbba2 Should be a symbol not string to defer the choice of layout.
[ci skip]
2013-03-15 13:14:26 +08:00
Brian Kim
f9f6fc7a91 Fix bug in code example from layouts and rendering guide
The code in 2.3.2 assumed that render has an alert option like
redirect_to to create a flash alert message, but it doesn't.
2013-02-18 14:27:25 -05:00
virusman
921305b0c8 Remove old asset tags API from docs, reflecting changes from #7900 2013-01-23 00:24:01 +04:00
Vijay Dev
f049016cd3 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	guides/source/getting_started.md
2013-01-09 01:04:15 +05:30
Gosha Arinich
0acf92184d prefer american spelling of 'behavior' 2013-01-07 11:47:27 +03:00
Amparo Luna + Guillermo Iguaran
03ac174f2d Change guides to use update instead of update_attributes 2013-01-03 12:04:25 -05:00
Marek Ovečka
06c7ecb4ef Update guides/source/layouts_and_rendering.md
Removed first slash. The subdirectory will nto be found with slash befor it.
2012-12-30 15:07:36 +01:00
Steve Klabnik
ed78770b1a Remove references to Rails versions.
There's no reason for guides to reference old behaviors. They should
be current as of the versions of Rails that they ship with, and including
older information just clutters thing.

I discussed this change with @fxn and he agrees.
2012-12-07 23:20:35 -08:00
Katie Oldaker
7c05ea23a0 Fixed grammar in a lot of guide prologues. 2012-12-07 12:50:09 -05:00
Steve Klabnik
d16a1b9e8b Normalize on 'After reading this guide, you will know:'
We have three or four different introduction sentences to the guides.
After this commit, we use the same one everywhere.
2012-11-29 14:25:02 -08:00
Steve Klabnik
6dcae8ae9c Add periods to the bullet points in guides.
Talked with @fxn about this. Bullet points should have periods at the ends.
2012-11-29 05:14:08 -08:00
Agis Anastasopoulos
fe30769181 Switch to 1.9 hash syntax 2012-11-16 12:22:22 +02:00
comptrol
ebc18cf291 Fixed the wrong terminology usage in 2.2.2 2012-11-03 15:32:23 +02:00
Henrik N
cc5dfccdda AJAX -> Ajax in layouts_and_rendering guide.
Fixed in the JS guide in 8c38172ba59e16d8e523ac4f1c5ae29b6851d3ee
2012-10-25 13:46:11 +02:00
Rafael Mendonça França
9eeb00976d Revert "divided into folder with the language"
This reverts commit f5b9ed4fbc3215a5fce48985ea372ad3f1182252.

REASON: Translation work can not be done in the docrails repository
2012-10-17 10:15:55 -03:00
Rodrigo Martins
f5b9ed4fbc divided into folder with the language 2012-10-17 03:34:10 -03:00
Prem Sichanugrist
fd56c3a72e Fix broken and duplicate headings 2012-09-17 15:55:17 -04:00
Prem Sichanugrist
721afdcc4b Fix remaining formatting problems in the guide 2012-09-17 15:54:23 -04:00
Prem Sichanugrist
9873dd800b Convert all the links into Markdown format 2012-09-17 15:54:23 -04:00
Prem Sichanugrist
31ef4cf656 Convert all inline codes to Markdown syntax 2012-09-17 15:54:23 -04:00
Prem Sichanugrist
21a0b20e39 change shell to bash 2012-09-17 15:54:22 -04:00
Prem Sichanugrist
c89c163a0e Convert inline code tags to Markdown 2012-09-17 15:54:22 -04:00
Prem Sichanugrist
872b7af337 Convert heading tags and heading section 2012-09-17 15:54:22 -04:00
Prem Sichanugrist
7bc1ca3515 Convert code blocks into GFM style 2012-09-17 15:54:22 -04:00
Prem Sichanugrist
5137d03cc5 Rename the rest of the guides to Markdown 2012-09-17 15:54:22 -04:00