Git commit 5e6b2651596401c4fe1f4517ed873aceabf498f1 by Burkhard Lück.
Committed on 02/08/2015 at 11:34.
Pushed by lueck into branch 'master'.

Update fundmentals docbook to kf5
Software Collection changed to Workspace + Applications
Update build instructions + add kdesrc-build
Updated screenshots
The coords for callouts are not updated according the new screenshots + need to 
be fixed, but that can happen later
Screenshot missing in this review were updated to kf5 silently in the past
REVIEW:124535

M  +6    -8    doc/fundamentals/index.docbook
M  +14   -12   doc/fundamentals/install.docbook
M  +1    -1    doc/fundamentals/tasks.docbook
M  +8    -19   doc/fundamentals/ui.docbook
M  +-    --    doc/fundamentals/visualdict-gui1.png
M  +-    --    doc/fundamentals/visualdict-gui2.png
M  +-    --    doc/fundamentals/visualdict-gui3.png
M  +-    --    doc/fundamentals/visualdict-gui4.png
M  +-    --    doc/fundamentals/visualdict-window.png
M  +-    --    doc/fundamentals/visualdict-window2.png

http://commits.kde.org/khelpcenter/5e6b2651596401c4fe1f4517ed873aceabf498f1

diff --git a/doc/fundamentals/index.docbook b/doc/fundamentals/index.docbook
index ec93dd9..1d674f5 100644
--- a/doc/fundamentals/index.docbook
+++ b/doc/fundamentals/index.docbook
@@ -4,7 +4,6 @@
   <!ENTITY kappname "&kde-sc;">
   <!ENTITY % addindex "IGNORE">
   <!--FIXME: these entities should be added to kdoctools-->
-  <!ENTITY kde-sc "&i18n-kde-sc;">
   <!ENTITY plasma-workspaces "&i18n-plasma-workspaces;">
   <!ENTITY plasma-desktop "&i18n-plasma-desktop;">
   <!ENTITY plasma-active "&i18n-plasma-active;">
@@ -12,7 +11,6 @@
   <!ENTITY Meta "&i18n-Meta;">
   <!--/end entities that need to be added to kdoctools-->
   <!--make some of the above entities translatable in the interim-->
-  <!ENTITY i18n-kde-sc "&kde; Software Collection">
   <!ENTITY i18n-plasma-workspaces "&kde; &plasma; Workspaces">
   <!ENTITY i18n-plasma-desktop "<application>&kde; &plasma; 
Desktop</application>">
   <!ENTITY i18n-plasma-active "<application>&plasma; Active</application>">
@@ -49,12 +47,12 @@
 </copyright>
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2013-12-08</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
+<date>2015-07-30</date>
+<releaseinfo>&plasma; 5.4</releaseinfo>
 
 <abstract>
-<para>This guide provides an introduction to the &kde-sc; and describes many
-common tasks that can be performed in all &kde; applications.</para>
+<para>This guide provides an introduction to the &kde; workspace and 
applications and describes many
+common tasks that can be performed.</para>
 </abstract>
 
 <keywordset>
@@ -83,8 +81,8 @@ common tasks that can be performed in all &kde; 
applications.</para>
 <title>Introduction</title>
 <para>Welcome to &kde;!</para>
 
-<para>This guide will introduce you to the many features of the &kde-sc; and
-describe many common tasks you can perform in all &kde; applications.</para>
+<para>This guide will introduce you to the many features of the &kde; 
workspace and applications and
+describe many common tasks you can perform.</para>
 
 <para>For more information on &kde;, visit the
 <ulink url="http://www.kde.org/";>KDE website</ulink>.</para>
diff --git a/doc/fundamentals/install.docbook b/doc/fundamentals/install.docbook
index ffc1f0d..9e5cf5c 100644
--- a/doc/fundamentals/install.docbook
+++ b/doc/fundamentals/install.docbook
@@ -1,7 +1,7 @@
 <chapter id="install">
-<title>Installing the &kde-sc;</title>
+<title>Installing the &kde; Workspace and Applications</title>
 
-<para>You can install the &kde-sc; on a variety of different platforms, 
ranging from
+<para>You can install the &kde; workspace and applications on a variety of 
different platforms, ranging from
 smartphones and tablets to computers running &Microsoft; &Windows;, &MacOS;,
 &UNIX;, &BSD; or &Linux;.  Binary packages are available for many different
 platforms and distributions, or advanced users may build the source 
code.</para>
@@ -16,7 +16,7 @@ to install &kde; on a variety of different devices and 
platforms.</para>
 <title>&Linux;</title>
 
 <para>Nearly every &Linux; distribution provides binary packages for individual
