com presentations: s/сергій/ сергий: slides/mongodb/locale -words1.xml slides/mongodb/locale-words2.xml slides /mongodb/locale-words3.xml slides/mongodb/locale-words4 .xml slides/mongodb/locale-words5.xml

Commit:    05d871a518d4fc6d5eb38ac26d5cee8f825204e1
Author:    Derick Rethans <[email protected]>         Mon, 13 Apr 2015 12:07:40 +0100
Parents:   eedd59c121d6e78c50098ea07ca015d67a59f218
Branches:  master

Link:       http://git.php.net/?p=presentations.git;a=commitdiff;h=05d871a518d4fc6d5eb38ac26d5cee8f825204e1

Log:
s/сергій/сергий

Changed paths:
  M  slides/mongodb/locale-words1.xml
  M  slides/mongodb/locale-words2.xml
  M  slides/mongodb/locale-words3.xml
  M  slides/mongodb/locale-words4.xml
  M  slides/mongodb/locale-words5.xml


Diff:
diff --git a/slides/mongodb/locale-words1.xml b/slides/mongodb/locale-words1.xml
index a1e1714..5a47b10 100644
--- a/slides/mongodb/locale-words1.xml
+++ b/slides/mongodb/locale-words1.xml
@@ -5,7 +5,7 @@
 <div effect="fade-out">
 <list>
 	<bullet>bailey</bullet>
-	<bullet>сергій</bullet>
+	<bullet>сергий</bullet>
 	<bullet>boffey</bullet>
 	<bullet>brown</bullet>
 	<bullet>svere</bullet>
@@ -22,7 +22,7 @@
 { "_id" : ObjectId("53fc721844670a35498b4569"), "word" : "böhm" }
 { "_id" : ObjectId("53fc721844670a35498b456a"), "word" : "brown" }
 { "_id" : ObjectId("53fc721844670a35498b456b"), "word" : "серге́й" }
-{ "_id" : ObjectId("53fc721844670a35498b456c"), "word" : "сергій" }
+{ "_id" : ObjectId("53fc721844670a35498b456c"), "word" : "сергий" }
 { "_id" : ObjectId("53fc721844670a35498b456d"), "word" : "swag" }
 { "_id" : ObjectId("53fc721844670a35498b456e"), "word" : "svere" }
 </example>
@@ -40,7 +40,7 @@ es:PRIMARY> db.collate.find( {}, { _id: 0, word: 1 }).sort( { word:1 } ).pretty(
 { "word" : "svere" }
 { "word" : "swag" }
 { "word" : "серге́й" }
-{ "word" : "сергій" }
+{ "word" : "сергий" }
 </example>
 </div>
 
diff --git a/slides/mongodb/locale-words2.xml b/slides/mongodb/locale-words2.xml
index 5377d47..25088f3 100644
--- a/slides/mongodb/locale-words2.xml
+++ b/slides/mongodb/locale-words2.xml
@@ -2,11 +2,11 @@
 <title>Different Cultures → Different Sorting</title>
 
 <list>
-	<bullet>*English:*<br/>bailey boffey brown böhm svere swag серге́й сергій</bullet>
-	<bullet>*German:*<br/>bailey böhm boffey brown svere swag серге́й сергій</bullet>
-	<bullet>*Swedish (1):*<br/>bailey boffey brown böhm swag svere серге́й сергій</bullet>
-	<bullet>*Swedish (2):*<br/>bailey boffey brown böhm svere swag серге́й сергій</bullet>
-	<bullet>*Russian:*<br />серге́й сергій bailey boffey böhm brown svere swag</bullet>
+	<bullet>*English:*<br/>bailey boffey brown böhm svere swag серге́й сергий</bullet>
+	<bullet>*German:*<br/>bailey böhm boffey brown svere swag серге́й сергий</bullet>
+	<bullet>*Swedish (1):*<br/>bailey boffey brown böhm swag svere серге́й сергий</bullet>
+	<bullet>*Swedish (2):*<br/>bailey boffey brown böhm svere swag серге́й сергий</bullet>
+	<bullet>*Russian:*<br />серге́й сергий bailey boffey böhm brown svere swag</bullet>
 </list>
 
 <div effect="fade-in">
diff --git a/slides/mongodb/locale-words3.xml b/slides/mongodb/locale-words3.xml
index 076566d..029e6d4 100644
--- a/slides/mongodb/locale-words3.xml
+++ b/slides/mongodb/locale-words3.xml
@@ -4,7 +4,7 @@
 <example result="3"><![CDATA[
 <?php
 $words = [
-    'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергій', 'swag', 'svere'
+    'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергий', 'swag', 'svere'
 ];
 
 $collator = new Collator( 'sv@collation=standard' );
diff --git a/slides/mongodb/locale-words4.xml b/slides/mongodb/locale-words4.xml
index 771a176..690bc57 100644
--- a/slides/mongodb/locale-words4.xml
+++ b/slides/mongodb/locale-words4.xml
@@ -4,7 +4,7 @@
 <example result="3"><![CDATA[
 <?php
 $words = [
-    'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергій', 'swag', 'svere'
+    'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергий', 'swag', 'svere'
 ];
 
 $collator = new Collator( 'sv@collation=default' );
diff --git a/slides/mongodb/locale-words5.xml b/slides/mongodb/locale-words5.xml
index e8eb6a6..f668afe 100644
--- a/slides/mongodb/locale-words5.xml
+++ b/slides/mongodb/locale-words5.xml
@@ -2,7 +2,7 @@
 <title>Locale Based Sorting (1)</title>
 
 <example result="2"><![CDATA[<?php
-$words = [ 'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергій', 'swag', 'svere' ];
+$words = [ 'bailey', 'boffey', 'böhm', 'brown', 'серге́й', 'сергий', 'swag', 'svere' ];
 $collations = [ 'de_DE@collation=phonebook', 'sv@collation=standard', 'ru' ];
 
 $m = new MongoClient;