exchanged apps.owncloud.com for marketplace.owncloud.com

page-connect.php

@@ -39,7 +39,7 @@
         <div class="col-md-12">
         <h3>How are ownCloud Proxy and the ownCloud Server Appliance different than ownCloud?</h3>
         <p>The ownCloud Server appliance contains the ownCloud server, an OS and a database, provided in a pre-configured, easy to download, fast to set up package. ownCloud Proxy is an app inside the ownCloud appliance that enables an admin to sign up for and manage use of the ownCloud Proxy Service. This service is simply a connection broker that connects users outside of a network firewall to an ownCloud instance behind the firewall, with no special configuration required.</p>
-        <p>Of course, if you already have ownCloud 8.1 up and running, the ownCloud Proxy app is available in <a href="https://apps.owncloud.com/content/show.php?content=173903">the ownCloud app store</a> and can be installed easily in an existing ownCloud instance to achieve the same overall result.</p>
+        <p>Of course, if you already have ownCloud 8.1 up and running, the ownCloud Proxy app is available in <a href="https://marketplace.owncloud.com/content/show.php?content=173903">the ownCloud app store</a> and can be installed easily in an existing ownCloud instance to achieve the same overall result.</p>
         </div>
         <div class="col-md-12">
         <h3>What if I Want to Disconnect my ownCloud Proxy Account?</h3>

page-eight-one.php

@@ -154,7 +154,7 @@
 			<div class="col-md-4 featureblock">
 				<img class="thumbnail" alt="Updates" src="<?php bloginfo('template_directory'); ?>/assets/img/features/store.png" />
 				<h3 class="featuretitle">Experimental apps</h3></br>
-				<p class="featuredesc">The built in app store now has the ability to install all apps from the <a href="https://apps.owncloud.com">online app store</a>, including the apps not yet approved and verified. This comes, of course, at a security- and stability risk, which the administrator should be aware off.</p>
+				<p class="featuredesc">The built in app store now has the ability to install all apps from the <a href="https://marketplace.owncloud.com">online app store</a>, including the apps not yet approved and verified. This comes, of course, at a security- and stability risk, which the administrator should be aware off.</p>
 			</div>
 		</div>
 

page-eight-two.php

@@ -108,7 +108,7 @@
 			<div class="col-md-4 featureblock">
 				<img class="thumbnail" alt="notification" src="<?php bloginfo('template_directory'); ?>/assets/img/features/notification.png" />
 				<h3 class="featuretitle">Notification Mechanism</h3></br>
-				<p class="featuredesc">ownCloud now offers a notification window where an admin can push notifications out to users of the ownCloud system, such as notification about a maintenance window. This is currently only in the web interface but future mobile and desktop client releases will incorporate the notification feature. There is an <a href="https://apps.owncloud.com/content/show.php?content=173921">Announcement Center App in the app store</a> for sending system wide notifications.</p>
+				<p class="featuredesc">ownCloud now offers a notification window where an admin can push notifications out to users of the ownCloud system, such as notification about a maintenance window. This is currently only in the web interface but future mobile and desktop client releases will incorporate the notification feature. There is an <a href="https://marketplace.owncloud.com/content/show.php?content=173921">Announcement Center App in the app store</a> for sending system wide notifications.</p>
 			</div>
 
 			<div class="col-md-4 featureblock">

page-faq.php

@@ -326,7 +326,7 @@
 <p>If you have made modifications, contributing these to ownCloud is sufficient from our point of view. If you don't want or can't do that, you have to provide a way for users to download the modifications you made to ownCloud, including the modifications. Providing, upon request, a tarball, zip file or github repository is enough. Make sure they contain the copyright notice; the code has to be under the AGPLv3 or a compatible license like the <a href="https://opensource.org/licenses/MIT" target="_blank">MIT license</a>.</p>
 <p>Some examples:</p>
 <ul>
