Merge changes to alternate2 into merge-index-alternate2.html

Merged f00ed781899a82f4ecf216cc8b56beca64b969fd.
Minor fix

@container can also be @language