From 52e897f3e2741d1303f3c6c3eb33cf129e2a8a36 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 4 Nov 2014 00:09:50 +0100
Subject: [PATCH] some cleanup

---
 CHANGELOG                                                     | 4 ++++
 js/apps/system/aardvark/frontend/js/arango/arango.js          | 2 +-
 js/apps/system/aardvark/frontend/js/views/applicationsView.js | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8b54b86ddc..f1e6c3f93d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -235,6 +235,10 @@ v2.3.0-beta (2014-11-01)
 v2.2.7 (XXXX-XX-XX)
 -------------------
 
+* fixed issue #998: Incorrect application URL for non-system Foxx apps
+
+* fixed issue #1079: AQL editor: keyword WITH in UPDATE query is not highlighted
+
 * fix memory leak in cluster nodes
 
 * fixed registration of AQL user-defined functions in Web UI (JS shell)
diff --git a/js/apps/system/aardvark/frontend/js/arango/arango.js b/js/apps/system/aardvark/frontend/js/arango/arango.js
index d61e1d1ab6..f79f3ba1cc 100644
--- a/js/apps/system/aardvark/frontend/js/arango/arango.js
+++ b/js/apps/system/aardvark/frontend/js/arango/arango.js
@@ -171,7 +171,7 @@
       $.ajax({
         type: "GET",
         cache: false,
-        url: "/_db/"+encodeURIComponent(currentDB)+"/_api/database/",
+        url: "/_db/"+ encodeURIComponent(currentDB) + "/_api/database/",
         contentType: "application/json",
         processData: false,
         async: false,
diff --git a/js/apps/system/aardvark/frontend/js/views/applicationsView.js b/js/apps/system/aardvark/frontend/js/views/applicationsView.js
index 9ebd57778f..e4edcf2074 100644
--- a/js/apps/system/aardvark/frontend/js/views/applicationsView.js
+++ b/js/apps/system/aardvark/frontend/js/views/applicationsView.js
@@ -69,7 +69,7 @@ window.ApplicationsView = Backbone.View.extend({
         'github-version',
         'Version (optional)',
         '',
-        'Example: v1.1.2 for Version 1.1.2 - if no version is commited, master is used',
+        'Example: v1.1.2 for version 1.1.2 - if no version is commited, master is used',
         'master',
         false,
         /[<>&'"]/