-&kde-sc; applications and the &plasma-workspaces; as a whole.</para>
+applications and the &plasma-workspaces; as a whole.</para>
 
 <para>To install an individual application, look for its name in your
 distribution's package collection.  To install one of the &plasma-workspaces;,
@@ -41,7 +41,7 @@ to packaging &kde; that can provide assistance specific to 
&kde;</para>
 <sect2 id="install-windows">
 <title>&Microsoft; &Windows;</title>
 
-<para>The &kde; on Windows Initiative provides binary packages of &kde-sc;
+<para>The &kde; on Windows Initiative provides binary packages of &kde;
 applications for &Microsoft; &Windows;.  They also provide a special installer
 application that permits you to install individual applications or groups and
 all necessary dependencies easily.</para>
@@ -57,7 +57,7 @@ visit <ulink url="http://windows.kde.org/";>the KDE on Windows 
Initiative</ulink>
 <sect2 id="install-mac">
 <title>&MacOS;</title>
 
-<para>Individual &kde-sc; applications can be installed through several
+<para>Individual &kde; applications can be installed through several
 different <quote>ports</quote> systems available for &MacOS;.  Several 
different
 &kde; applications also provide their own binary builds for &MacOS;.</para>
 
@@ -69,7 +69,7 @@ different <quote>ports</quote> systems available for &MacOS;. 
 Several different
 <sect2 id="install-bsd">
 <title>&BSD;</title>
 
-<para>Most &BSD; distributions allows you to install &kde-sc; applications
+<para>Most &BSD; distributions allows you to install &kde; applications
 and the &plasma-workspaces; as a whole through their <quote>ports</quote>
 system.</para>
 
@@ -101,22 +101,24 @@ All you have to do insert a CD or connect a USB drive and 
boot from it.  If you
 like what you see, most offer an option to install it to your hard 
drive.</para>
 
 <para>There is <ulink url="http://www.kde.org/download/distributions.php";>a 
list
-of distributions that offer the &kde-sc; on live media</ulink> on the &kde; 
website.</para>
+of distributions that offer the &kde; workspace and applications on live 
media</ulink> on the &kde; website.</para>
 </sect2>
 
 <sect2 id="install-source">
 <title>Building from Source Code</title>
 
-<para>For detailed information on how to compile and install &kde;
-applications see
-<ulink 
url="http://techbase.kde.org/Getting_Started#Building_and_Running_KDE_Software_From_Source";>
-Building and Running &kde; Software From Source on &kde; 
TechBase</ulink>.</para>
+<para>For detailed information on how to compile and install &kde; workspace 
and
+applications see <ulink url="http://techbase.kde.org/";>&kde; 
TechBase</ulink>.</para>
 
 <para>Since &kde; software uses <command>cmake</command> you should
 have no trouble compiling it. Should you run into problems please report them 
to the
 &kde; mailing lists.</para>
+
+<para>The recommended tool to build Framworks and &plasma; Workspace 5 and 
Applications is 
+<ulink 
url="https://projects.kde.org/projects/extragear/utils/kdesrc-build";>kdesrc-build</ulink>
+</para>
 </sect2>
-<!--Fixme more info:
+<!--FIXME more info:
   Where to get sources (git split) 
   where to get help building from souces
   kdesrc-build
diff --git a/doc/fundamentals/tasks.docbook b/doc/fundamentals/tasks.docbook
index f480489..0b9db66 100644
--- a/doc/fundamentals/tasks.docbook
+++ b/doc/fundamentals/tasks.docbook
@@ -786,7 +786,7 @@ Find window used in KMail Composer, where else?
 Search bar used e.g. in Konsole/Konqueror Views (readonly)
 Search+Replace bar in Kate/KWrite
   -->
-<para>The Find function of many &kde-sc; applications lets you find specific
+<para>The Find function of many &kde; applications lets you find specific
 text in a document, while the Replace function allows you to replace text that
 is found with different text you provide.</para>
 
diff --git a/doc/fundamentals/ui.docbook b/doc/fundamentals/ui.docbook
index 323b518..dd2f2b8 100644
--- a/doc/fundamentals/ui.docbook
+++ b/doc/fundamentals/ui.docbook
@@ -61,10 +61,10 @@ part of the window to learn more about it.</para>
 The <emphasis role="bold">Window Menu</emphasis>
 </para></listitem>
 
-<listitem><para>
+<!--FIXME no longer in kf5 listitem><para>
 A <link linkend="visualdict-button">Button</link> to place this window on all
 desktops
-</para></listitem>
+</para></listitem-->
 
 <listitem><para>
 The <emphasis role="bold"><link 
