summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-18 02:43:58 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-18 02:43:58 (GMT)
commitd35265496a02db5f213a18e610ad736fe357c26d (patch)
tree3af28c7d2f19ea75c6bad4847c1af65ca924b3cf
parent9cf688e79f67e531ca9fa548911dfb32ee8c0c71 (diff)
downloadQt-d35265496a02db5f213a18e610ad736fe357c26d.zip
Qt-d35265496a02db5f213a18e610ad736fe357c26d.tar.gz
Qt-d35265496a02db5f213a18e610ad736fe357c26d.tar.bz2
Remove mentions of qtsoftware added by merge of doc branch.
Reviewed-by: Trust Me
-rw-r--r--doc/src/frameworks-technologies/gestures.qdoc2
-rw-r--r--doc/src/xml-processing/xml-processing.qdoc14
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 49a9ae3..316d74d 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://www.example.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/xml-processing/xml-processing.qdoc b/doc/src/xml-processing/xml-processing.qdoc
index 44c5450..6e48515 100644
--- a/doc/src/xml-processing/xml-processing.qdoc
+++ b/doc/src/xml-processing/xml-processing.qdoc
@@ -121,18 +121,18 @@
Before we can apply a namespace to element or attribute names we must
declare it.
- Namespaces are URIs like \e http://www.qtsoftware.com/fnord/book/. This
+ Namespaces are URIs like \e http://www.example.com/fnord/book/. This
does not mean that data must be available at this address; the URI is
simply used to provide a unique name.
We declare namespaces in the same way as attributes; strictly speaking
they \e are attributes. To make for example \e
- http://www.qtsoftware.com/fnord/ the document's default XML namespace \e
+ http://www.example.com/fnord/ the document's default XML namespace \e
xmlns we write
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 8
- To distinguish the \e http://www.qtsoftware.com/fnord/book/ namespace from
+ To distinguish the \e http://www.example.com/fnord/book/ namespace from
the default, we must supply it with a prefix:
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 9
@@ -159,12 +159,12 @@
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 10
Within the \e document element we have two namespaces declared. The
- default namespace \e http://www.qtsoftware.com/fnord/ applies to the \e
+ default namespace \e http://www.example.com/fnord/ applies to the \e
book element, the \e chapter element, the appropriate \e title element
and of course to \e document itself.
The \e book:author and \e book:title elements belong to the namespace
- with the URI \e http://www.qtsoftware.com/fnord/book/.
+ with the URI \e http://www.example.com/fnord/book/.
The two \e book:author attributes \e title and \e name have no XML
namespace assigned. They are only members of the "traditional"
@@ -172,7 +172,7 @@
\e title attributes in \e book:author are forbidden.
In the above example we circumvent the last rule by adding a \e title
- attribute from the \e http://www.qtsoftware.com/fnord/ namespace to \e
+ attribute from the \e http://www.example.com/fnord/ namespace to \e
book:author: the \e fnord:title comes from the namespace with the
prefix \e fnord that is declared in the \e book:author element.
@@ -212,7 +212,7 @@
local part of \e book:title.)
\o The \e {namespace URI} ("Uniform Resource Identifier") is a unique
identifier for a namespace. It looks like a URL
- (e.g. \e http://www.qtsoftware.com/fnord/ ) but does not require
+ (e.g. \e http://www.example.com/fnord/ ) but does not require
data to be accessible by the given protocol at the named address.
\endlist