Update imports and module documentation

Recently, the qmldir syntax was modified to allow a module identifier
directive to be specified.  This allows us to guarantee that types
provided in that namespace are not overridden by other modules.

Given this fundamental change, the documentation needed to be updated
to reflect the new terminology surrounding imports:
   - modules
       - identified vs legacy
   - directories
       - local and remote directory imports
   - JavaScript resources
       - scripts which can be imported directly

Change-Id: I5a3d38de93d0186e79b87f2b3050f2b802088348
Reviewed-by: Bea Lam <bea.lam@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/doc/src/modules/cppplugins.qdoc b/src/qml/doc/src/modules/cppplugins.qdoc
index d96b3a8e56..df4156d67a 100644
--- a/src/qml/doc/src/modules/cppplugins.qdoc
+++ b/src/qml/doc/src/modules/cppplugins.qdoc
@@ -81,14 +81,15 @@
     \snippet examples/qml/cppextensions/plugins/plugin.cpp plugin
 
     The \c TimeModel class receives a \c{1.0} version of this plugin library, as
-    a QML type called \c Time. The Q_ASSERT() macro can ensure the module is
+    a QML type called \c Time. The Q_ASSERT() macro can ensure the type namespace is
     imported correctly by any QML components that use this plugin. The
     \l{Defining QML Types from C++} article has more information about registering C++
     types into the runtime.
 
     For this example, the TimeExample source directory is in
-    \c{com/nokia/TimeExample}. The plugin's module import statement will follow
-    this structure, so the module is registered as "com.nokia.TimeExample".
+    \c{com/nokia/TimeExample}.  The plugin's type namespace will mirror
+    this structure, so the types are registered into the namespace
+    "com.nokia.TimeExample".
 
     Additionally, the project file, in a \c .pro file, defines the project as a plugin library,
     specifies it should be built into the \c com/nokia/TimeExample directory, and registers