linkend="visualdict-titlebar">Titlebar</link></emphasis>
@@ -188,18 +188,14 @@ More <emphasis role="bold"><link 
linkend="visualdict-panel">Panels</link></empha
 </mediaobjectco>
 </screenshot>
 
-<para>This screenshot, from the &systemsettings; Country/Region &amp; Language 
panel,
+<para>This screenshot, from the &systemsettings; Formats panel,
 shows some &GUI; elements.  Click on part of the window to learn more about 
it.</para>
 
 <orderedlist>
 
 <listitem><para>
 An <emphasis role="bold"><link linkend="visualdict-icon-list">Icon 
List</link></emphasis>
-(the first item is selected)
-</para></listitem>
-
-<listitem><para>
-Some <emphasis role="bold"><link 
linkend="visualdict-tab">Tabs</link></emphasis>
+(the second item is selected)
 </para></listitem>
 
 <listitem><para>
@@ -208,12 +204,6 @@ An open
 </para></listitem>
 
 <listitem><para>
-A <emphasis role="bold"><link 
linkend="visualdict-button">Button</link></emphasis>
-that resets the <link linkend="visualdict-drop-down-box">Drop Down Box</link> 
to
-its default value
-</para></listitem>
-
-<listitem><para>
 An item in the <link linkend="visualdict-drop-down-box">Drop Down Box</link> 
that
 has been selected
 </para>
@@ -313,9 +303,8 @@ A <emphasis role="bold"><link 
linkend="visualdict-text-box">Text Box</link></emp
 </mediaobjectco>
 </screenshot>
 
-<para>Finally, this screenshot, from another <link 
linkend="visualdict-tab">tab</link>
-of the &systemsettings; Country/Region &amp; Language  panel, shows five
-<emphasis role="bold"><link linkend="visualdict-combo-box">Combo 
Boxes</link></emphasis>
+<para>Finally, this screenshot, from the &systemsettings; Colors panel, shows 
five
+<emphasis role="bold"><link linkend="visualdict-tab">Tabs</link></emphasis>
 </para>
 
 </sect3>
@@ -428,7 +417,7 @@ what you have typed.</entry>
 
 <row id="visualdict-context-menu">
 <entry>Context Menu</entry>
-<entry>Many user interface elements in the &kde-sc; contain a context menu,
+<entry>Many user interface elements in the &plasma; Workspace and in 
Applications contain a context menu,
 which can be opened by clicking on something with the &RMB;.  This menu 
contains
 options and actions that usually affect the user interface element that was
 right-clicked.</entry>
@@ -1343,7 +1332,7 @@ whether it be opening, closing, moving, or switching 
between them.</para>
 </row>
 
 <row>
-<entry><keycombo action="simul">&Alt;<keycap>F2</keycap></keycombo> / 
<keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo></entry>
+<entry><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo></entry>
 <entry><ulink url="help:/plasma-desktop/krunner.html">Run Command 
Interface</ulink></entry>
 </row>
 
diff --git a/doc/fundamentals/visualdict-gui1.png 
b/doc/fundamentals/visualdict-gui1.png
index 17b2a7a..e833bb6 100644
Binary files a/doc/fundamentals/visualdict-gui1.png and 
b/doc/fundamentals/visualdict-gui1.png differ
diff --git a/doc/fundamentals/visualdict-gui2.png 
b/doc/fundamentals/visualdict-gui2.png
index 5c2df0a..5c5d725 100644
Binary files a/doc/fundamentals/visualdict-gui2.png and 
b/doc/fundamentals/visualdict-gui2.png differ
diff --git a/doc/fundamentals/visualdict-gui3.png 
b/doc/fundamentals/visualdict-gui3.png
index c8aafce..bf52515 100644
Binary files a/doc/fundamentals/visualdict-gui3.png and 
b/doc/fundamentals/visualdict-gui3.png differ
diff --git a/doc/fundamentals/visualdict-gui4.png 
b/doc/fundamentals/visualdict-gui4.png
index 9e763a4..fc2f53b 100644
Binary files a/doc/fundamentals/visualdict-gui4.png and 
b/doc/fundamentals/visualdict-gui4.png differ
diff --git a/doc/fundamentals/visualdict-window.png 
b/doc/fundamentals/visualdict-window.png
index e618521..edd8acc 100644
Binary files a/doc/fundamentals/visualdict-window.png and 
b/doc/fundamentals/visualdict-window.png differ
diff --git a/doc/fundamentals/visualdict-window2.png 
b/doc/fundamentals/visualdict-window2.png
index 1afa237..b2cac93 100644
Binary files a/doc/fundamentals/visualdict-window2.png and 
b/doc/fundamentals/visualdict-window2.png differ
_______________________________________________
kde-doc-english mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-doc-english

Reply via email to