From 95f52ed1f9a1b3049e6862cb466754931c1d760d Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 4 Oct 2010 13:45:46 +0200 Subject: Doc: Made a number of fixes to the documentation. --- src/corelib/plugin/qsystemlibrary.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/plugin') diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index eeb142bbfc..568b3988d3 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -57,8 +57,8 @@ The search order is the same as the order in DLL Safe search mode Windows, except that we don't search: * The current directory - * The 16-bit system directory. (normally c:\windows\system) - * The Windows directory. (normally c:\windows) + * The 16-bit system directory. (normally \c{c:\windows\system}) + * The Windows directory. (normally \c{c:\windows}) This means that the effective search order is: 1. Application path. -- cgit v1.2.3 From 8c054ec17ac04bf56052e0c163afe7922bf2a361 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 4 Oct 2010 14:39:56 +0200 Subject: Doc: Fixed the in-repository licenses for the documentation. In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files. --- src/corelib/plugin/qplugin.qdoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/corelib/plugin') diff --git a/src/corelib/plugin/qplugin.qdoc b/src/corelib/plugin/qplugin.qdoc index b02cfbffbd..9183350314 100644 --- a/src/corelib/plugin/qplugin.qdoc +++ b/src/corelib/plugin/qplugin.qdoc @@ -7,11 +7,11 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in a -** written agreement between you and Nokia. +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free -- cgit v1.2.3