From 36b0703e8fceae74db1973a2b0e0c4d5b1482d3e Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <Raydiation@users.noreply.github.com>
Date: Mon, 8 Sep 2014 21:33:58 +0200
Subject: [PATCH 1/4] add easier script tag for templates

---
 developer_manual/app/js.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer_manual/app/js.rst b/developer_manual/app/js.rst
index f1e723cd6..ea9656596 100644
--- a/developer_manual/app/js.rst
+++ b/developer_manual/app/js.rst
@@ -9,7 +9,7 @@ The JavaScript files reside in the **js/** folder and should be included in the
 .. code-block:: php
 
   <?php
-  \OCP\Util::addScript('myapp', 'script');  // adds js/script.js
+  script('myapp', 'script');  // adds js/script.js
 
 The recommended JavaScript framework to use is `AngularJS <https://angularjs.org/#>`_. A nice tutorial screencast collection can be found on `Egghead.io <https://egghead.io/technologies/angularjs>`_
 
@@ -38,4 +38,4 @@ Full URLs can be genrated by using:
 
 .. code-block:: js
 
-    var authorUrl = OC.generateUrl('/apps/myapp/authors/1');
\ No newline at end of file
+    var authorUrl = OC.generateUrl('/apps/myapp/authors/1');

From 5bddf7bbd9939d966316cc3f92af3ce9ddd79655 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <Raydiation@users.noreply.github.com>
Date: Mon, 8 Sep 2014 21:38:27 +0200
Subject: [PATCH 2/4] easier style tag and html imports

---
 developer_manual/app/css.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/developer_manual/app/css.rst b/developer_manual/app/css.rst
index f06fe567c..5343af589 100644
--- a/developer_manual/app/css.rst
+++ b/developer_manual/app/css.rst
@@ -9,8 +9,15 @@ The CSS files reside in the **css/** folder and should be included in the templa
 .. code-block:: php
 
   <?php
-  \OCP\Util::addStyle('myapp', 'style');  // adds js/style.css
+  style('myapp', 'style');  // adds js/style.css
+  
+Web Components go into the **component/** folder and can be imported like this:
 
+.. code-block:: php
+
+  <?php
+  component('myapp', 'tabs');  // adds component/tabs.html
+  
 Standard layout
 ===============
 To use the commonly used layout consisting of sidebar navigation and content the **app-navigation** and **app-content** ids can be used:

From 3db28dd239eda4d634c6e184ef2fa4f99d7d0f90 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <Raydiation@users.noreply.github.com>
Date: Mon, 8 Sep 2014 21:59:22 +0200
Subject: [PATCH 3/4] Added hint for polyfills

---
 developer_manual/app/css.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/developer_manual/app/css.rst b/developer_manual/app/css.rst
index 5343af589..729c915ba 100644
--- a/developer_manual/app/css.rst
+++ b/developer_manual/app/css.rst
@@ -18,6 +18,8 @@ Web Components go into the **component/** folder and can be imported like this:
   <?php
   component('myapp', 'tabs');  // adds component/tabs.html
   
+.. note:: Keep in mind that Web Components are still very new and you `might need to add polyfills using Polymer <http://www.polymer-project.org/resources/compatibility.html>`_
+  
 Standard layout
 ===============
 To use the commonly used layout consisting of sidebar navigation and content the **app-navigation** and **app-content** ids can be used:

From d2b2743b0fe00eec7399c2745ccf2c5be440c009 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Tue, 9 Sep 2014 16:30:46 +0200
Subject: [PATCH 4/4] add docs for https://github.com/owncloud/core/pull/10964

---
 developer_manual/app/css.rst | 9 +++++++++
 developer_manual/app/js.rst  | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/developer_manual/app/css.rst b/developer_manual/app/css.rst
index 729c915ba..fe7d9f5ac 100644
--- a/developer_manual/app/css.rst
+++ b/developer_manual/app/css.rst
@@ -9,15 +9,24 @@ The CSS files reside in the **css/** folder and should be included in the templa
 .. code-block:: php
 
   <?php
+  // include one file
   style('myapp', 'style');  // adds js/style.css
+
+  // include multiple files for the same app
+  style('myapp', array('style', 'navigation'));  // adds js/style.css, js/navigation.css
   
 Web Components go into the **component/** folder and can be imported like this:
 
 .. code-block:: php
 
   <?php
+  // include one file
   component('myapp', 'tabs');  // adds component/tabs.html
   
+  // include multiple files for the same app
+  component('myapp', array('tabs', 'forms'));  // adds component/tabs.html, component/forms.html
+  
+  
 .. note:: Keep in mind that Web Components are still very new and you `might need to add polyfills using Polymer <http://www.polymer-project.org/resources/compatibility.html>`_
   
 Standard layout
diff --git a/developer_manual/app/js.rst b/developer_manual/app/js.rst
index ea9656596..63794b91b 100644
--- a/developer_manual/app/js.rst
+++ b/developer_manual/app/js.rst
@@ -9,8 +9,12 @@ The JavaScript files reside in the **js/** folder and should be included in the
 .. code-block:: php
 
   <?php
+  // add one file
   script('myapp', 'script');  // adds js/script.js
 
+  // add multiple files in the same app
+  script('myapp', array('script', 'navigation'));  //  adds js/script.js js/navigation.js
+
 The recommended JavaScript framework to use is `AngularJS <https://angularjs.org/#>`_. A nice tutorial screencast collection can be found on `Egghead.io <https://egghead.io/technologies/angularjs>`_
 
 Sending the CSRF token