From 13c8fd45582c01a5b39c7dc8b08a572cdab31c7c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 3 Feb 2016 12:56:17 +0100
Subject: [PATCH 1/4] Remove invalid app user doc links

---
 apps/comments/appinfo/info.xml   | 3 ---
 apps/systemtags/appinfo/info.xml | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 550c79448cf..f3693150639 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -10,7 +10,4 @@
 	<dependencies>
 		<owncloud min-version="9.0" max-version="9.0" />
 	</dependencies>
-	<documentation>
-		<user>user-comments</user>
-	</documentation>
 </info>
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 5da945db703..d0b4c1fce00 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -10,9 +10,6 @@
 	<dependencies>
 		<owncloud min-version="9.0" max-version="9.0" />
 	</dependencies>
-	<documentation>
-		<user>user-systemtags</user>
-	</documentation>
 	<types>
 		<logging/>
 	</types>

From d79b0886d0ce10492c184041da05c75a17538ba1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 3 Feb 2016 12:56:42 +0100
Subject: [PATCH 2/4] Remove deprecated and unused standalone tag

---
 apps/dav/appinfo/info.xml   | 1 -
 apps/files/appinfo/info.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 3a38feab59e..f035d19d862 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -6,7 +6,6 @@
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
 	<version>0.1.4</version>
-	<standalone/>
 	<default_enable/>
 	<types>
 		<filesystem/>
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index c0db1783235..136baa2ed07 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,6 @@
 	<description>File Management</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman, Vincent Petry</author>
-	<standalone/>
 	<default_enable/>
 	<version>1.4.2</version>
 	<types>

From 78d5c89e860346e559b8b50bab07597b0c58ae5c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 3 Feb 2016 12:57:03 +0100
Subject: [PATCH 3/4] Make sure encryption has a valid licence tag

---
 apps/encryption/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 1fb4e93c508..970b58e3898 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -12,7 +12,7 @@
 		to enable server-side encryption.
 	</description>
 	<name>Default encryption module</name>
-	<license>AGPL</license>
+	<licence>AGPL</licence>
 	<author>Bjoern Schiessle, Clark Tomlinson</author>
 	<documentation>
 		<user>user-encryption</user>

From 599eb141b482f4fd4b0506116cdbd431a29d1a23 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 3 Feb 2016 12:57:22 +0100
Subject: [PATCH 4/4] Make sure tests don't leave a stray directory behind

---
 tests/lib/appframework/AppTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 7cba0e6db6b..3d41d6590aa 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -79,9 +79,9 @@ class AppTest extends \Test\TestCase {
 		$this->container['OCP\\AppFramework\\Http\\IOutput'] = $this->io;
 		$this->container['urlParams'] = array();
 
-		$this->appPath = __DIR__ . '/../../../apps/namespacetestapp/appinfo';
-		$infoXmlPath = $this->appPath . '/info.xml';
-		mkdir($this->appPath, 0777, true);
+		$this->appPath = __DIR__ . '/../../../apps/namespacetestapp';
+		$infoXmlPath = $this->appPath . '/appinfo/info.xml';
+		mkdir($this->appPath . '/appinfo', 0777, true);
 
 		$xml = '<?xml version="1.0" encoding="UTF-8"?>' .
 		'<info>' .