Merge pull request #1996 in HDFFV/hdf5 from ~JHENDERSON/hdf5:feature/unify_H5Lcopy_H5Lmove to develop

* commit '54d149061f36eaadf5308839a3627f9158d24458':
  Unify code between H5Lcopy and H5Lmove

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc
index ea13e59..3919823 100644
--- a/doc/src/activeqt.qdoc
+++ b/doc/src/activeqt.qdoc
@@ -73,7 +73,7 @@
     To build the static libraries, change into the \c activeqt directory 
     (usually \c QTDIR/src/activeqt), and run \c qmake and your make
     tool in both the \c container and the \c control subdirectory.
-    The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked 
+    The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked
     into \c QTDIR/lib.
 
     If you are using a shared configuration of Qt enter the \c plugin
@@ -81,8 +81,8 @@
     plugin that integrates the QAxContainer module into \l{Qt
     Designer}.
 
-    The ActiveQt modules are part of the \l{Qt Full Framework Edition}. They
-    are \e not part of the \l{Open Source Versions of Qt}.
+    The ActiveQt modules are part of the \l{Qt Full Framework Edition} and
+    the \l{Open Source Versions}.
 
     \sa {QAxContainer Module}, {QAxServer Module}
 */