Merge branch 'master' of github.com:MapCreatorEU/api-docs

Author: Kevin Richter

Jenkinsfile

@@ -13,22 +13,24 @@ node('node') {
     sh 'bundle exec middleman build --clean'
   }
 
-  stage('deploy') {
-    def deploy = new Deploy(steps)
-    deploy.initialize(
-      '/var/www/',
-      'maps4news-docs',
-      'master',
-      BUILD_NUMBER,
-      'f206c873-8c0b-481e-9c72-1ecb97a5213a',
-      'deploy',
-      '54.246.191.92',
-      false
-    )
+  if (BRANCH_NAME in ['master']) {
+    stage('deploy') {
+      def deploy = new Deploy(steps)
+      deploy.initialize(
+        '/var/www/',
+        'maps4news-docs',
+        'master',
+        BUILD_NUMBER,
+        'f206c873-8c0b-481e-9c72-1ecb97a5213a',
+        'deploy',
+        '54.246.191.92',
+        false
+      )
 
-    deploy.prepare()
-    deploy.copy('./build/*')
-    deploy.finish()
+      deploy.prepare()
+      deploy.copy('./build/*')
+      deploy.finish()
+    }
   }
 
   stage('cleanup') {

source/v1/api.html.md

@@ -110,7 +110,7 @@ The available operators are:
  - `<=`: Smaller than or equals operator
  - `^`: Starts with operator
  - `$`: Ends with operator
- - Or no operator, that will result in a `LIKE` statement
+ - `~`: Or no operator, that will result in a `LIKE` statement
 
 # Keywords