← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~paul-lucas/zorba/bug-994919 into lp:zorba

 

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-994919 into lp:zorba.

Requested reviews:
  Paul J. Lucas (paul-lucas)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #994919 in Zorba: "Typos in full-text module documentation and other places"
  https://bugs.launchpad.net/zorba/+bug/994919

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-994919/+merge/104819

Fixed typos.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-994919/+merge/104819
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/com/zorba-xquery/www/modules/full-text.xq'
--- modules/com/zorba-xquery/www/modules/full-text.xq	2012-04-27 13:46:55 +0000
+++ modules/com/zorba-xquery/www/modules/full-text.xq	2012-05-05 00:25:21 +0000
@@ -440,7 +440,7 @@
 (:~
  : Gets the current
  : <a href="http://www.w3.org/TR/xmlschema-2/#language";>language</a>:
- : either the langauge specified by the
+ : either the language specified by the
  : <code><a href="http://www.w3.org/TR/xpath-full-text-10/#doc-xquery10-FTOptionDecl";>declare ft-option using</a>
  : <a href="http://www.w3.org/TR/xpath-full-text-10/#ftlanguageoption";>language</a></code>
  : statement (if any)
@@ -815,7 +815,7 @@
  : Gets properties of the tokenizer for the given
  : <a href="http://www.w3.org/TR/xmlschema-2/#language";>language</a>.
  :
- : @param $lang The langauage of the tokenizer to get the properties of.
+ : @param $lang The language of the tokenizer to get the properties of.
  : @return said properties.
  : @error err:FTST0009 if <code>$lang</code> is not supported.
  : tokenization specifically.

=== modified file 'src/runtime/json/common.h'
--- src/runtime/json/common.h	2012-05-02 15:37:46 +0000
+++ src/runtime/json/common.h	2012-05-05 00:25:21 +0000
@@ -63,7 +63,7 @@
   return o;
 }
 DEF_OMANIP2( if_do_impl, bool, std_omanip_type )
-// A macro with a !! is used to supporess a warning from MSVC++.
+// A macro with a !! is used to suppress a warning from MSVC++.
 #define if_do(EXPR,FN) if_do_impl( !!(EXPR), (FN) )
 
 #define if_indent(WS,FN) if_do( (WS) == whitespace::indent, FN )
@@ -74,7 +74,7 @@
   return o;
 }
 DEF_OMANIP2( if_emit_impl, bool, char )
-// A macro with a !! is used to supporess a warning from MSVC++.
+// A macro with a !! is used to suppress a warning from MSVC++.
 #define if_emit(EXPR,C) if_emit_impl( !!(EXPR), (C) )
 
 ///////////////////////////////////////////////////////////////////////////////


Follow ups