Commita64f995

committed

Merge branch '6.0' into 6.1

* 6.0: Minor tweak [Standards] Freeze contractions decision in documentation standards

2 parentse7e5975 +a3c707c commita64f995Copy full SHA for a64f995

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,9 @@ In addition, documentation follows these rules:`
`190`	`190`	`* simply`
`191`	`191`	`* trivial`
`192`	`192`
	`193`	+* Contractions are allowed: e.g. you can write ``you would`` as well as ``you'd``,
	`194`	+ ``it is`` as well as ``it's``, etc.
	`195`	`+`
`193`	`196`	.. _`the Sphinx documentation`:https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#literal-blocks
`194`	`197`	.. _`Twig Coding Standards`:https://twig.symfony.com/doc/3.x/coding_standards.html
`195`	`198`	.. _`reserved by the IANA`:https://tools.ietf.org/html/rfc2606#section-3

Comments

(0)