Merge commit 'origin/master' into fileEngines

Conflicts:
	src/s60installs/bwins/QtCoreu.def

1 files changed, 2 insertions, 12 deletions

diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 56ea165..c3c94c5 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -120,7 +120,7 @@ hand side of the following table shows what we would like to be able to write.
 Here we create two instances of our previously defined component, and set the
 second one to have focus.  The intention is that when the \e A, \e B, or \e C
 keys are pressed, the second of the two components receives the event and
-reponds accordingly.
+responds accordingly.
 
 \table
 \row
@@ -276,7 +276,7 @@ Focus scopes allow focus to allocation to be easily partitioned.  Several
 QML items use it to this effect.
 
 \l ListView, for example, is itself a focus scope.  Generally this isn't
-noticable as \l ListView doesn't usually have manually added visual children.
+noticeable as \l ListView doesn't usually have manually added visual children.
 By being a focus scope, \l ListView can focus the current list item without
 worrying about how that will effect the rest of the application.  This allows
 the current item delegate to react to key presses.
@@ -301,14 +301,4 @@ actually performs the work of handling the \e {Return} key.
 
 All of the QML view classes, such as \l PathView and \l GridView, behave
 in a similar manner to allow key handling in their respective delegates.
-
-\section1 Focus Panels
-
-Traditional UIs are composed of many top-level windows.  Windows actually
-perform two tasks - they act as the visual bounds for a widget, and they segment
-focus.  Each window has a separate focused widget, that becomes (to mix
-terminologies) the \e {active focus} widget when the window is the active
-window.
-
-### Focus panels do basically the same thing.
 */