Merge pull request #1328 from dsyme/improve-1293

improve error message related to 1293

Author: KevinRansom

src/fsharp/FSComp.txt

@@ -464,7 +464,7 @@ tcUnexpectedConstByteArray,"Unexpected Const_bytearray"
 641,tcReturnValuesCannotHaveNames,"Return values cannot have names"
 tcMemberKindPropertyGetSetNotExpected,"MemberKind.PropertyGetSet only expected in parse trees"
 201,tcNamespaceCannotContainValues,"Namespaces cannot contain values. Consider using a module to hold your value declarations."
-644,tcNamespaceCannotContainExtensionMembers,"Namespaces cannot contain extension members except in the same file and namespace where the type is defined. Consider using a module to hold declarations of extension members."
+644,tcNamespaceCannotContainExtensionMembers,"Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined. Consider using a module to hold declarations of extension members."
 645,tcMultipleVisibilityAttributes,"Multiple visibility attributes have been specified for this identifier"
 646,tcMultipleVisibilityAttributesWithLet,"Multiple visibility attributes have been specified for this identifier. 'let' bindings in classes are always private, as are any 'let' bindings inside expressions."
 tcInvalidMethodNameForRelationalOperator,"The name '(%s)' should not be used as a member name. To define comparison semantics for a type, implement the 'System.IComparable' interface. If defining a static member for use from other CLI languages then use the name '%s' instead."

tests/fsharp/typecheck/sigs/neg16.bsl

@@ -1,5 +1,5 @@
 
-neg16.fs(7,13,7,16): typecheck error FS0644: Namespaces cannot contain extension members except in the same file and namespace where the type is defined. Consider using a module to hold declarations of extension members.
+neg16.fs(7,13,7,16): typecheck error FS0644: Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined. Consider using a module to hold declarations of extension members.
 
 neg16.fs(23,10,23,11): typecheck error FS0935: Types with the 'AllowNullLiteral' attribute may only inherit from or implement types which also allow the use of the null literal
 

tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeExtensions/basic/E_ExtensionInNamespace01.fs

@@ -2,7 +2,7 @@
 // Verify error associated with placing type extensions
 // inside namespaces. (They must only be placed in modules.)
 
-//<Expects id="FS0644" span="(10,17-10,32)" status="error">Namespaces cannot contain extension members except in the same file and namespace where the type is defined\. Consider using a module to hold declarations of extension members\.$</Expects>
+//<Expects id="FS0644" span="(10,17-10,32)" status="error">Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined\. Consider using a module to hold declarations of extension members\.$</Expects>
 
 namespace System
 

tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/TypeExtensions/optional/E_NotInModule.fs

@@ -1,6 +1,6 @@
 // #Regression #Conformance #ObjectOrientedTypes #TypeExtensions  
 // Verify that optional extension must be inside a module
-//<Expects id="FS0644" status="error" span="(9,20-9,35)">Namespaces cannot contain extension members except in the same file and namespace where the type is defined\. Consider using a module to hold declarations of extension members\.$</Expects>
+//<Expects id="FS0644" status="error" span="(9,20-9,35)">Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined\. Consider using a module to hold declarations of extension members\.$</Expects>
 
 namespace NS
     type Lib with