diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
index c704d37..92c7377 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/TimelineServer.apt.vm
@@ -102,6 +102,43 @@ YARN Timeline Server
yarn.timeline-service.handler-thread-count
10
+
+
+ Enables cross-origin support (CORS) for web services where
+ cross-origin web response headers are needed. For example, javascript making
+ a web services request to the timeline server.
+ yarn.timeline-service.http-cross-origin.enabled
+ false
+
+
+
+ Comma separated list of origins that are allowed for web
+ services needing cross-origin (CORS) support. Wildcards (*) and patterns
+ allowed
+ yarn.timeline-service.http-cross-origin.allowed-origins
+ *
+
+
+
+ Comma separated list of methods that are allowed for web
+ services needing cross-origin (CORS) support.
+ yarn.timeline-service.http-cross-origin.allowed-methods
+ GET,POST,HEAD
+
+
+
+ Comma separated list of headers that are allowed for web
+ services needing cross-origin (CORS) support.
+ yarn.timeline-service.http-cross-origin.allowed-headers
+ X-Requested-With,Content-Type,Accept,Origin
+
+
+
+ The number of seconds a pre-flighted request can be cached
+ for web services needing cross-origin (CORS) support.
+ yarn.timeline-service.http-cross-origin.max-age
+ 1800
+
+---+
* Generic-data related Configuration