-<li>ownCloud apps (ownCloud apps like the calendar or music app from <a href="https://apps.owncloud.com" target="_blank">apps.owncloud.com</a>, as you would write following <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>/app/" target="_blank">the App Developer documentation</a>, using the public but internal API) are considered an integral part of ownCloud; writing an ownCloud app is thus considered modifying ownCloud and your ownCloud apps are subject to the requirements of the AGPLv3. The ownCloud <a href="#entcomparison">Enterprise Edition</a> provides <a href="#closedapps">an exception</a> as it is available under a proprietary license.</li>
+<li>ownCloud apps (ownCloud apps like the calendar or music app from <a href="https://marketplace.owncloud.com" target="_blank">apps.owncloud.com</a>, as you would write following <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>/app/" target="_blank">the App Developer documentation</a>, using the public but internal API) are considered an integral part of ownCloud; writing an ownCloud app is thus considered modifying ownCloud and your ownCloud apps are subject to the requirements of the AGPLv3. The ownCloud <a href="#entcomparison">Enterprise Edition</a> provides <a href="#closedapps">an exception</a> as it is available under a proprietary license.</li>
 <li>External apps like mobile or desktop clients, or apps running on another server and otherwise not part of ownCloud but using the external ownCloud OCS API as <a href="<?php echo $DOCUMENTATION_DEVELOPER; ?>/core/externalapi.html" target="_blank">you would find here</a> are NOT subject to the AGPLv3 and can be under any license you like.</li>
 <li>Artwork is not subject to the AGPLv3: you can have a branded ownCloud installation, with modified logo, colors etcetera. You do NOT have to release your logo or other artwork under the AGPLv3.</li>
 <li>If you use ownCloud yourself (as private user or company!) and do not give third parties access to its user interface or API's (like webDAV), the AGPLv3 sharing clause does not come into effect. In general, note that you are only ever obliged to share the original source <em>upon request</em> with a third party who has been given <em>access to your ownCloud instance</em>. You must merely make sure that users are aware of this right.</li>

page-features.php

@@ -227,7 +227,7 @@
 	<div class="col-md-4 featureblock">
 		<img class="thumbnail" alt="something" src="<?php bloginfo('template_directory'); ?>/assets/img/features/avatar.png" />
 		<h3 class="featuretitle">Play music, watch movies, store passwords</h3>
-		<p class="featuredesc">Use the Music app to listen to your songs, securely store your passwords in Passman and stream your movies with the Streaming app. Simply enable <a href="https://apps.owncloud.com" target="_blank">one of over 250 applications</a> in the built in ownCloud App store.</p>
+		<p class="featuredesc">Use the Music app to listen to your songs, securely store your passwords in Passman and stream your movies with the Streaming app. Simply enable <a href="https://marketplace.owncloud.com" target="_blank">one of over 250 applications</a> in the built in ownCloud App store.</p>
 	</div>
 </div>
 

page-install.php

@@ -30,7 +30,7 @@
     <h3><i class="icon-globe"></i> Extend your cloud</h3>
     <p>Browse hundreds of free apps and connect services you use to ownCloud:</p>
      <div class="btn-group">
-        <a class="btn btn-default btn-lg" role="button" href="https://apps.owncloud.com" target="_blank" rel="tooltip" title="The ownCloud Appstore">ownCloud Apps</a>
+        <a class="btn btn-default btn-lg" role="button" href="https://marketplace.owncloud.com" target="_blank" rel="tooltip" title="The ownCloud Appstore">ownCloud Apps</a>
         <a class="btn btn-default btn-lg" role="button" href="https://github.com/owncloud/core/wiki/Apps" target="_blank" rel="tooltip" title="3rd Party App List on the ownCloud Wiki">3rd Party Apps</a>
       </div>
   </div>

page-nine.php

@@ -93,7 +93,7 @@
 		<div class="row">
 			<div class="col-md-3"><a href="https://owncloud.org/blog/about-activities-and-notifications-in-owncloud/" title="Learn more about notifications" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/notifications.png" style="width: 100%" alt="..." class="img-thumbnail"></a></div>
 			<div class="col-md-3"><a href="https://owncloud.org/blog/owncloud-9-0-boosts-team-collaboration/" title="Learn more about comments and tags" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/collaboration_blog.png" style="width: 100%" alt="..." class="img-thumbnail"></a></div>
-			<div class="col-md-3"><a href="https://apps.owncloud.com" title="See some ownCloud Apps" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/apps.png" style="width: 100%" alt="..." class="img-thumbnail"></a></div>
+			<div class="col-md-3"><a href="https://marketplace.owncloud.com" title="See some ownCloud Apps" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/apps.png" style="width: 100%" alt="..." class="img-thumbnail"></a></div>
 		</div>
 		<div class="row">
 			<div class="col-md-3"><a href="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/receiving-notification.png" title="Notifications" target="_blank"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/screenshots/server/nine/receiving-notification-wee.png" style="width: 100%" alt="..."></a></div>

page-super-secret.php

@@ -108,7 +108,7 @@
 			<div class="col-md-4 featureblock">
 				<img class="thumbnail" alt="notification" src="<?php bloginfo('template_directory'); ?>/assets/img/features/notification.png" />
 				<h3 class="featuretitle">Notification Mechanism</h3></br>
-				<p class="featuredesc">ownCloud now offers a notification window where an admin can push notifications out to users of the ownCloud system, such as notification about a maintenance window. This is currently only in the web interface but future mobile and desktop client releases will incorporate the notification feature. There is an <a href="https://apps.owncloud.com/content/show.php?content=173921">Announcement Center App in the app store</a> for sending system wide notifications.</p>
+				<p class="featuredesc">ownCloud now offers a notification window where an admin can push notifications out to users of the ownCloud system, such as notification about a maintenance window. This is currently only in the web interface but future mobile and desktop client releases will incorporate the notification feature. There is an <a href="https://marketplace.owncloud.com/content/show.php?content=173921">Announcement Center App in the app store</a> for sending system wide notifications.</p>
 			</div>
 
 			<div class="col-md-4 featureblock">

page-support.php

@@ -67,7 +67,7 @@
 
 <!--
 
-<p>ownCloud is deployed in a wide variety of situations. Home users run it on a NAS or Raspberry Pi, using Calendar and Contact synchronization and many more of the <a href="https://apps.owncloud.com" target="_blank">more than 200 community apps</a>. Enterprises, research institutions and government agencies deploy it on large server parks, requiring integration in existing enterprise infrastructure like SAML, SharePoint, Windows network drives, S3 and more. In every case, <a href="/faq/#install" target="_blank">ownCloud Server is the same</a>.</p>
+<p>ownCloud is deployed in a wide variety of situations. Home users run it on a NAS or Raspberry Pi, using Calendar and Contact synchronization and many more of the <a href="https://marketplace.owncloud.com" target="_blank">more than 200 community apps</a>. Enterprises, research institutions and government agencies deploy it on large server parks, requiring integration in existing enterprise infrastructure like SAML, SharePoint, Windows network drives, S3 and more. In every case, <a href="/faq/#install" target="_blank">ownCloud Server is the same</a>.</p>
 <p>We provide information on how to install and maintain ownCloud for everybody <a href="htts://doc.owncloud.org" target="_blank">in our documentation</a>. When more resources are needed, private users can find help in our <a href="/faq/#install" target="_blank">community help channels</a> while professional users benefit from <a href="https://owncloud.com/resources" target="_blank">self help resources</a>, <a href="https://owncloud.com/features" target="_blank">enterprise functionality</a> and different <a href="https://owncloud.com/subscriptions" target="_blank">support options</a> from ownCloud GmbH</p>
 
 <hr>
@@ -108,7 +108,7 @@
     <tr>
       <td class="warning">Where do I find what I need to keep ownCloud running smoothly?</td>
       <td class="warning"><p>Find the knowledge you need to enjoy ownCloud in the <a href="https://doc.owncloud.org" target="_blank">documentation</a> and get more help from <a href="/faq/#install" target="_blank">other community resources</a> like social media, forum, IRC chat and so on.</p>
-      <p>Use and enjoy the many apps from our built in app store, or find even more on <a href="https://apps.owncloud.com" target="_blank">our app store</a>. Find <a href="<?php echo $DOCUMENTATION_ADMIN; ?>installation/apps_management_installation.html">documentation on handling Apps here</a>.
+      <p>Use and enjoy the many apps from our built in app store, or find even more on <a href="https://marketplace.owncloud.com" target="_blank">our app store</a>. Find <a href="<?php echo $DOCUMENTATION_ADMIN; ?>installation/apps_management_installation.html">documentation on handling Apps here</a>.
       </td>
       <td class="warning"><p>Find what you need to tune ownCloud performance and meet business requirements in our <a href="https://doc.owncloud.org" target="_blank">documentation</a> as well as the <a href="https://owncloud.com/resources" target="_blank">resources provided by ownCloud GmbH</a>.
 		<ul>