From 17761fae9bda457208ca71840d7b8f1f673a91b7 Mon Sep 17 00:00:00 2001
From: Jim <jsproch@fb.com>
Date: Thu, 5 Nov 2015 09:43:36 -0800
Subject: [PATCH] Merge pull request #5231 from davidkpiano/patch-1

Updating "JSX Gotchas" docs for Custom Attributes
(cherry picked from commit 22b8952fbf510f2f637c4e342bd86eac4208afaa)
---
 docs/docs/02.3-jsx-gotchas.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/docs/02.3-jsx-gotchas.md b/docs/docs/02.3-jsx-gotchas.md
index 6ab5d4ad56..10ae6bcf0c 100644
--- a/docs/docs/02.3-jsx-gotchas.md
+++ b/docs/docs/02.3-jsx-gotchas.md
@@ -61,6 +61,12 @@ If you pass properties to native HTML elements that do not exist in the HTML spe
 <div data-custom-attribute="foo" />
 ```
 
+However, arbitrary attributes are supported on custom elements (those with a hyphen in the tag name or an `is="..."` attribute).
+
+```javascript
+<x-my-component custom-attribute="foo" />
+```
+
 [Web Accessibility](http://www.w3.org/WAI/intro/aria) attributes starting with `aria-` will be rendered properly.
 
 ```javascript