Merge pull request #8198 from vespa-engine/7

7 MERGEOK

5 files changed, 2 insertions, 48 deletions

diff --git a/config-model/src/test/examples/disksummary.sd b/config-model/src/test/examples/disksummary.sd
deleted file mode 100644
index 766f0e0d2e1..00000000000
--- a/config-model/src/test/examples/disksummary.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-search disksummary {
-
-  document disksummary {
-
-      field inmemory type string {
-          indexing: attribute | summary
-      }
-      field ondisk type string {
-          indexing: index | summary
-      }
-
-  }
-
-}
\ No newline at end of file
diff --git a/config-model/src/test/examples/disksummaryexplicit.sd b/config-model/src/test/examples/disksummaryexplicit.sd
deleted file mode 100644
index b0179e04801..00000000000
--- a/config-model/src/test/examples/disksummaryexplicit.sd
+++ /dev/null
@@ -1,18 +0,0 @@
-search disksummary {
-
-  document disksummary {
-
-      field inmemory type string {
-          indexing: attribute | summary
-      }
-      field ondisk type string {
-          indexing: index | summary
-      }
-
-  }
-
-  document-summary default {
-      from-disk
-  }
-
-}
\ No newline at end of file
diff --git a/config-model/src/test/examples/indexsettings.sd b/config-model/src/test/examples/indexsettings.sd
index 6832527f86e..9f6b02d9a4d 100644
--- a/config-model/src/test/examples/indexsettings.sd
+++ b/config-model/src/test/examples/indexsettings.sd
@@ -6,7 +6,7 @@ search indexsettings {
   document indexsettings {
 
     field allstemmed type string {
-        stemming: all
+        stemming: shortest
     }
 
     field usingdefault type string {
diff --git a/config-model/src/test/examples/memorysummary.sd b/config-model/src/test/examples/memorysummary.sd
deleted file mode 100644
index 79be30bc0fd..00000000000
--- a/config-model/src/test/examples/memorysummary.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-search memorysummary {
-
-  document memorysummary {
-
-      field inmemory type string {
-          indexing: attribute | summary
-      }
-      field ondisk type string {
-          indexing: index # no summary, so ignored
-      }
-
-  }
-
-}
\ No newline at end of file
diff --git a/config-model/src/test/examples/stemmingsetting.sd b/config-model/src/test/examples/stemmingsetting.sd
index 3780dfb3699..51864193174 100644
--- a/config-model/src/test/examples/stemmingsetting.sd
+++ b/config-model/src/test/examples/stemmingsetting.sd
@@ -25,7 +25,7 @@ search stemmingsetting {
 
     field backward type string {
       indexing: index
-      stemming: all
+      stemming: shortest
     }
   }