summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-04-16 16:23:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-30 15:06:00 +0200
commitd8d5df7c9a432ccc83c949e667af8f3a20903cff (patch)
tree0717bcded12b4676b4e016f3bbba80db023e16e6
parent8f1e37599050277a698ab077c0dae4ffe014f6da (diff)
Doc: Make the doc use the \externalpage sites from qtbase/doc/global.
-The links to Qt Creator manual are in doc/global -removed externalsites directory because it is a duplicate of the one in doc/global. Change-Id: If2e888d4a1a7dcd721beb5b926e545799081fcf0 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/src/developmenttools.qdoc2
-rw-r--r--doc/src/externalsites/external-resources.qdoc494
-rw-r--r--doc/src/externalsites/qch-urls.qdoc99
-rw-r--r--doc/src/externalsites/qt-webpages.qdoc107
-rw-r--r--doc/src/externalsites/rfc.qdoc79
-rw-r--r--doc/src/getting-started/examples.qdoc12
-rw-r--r--doc/src/getting-started/gettingstarted.qdoc2
-rw-r--r--doc/src/getting-started/gettingstartedqt.qdoc4
-rw-r--r--doc/src/index.qdoc2
-rw-r--r--doc/src/platforms/supported-platforms.qdoc6
-rw-r--r--doc/src/reference.qdoc3
11 files changed, 14 insertions, 796 deletions
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index 51a34501c..82d551363 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -36,7 +36,7 @@
The easiest way to start application development with Qt is to \l{Downloads}
{download} and install Qt 5.
It contains Qt libraries, examples, documentation, and the necessary
- development tools, such as the \l{external: Qt Creator Manual}{Qt Creator}
+ development tools, such as the \l{Qt Creator Manual}{Qt Creator}
integrated development environment (IDE).
Qt Creator provides you with tools for accomplishing your tasks throughout
diff --git a/doc/src/externalsites/external-resources.qdoc b/doc/src/externalsites/external-resources.qdoc
deleted file mode 100644
index aca78da23..000000000
--- a/doc/src/externalsites/external-resources.qdoc
+++ /dev/null
@@ -1,494 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/*!
- \externalpage http://www.freedesktop.org/
- \title freedesktop.org
-*/
-
-/*!
- \externalpage http://www.freedesktop.org/Standards/xembed-spec
- \title XEmbed Specification
-*/
-
-/*!
- \externalpage http://www.freedesktop.org/Standards/icon-theme-spec
- \title Icon Themes Specification
-*/
-
-/*!
- \externalpage http://www.cups.org/
- \title Common Unix Printing System (CUPS)
- \keyword CUPS
-*/
-
-/*!
- \externalpage http://www.freedesktop.org/wiki/Standards_2fdesktop_2dentry_2dspec
- \title Desktop Entry Specification
-*/
-
-/*!
- \externalpage http://www.kde.org/
- \title The K Desktop Environment
- \keyword KDE
-*/
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/documentation.html
- \title CMake Documentation
-*/
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#command:find_package
- \title CMake find_package Documentation
-*/
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:AUTOMOC
- \title CMake AUTOMOC Documentation
-*/
-
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:LOCATION
- \title CMake LOCATION Documentation
-*/
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:POSITION_INDEPENDENT_CODE
- \title CMake POSITION_INDEPENDENT_CODE Documentation
-*/
-
-/*!
- \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#command:target_link_libraries
- \title CMake target_link_libraries Documentation
-*/
-
-/*!
- \externalpage http://www.gnome.org/
- \title GNOME
-*/
-
-/*!
- \externalpage http://www.gnu.org/software/emacs/
- \title GNU Emacs
-*/
-
-/*!
- \externalpage http://gnuwin32.sourceforge.net/packages.html
- \title GnuWin32 Project
-*/
-
-/*!
- \externalpage http://www.w3.org/Graphics/SVG/About.html
- \title About SVG
- \keyword Scalable Vector Graphics
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/SVG/types.html#ColorKeywords
- \title SVG color keyword names
-*/
-
-/*!
- \externalpage http://www.w3.org/Graphics/SVG/
- \title SVG Working Group
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/SVGMobile/
- \title Mobile SVG Profiles
- \omit
- Mobile SVG Profiles: SVG Tiny and SVG Basic
- \endomit
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/SVGMobile12/
- \title SVG 1.2 Tiny
-*/
-
-/*!
- \externalpage http://www.w3.org/Graphics/SVG/feature/1.2/#SVG-static
- \title SVG 1.2 Tiny Static Features
-*/
-
-
-
-/*!
- \externalpage http://tdm-gcc.tdragon.net/
- \title TDM-GCC
-*/
-
-/*!
- \externalpage http://www.dependencywalker.com/
- \title Dependency Walker
-*/
-
-/*!
- \externalpage http://webkit.org/
- \title WebKit Open Source Project
-*/
-
-/*!
- \externalpage http://www.informit.com/store/product.aspx?isbn=0132354160
- \title C++ GUI Programming with Qt 4, 2nd Edition
-*/
-
-/*!
- \externalpage http://www.openssl.org/
- \title OpenSSL Toolkit
-*/
-
-/*!
- \externalpage http://arora-browser.org/
- \title Arora Browser
-*/
-
-/*!
- \externalpage http://www.activestate.com/Products/activeperl/index.mhtml
- \title ActivePerl
-*/
-
-/*!
- \externalpage http://code.google.com/p/angleproject/
- \title ANGLE
-*/
-
-/*!
- \externalpage http://msdn.microsoft.com/en-us/directx/default.aspx
- \title Direct X SDK
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/html401/
- \title HTML 4
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/html5/
- \title HTML 5
-*/
-
-/*!
- \externalpage http://site.icu-project.org/
- \title ICU
-*/
-
-/*!
- \externalpage http://www.mingw.org/
- \title MinGW
-*/
-
-/*!
- \externalpage http://www.python.org/
- \title Python
-*/
-
-/*!
- \externalpage http://pyxml.sourceforge.net/topics/xbel/
- \title XML Bookmark Exchange Language Resource Page
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/xquery/#errors
- \title error handling in the XQuery language
-*/
-
-/*!
- \externalpage http://xaos.sourceforge.net/
- \title XaoS
-*/
-
-/*!
- \externalpage http://www.unixodbc.org
- \title http://www.unixodbc.org
-*/
-
-/*!
- \externalpage http://www.postgresql.org
- \title http://www.postgresql.org
-*/
-
-/*!
- \externalpage http://www.postgresql.org/docs/current/static/installation-platform-notes.html#INSTALLATION-NOTES-MINGW
- \title PostgreSQL MinGW/Native Windows
-*/
-
-/*!
- \externalpage http://www.freetds.org
- \title http://www.freetds.org
-*/
-
-/*!
- \externalpage http://www.sybase.com
- \title http://www.sybase.com
-*/
-
-/*!
- \externalpage http://linux.sybase.com
- \title http://linux.sybase.com
-*/
-
-/*!
- \externalpage http://www.sqlite.org
- \title http://www.sqlite.org
-*/
-
-/*!
- \externalpage http://www.amazon.com/Threads-Primer-Guide-Multithreaded-Programming/dp/0134436989/ref=sr_1_1?ie=UTF8&qid=1354884049&sr=8-1&keywords=a+guide+to+multithreaded+programming
- \title Threads Primer: A Guide to Multithreaded Programming
-*/
-
-/*!
- \externalpage http://www.amazon.com/Thread-Time-MultiThreaded-Programming-Guide/dp/0131900676/ref=sr_1_sc_3?ie=UTF8&qid=1354884427&sr=8-3-spell&keywords=The+Mulltithread+Programming+Guide
- \title Thread Time: The Multithreaded Programming Guide
-*/
-
-/*!
- \externalpage http://www.amazon.com/Pthreads-Programming-Standard-Multiprocessing-Nutshell/dp/1565921151/ref=sr_1_1?s=books&ie=UTF8&qid=1354884565&sr=1-1&keywords=threads+Programming%3A+A+POSIX+Standard+for+Better+Multiprocessing
- \title Pthreads Programming: A POSIX Standard for Better Multiprocessing
-*/
-
-/*!
- \externalpage http://www.amazon.com/Win32-Multithreaded-Programming-Aaron-Cohen/dp/B00007GW3Z/ref=sr_1_1?s=books&ie=UTF8&qid=1354884647&sr=1-1&keywords=Win32+Multithreaded+Programming
- \title Win32 Multithreaded Programming
-*/
-
-/*!
- \externalpage http://www.phptr.com/content/images/0131872494/samplechapter/blanchette_ch10.pdf
- \title "Item View Classes" Chapter of C++ GUI Programming with Qt 4
-*/
-
-/*!
- \externalpage https://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html
- \title Mac OS X Aqua
-*/
-
-/*!
- \externalpage http://www.kdedevelopers.org/node/2345
- \title KDE applications
-*/
-
-/*!
- \externalpage http://cgi.netscape.com/newsref/std/cookie_spec.html
- \title Netscape Cookie Specification
-*/
-
-/*!
- \externalpage http://msdn.microsoft.com/en-us/library/ms533046(VS.85).aspx
- \title Mitigating Cross-site Scripting With HTTP-only Cookies
-*/
-
-/*!
- \externalpage http://en.tldp.org/HOWTO/Framebuffer-HOWTO.html
- \title Framebuffer HOWTO
-*/
-
-/*!
- \externalpage http://wap.trafikanten.no
- \title Trafikanten
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/scxml/
- \title State Chart XML: State Machine Notation for Control Abstraction
-*/
-
-/*!
- \externalpage http://www.wisdom.weizmann.ac.il/~dharel/SCANNED.PAPERS/Statecharts.pdf
- \title Statecharts: A visual formalism for complex systems
-*/
-
-/*!
- \externalpage http://www.gnu.org/licenses/gpl.html
- \title GNU General Public License
-*/
-
-/*!
- \externalpage http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
- \title GNU Lesser General Public License, version 2.1
-*/
-
-/*!
- \externalpage http://developers.sun.com/sunstudio/downloads/patches/index.jsp
- \title Sun Studio Patches
-*/
-
-/*!
- \externalpage http://www.qtcentre.org
- \title Qt Centre
-*/
-
-/*!
- \externalpage http://www.kde.org
- \title KDE
-*/
-
-/*!
- \externalpage http://www.directfb.org/index.php?path=Main%2FDownloads&amp;page=1
- \title DirectFB - df_window example
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/IDirectFBPalette.html
- \title DirectFB - IDirectFBPalette
-*/
-
-/*!
- \externalpage http://www.cplusplus.com/reference/clibrary/cstring/memcpy/
- \title C++ Reference - memcpy
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/IDirectFB_CreateInputEventBuffer.html
- \title DirectFB - CreateInputEventBuffer
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/types.html#DFBSurfaceBlittingFlags
- \title DirectFB - DFBSurfaceBlittingFlags
-*/
-
-/*!
- \externalpage http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBImageProvider.html
- \title DirectFB - IDirectFBImageProvider
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/IDirectFBSurface.html
- \title DirectFB - IDirectFBSurface
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/IDirectFBWindow
- \title DirectFB - IDirectFBWindow
-*/
-
-/*!
- \externalpage http://www.directfb.org/docs/DirectFB_Reference_1_4/types.html#DFBSurfaceDescription
- \title DirectFB - DFBSurfaceDescription
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/REC-CSS2/selector.html#q1
- \title Standard CSS2 selector
-*/
-
-/*!
- \externalpage http://www.w3.org/XML/Core/#Publications
- \title W3C XML specifications
-*/
-
-/*!
- \externalpage http://www.w3.org/XML/Schema
- \title XML Schema
-*/
-
-/*!
- \externalpage http://opensource.org/licenses/bsd-license.php
- \title New and Modified BSD Licenses
-*/
-
-/*!
- \externalpage http://www.ecma-international.org/publications/standards/Ecma-262.htm
- \title ECMAScript Language Specification
-*/
-
-/*!
- \externalpage https://developer.mozilla.org/en/JavaScript
- \title JavaScript Resources
-*/
-
-/*!
- \externalpage https://developer.mozilla.org/en/JavaScript/Guide
- \title JavaScript Guide
-*/
-
-/*!
- \externalpage https://developer.mozilla.org/en/JavaScript/About_JavaScript
- \title About JavaScript
-*/
-
-/*!
- \externalpage http://www.libusb.org/
- \title libusb
-*/
-
-/*!
- \externalpage https://developer.mozilla.org/en/JavaScript/Reference/Reserved_Words
- \title JavaScript Reserved Words
-*/
-
-/*!
- \externalpage http://publicsuffix.org/
- \title publicsuffix.org
-*/
-
-/*!
- \externalpage http://wiki.forum.nokia.com/
- \title Forum Nokia Wiki
-*/
-
-/*!
- \externalpage http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html
- \title AccessibleEventID.idl File Reference
-*/
-
-/*!
- \externalpage http://msdn.microsoft.com/en-us/library/dd318066.aspx
- \title Microsoft Active Accessibility Event Constants
-*/
-
-/*!
- \externalpage ftp://ftp.qt.nokia.com/pub/qt/solutions/lgpl/qtmotifextension-2.7_1-opensource.tar.gz
- \title Motif Extension
-*/
-
-/*!
- \externalpage http://www.opengl.org/registry/
- \title OpenGL Registry
-*/
-
-/*!
- \externalpage http://www.khronos.org/registry/gles/
- \title Khronos OpenGL ES API Registry
-*/
-
-/*!
- \externalpage http://git.iksaif.net/?p=qsslkey-p11.git
- \title qsslkey example
-*/
-
-/*!
- \externalpage http://www.w3.org/TR/2009/WD-webdatabase-20091029/
- \title HTML5 Web Database API
-*/
-
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-project-qmake-libraries.html
- \title Adding Libraries to Projects
-*/
diff --git a/doc/src/externalsites/qch-urls.qdoc b/doc/src/externalsites/qch-urls.qdoc
deleted file mode 100644
index 09f2efe29..000000000
--- a/doc/src/externalsites/qch-urls.qdoc
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-qml-application.html
- \title external: Developing Qt Quick Applications with Creator
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-visual-editor.html
- \title external: Developing Qt Quick Applications
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtcreator/creator-publish-ovi.html
- \title external: Publishing Applications to Ovi Store
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator
- \title external: Qt Creator Manual
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/index.html
- \title external: Qt Mobility Manual
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/qml-plugins.html
- \title external: Qt Mobility QML Plugins
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-project-managing.html
- \title external: Creating Qt Projects in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-building-running.html
- \title external: Building and Running Applications in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-running-targets.html
- \title external: Set Compiler Targets in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-build-settings.html
- \title external: Build Settings in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-run-settings.html
- \title external: Run Settings in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-designer.html
- \title external: Designer in Creator
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-debugging.html
- \title external: Debugging Applications in Creator
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/multimedia.html
- \title external: Mobility Multimedia
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/location-overview.html
- \title external: Mobility Location
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qtmobility/all-examples.html
- \title external: Qt Mobility Examples
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html
- \title external: Qt Creator Overview
-*/
-/*!
- \externalpage http://qt-project.org/doc/qtcreator/creator-tutorials.html
- \title external: Tutorials for Creator
-*/
diff --git a/doc/src/externalsites/qt-webpages.qdoc b/doc/src/externalsites/qt-webpages.qdoc
deleted file mode 100644
index f7bb9b1b8..000000000
--- a/doc/src/externalsites/qt-webpages.qdoc
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/*!
- \externalpage http://qt-project.org/
- \title Qt Homepage
-*/
-/*!
- \externalpage http://bugreports.qt-project.org
- \title Qt Bug Tracker
-*/
-/*!
- \externalpage http://qt.digia.com/downloads
- \title Downloads
-*/
-/*!
- \externalpage http://qt.digia.com/licensing/
- \title Qt Licensing Overview
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qq/
- \title Qt Quarterly
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qq/qq19-plurals.html
- \title Qt Quarterly: Plural Form in Translation
-*/
-/*!
- \externalpage http://qt.gitorious.org
- \title Public Qt Repository
-*/
-/*!
- \externalpage http://qt.gitorious.org/qt-labs/qtestlib-tools
- \title qtestlib-tools
-*/
-
-/*!
- \externalpage http://qt-project.org/wiki/Qt_Coding_Style
- \title Qt Coding Style
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qt-eclipse-1.6/index.html
- \title Eclipse Plugin
-*/
-/*!
- \externalpage http://doc.qt.digia.com/qq/qq11-events.html
- \title Qt Quarterly: Another Look at Events
-*/
-/*!
- \externalpage http://qt-project.org/videos/watch/livecoding-video-effects-with-qt5
- \title Livecoding video effects with Qt5
-*/
-/*!
- \externalpage http://blog.qt.digia.com/2012/02/29/pimp-my-video-shader-effects-and-multimedia/
- \title Pimp my video
-*/
-/*!
- \externalpage http://qt-project.org/wiki/QtMediaHub
- \title QtMediaHub
-*/
-/*!
- \externalpage http://qt-project.org/wiki/Qt-RaspberryPi
- \title QtonPi
-*/
-
-/*!
- \externalpage http://qt-project.org/wiki/jom
- \title jom
-*/
-
-/*!
- \externalpage http://qt-project.org/doc/qt-4.8
- \title Qt 4.8 Reference Documentation
-*/
-
-/*!
- \externalpage http://qt-project.org/doc/qt-4.8/qtquick.html
- \title Qt Quick 1 Reference Documentation
-*/
-
-/*!
- \externalpage http://qt-project.org/wiki/Qt-Localization
- \title external: Translating Qt Into Other Languages
-*/
diff --git a/doc/src/externalsites/rfc.qdoc b/doc/src/externalsites/rfc.qdoc
deleted file mode 100644
index bc6a1d66a..000000000
--- a/doc/src/externalsites/rfc.qdoc
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \externalpage http://www.ietf.org/rfc/rfc1179.txt
- \title RFC 1179
- \keyword lpr
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc1738.txt
- \title RFC 1738
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc1928.txt
- \title RFC 1928
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc1929.txt
- \title RFC 1929
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc2045.txt
- \title RFC 2045
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc2109.txt
- \title RFC 2109
- HTTP State Management Mechanism
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc2965.txt
- \title RFC 2965
- HTTP State Management Mechanism
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc3174.txt
- \title RFC 3174
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc3491.txt
- \title RFC 3491
-*/
-
-/*!
- \externalpage http://www.rfc-editor.org/rfc/rfc3986.txt
- \title RFC 3986
-*/
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 2957069b4..1e2760f9e 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -39,16 +39,14 @@
\section2 Qt Creator
Qt Creator is the integrated development environment (IDE) for Qt.
\list
- \li \l{external: Qt Creator Manual}{Qt Creator Manual} - The manual contains
+ \li \l{Qt Creator Manual} - The manual contains
information on how to achieve development tasks
These are excerpts from the manual:
\list
- \omit broken link
- \li \l{external: Tutorials for Creator}{Qt Creator Tutorials}
- \endomit
- \li \l{external: Creating Qt Projects in Creator}{Creating Qt Projects in Qt Creator}
- \li \l{external: Building and Running Applications in Creator}{Building and Running Applications in Qt Creator}
- \li \l{external: Debugging Applications in Creator}{Debugging Applications in Qt Creator}
+ \li \l{Qt Creator: Tutorials}{Tutorials}
+ \li \l{Qt Creator: Creating Projects}{Creating Projects}
+ \li \l{Qt Creator: Building and Running}{Building and Running}
+ \li \l{Qt Creator: Debugging}{Debugging}
\endlist
\endlist
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 7e8e74c08..226274243 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -58,7 +58,7 @@
For more information, these pages describe the tools and processes involved:
\list
\li \l{Development Tools}
- \li \l{external: Qt Creator Manual}{Qt Creator Manual}
+ \li \l{Qt Creator Manual}
\endlist
\section1 Creating Applications Using Qt
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index e5ccd7c7c..639114a9f 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -94,10 +94,10 @@
\li Here
\row
\li Using Qt Creator
- \li \l{external: Qt Creator Manual}{Qt Creator}
+ \li \l{Qt Creator Manual}{Qt Creator}
\row
\li Creating other kind of applications with Qt Creator
- \li \l{external: Tutorials for Creator}{Qt Creator Tutorials}
+ \li \l{Tutorials for Creator}{Qt Creator Tutorials}
\endtable
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 6d4b09e27..0c58ca645 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -103,7 +103,7 @@
\li \l{All Classes}{All Qt C++ Classes}
\li \l{All Modules}{All Qt Modules}
\li \l{All QML APIs by Module}
- \li \l{http://qt-project.org/doc/qtcreator}{Qt Creator}
+ \li \l{Qt Creator Manual}
\endlist
\list
\li \l{Qt Reference Pages}{All Qt Reference Documentation}
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 9af276fcf..04e636441 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -93,7 +93,7 @@
\section2 Cross-Platform Development using Qt Creator
- \l{external: Qt Creator Manual}{Qt Creator} is
+ \l{Qt Creator Manual}{Qt Creator} is
a complete Cross-platform IDE included in the Qt SDK. The IDE allows
programmers to create, build, debug and run Qt applications accross all
supported platforms.
@@ -161,7 +161,7 @@
\section2 Cross-Platform Development using Qt Creator
- \l{external: Qt Creator Manual}{Qt Creator} is
+ \l{Qt Creator Manual}{Qt Creator} is
a complete Cross-platform IDE included in the Qt SDK. The IDE allows
programmers to create, build, debug and run Qt applications accross all
supported platforms.
@@ -247,7 +247,7 @@
\section2 Cross-Platform Development using Qt Creator
- \l{external: Qt Creator Manual}{Qt Creator} is
+ \l{Qt Creator Manual}{Qt Creator} is
a complete Cross-platform IDE included in the Qt SDK. The IDE allows
programmers to create, build, debug and run Qt applications accross all
supported platforms.
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index 905736ac8..89738a49a 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -40,11 +40,10 @@
\section2 Qt Tool Manuals
\list
- \li \l{external: Qt Creator Manual}{Qt Creator}
+ \li \l{Qt Creator Manual}{Qt Creator}
\li \l{Qt Linguist Manual}{Qt Linguist}
\li \l{Qt Assistant Manual}{Qt Assistant}
\li \l{Qt Designer Manual}{Qt Designer}
\li \l{qmake Manual}{qmake}
\endlist
*/
-