[digikam-doc] digikam: wrong screenshot on top of this chapter

[Gilles Caulier]

Git commit 5cd56a9bcc13c783ec3d884d9c649f9f6115b437 by Gilles Caulier.
Committed on 15/09/2016 at 20:51.
Pushed by cgilles into branch 'master'.

wrong screenshot on top of this chapter

M  +1-1digikam/using-mainwindow.docbook

http://commits.kde.org/digikam-doc/5cd56a9bcc13c783ec3d884d9c649f9f6115b437

diff --git a/digikam/using-mainwindow.docbook b/digikam/using-mainwindow.docbook
index e6d23f2..dec7a8b 100644
--- a/digikam/using-mainwindow.docbook
+++ b/digikam/using-mainwindow.docbook
@@ -5,7 +5,7 @@
 Introduction to the Main Window
 
 
- 
+ 
 
 
 

[digikam-doc] digikam: apply big patch from Wolfgang to update digiKam main window handbook chapter with 5.x release

[Gilles Caulier]

Git commit 13b1fed653825570e5da210718344c4b2d3754f8 by Gilles Caulier.
Committed on 15/09/2016 at 20:42.
Pushed by cgilles into branch 'master'.

apply big patch from Wolfgang to update digiKam main window handbook chapter 
with 5.x release

M  +2-5digikam/intro-firstrun.docbook
M  +7-7digikam/using-dam-build.docbook
A  +---digikam/using-mainwindow-advancedsearchtool.png
A  +---digikam/using-mainwindow-advancedsearchtool2.png
M  +---digikam/using-mainwindow-advsearch.png
M  +---digikam/using-mainwindow-albumproperties.png
M  +---digikam/using-mainwindow-albumview.png
M  +---digikam/using-mainwindow-assigntags.png
M  +---digikam/using-mainwindow-dateview.png
M  +---digikam/using-mainwindow-duplicates-albumsfilter.png
A  +---digikam/using-mainwindow-facedetection.png
A  +---digikam/using-mainwindow-facedetectiontag.png
M  +---digikam/using-mainwindow-filters.png
A  +---digikam/using-mainwindow-icon-showfacetags.png
M  +---digikam/using-mainwindow-iconview.png
A  +---digikam/using-mainwindow-labelsview.png
M  +---digikam/using-mainwindow-mapsearch.png
M  +---digikam/using-mainwindow-preview.png
M  +---digikam/using-mainwindow-searchsimilar.png
A  +---digikam/using-mainwindow-searchsketch.png
M  +---digikam/using-mainwindow-searchview.png
M  +---digikam/using-mainwindow-tagsview.png
M  +---digikam/using-mainwindow-timeline.png
M  +---digikam/using-mainwindow-toolbar.png
M  +---digikam/using-mainwindow-tooltip.png
M  +311  -137  digikam/using-mainwindow.docbook
M  +1-1digikam/using-sidebar-captions.docbook

http://commits.kde.org/digikam-doc/13b1fed653825570e5da210718344c4b2d3754f8

diff --git a/digikam/intro-firstrun.docbook b/digikam/intro-firstrun.docbook
index cb5ce8a..5f7ec86 100644
--- a/digikam/intro-firstrun.docbook
+++ b/digikam/intro-firstrun.docbook
@@ -29,7 +29,7 @@
 
 
 
-Then you have to specify a local folder that resides on your 
computer, in which the database will be stored. This path will be the same for 
all image folders.
+Then you have to specify a local folder that resides on your 
computer, in which the database will be stored. This path will be the same for 
all image folders. For details about the database type selection have a look at 
The  Database. If you have 
a local installation and a collection of less than 30.000 photographs you may 
well keep the default setting (SQLite).
 
 
 
@@ -108,11 +108,8 @@
 
 
 
-
-
- The Scan Items Dialog
 
-If you already have a collection of photographs on your hard 
disk, you can enter the top-level folder containing the photographs, this is 
called the Albums Library folder.  will treat each sub-folder of the 
folder you've entered as an Album. None of the photographs will be altered. 
During folders parsing you can see a progress bar in the lower right corner 
like this:
+Nothing really to select here. You can cancel or start the 
scan with Finish. None of the photographs will be altered. 
During folders parsing you can see a progress bar in the lower right corner 
like this:
 
 
 
diff --git a/digikam/using-dam-build.docbook b/digikam/using-dam-build.docbook
index 6bfecfc..ad09c87 100644
--- a/digikam/using-dam-build.docbook
+++ b/digikam/using-dam-build.docbook
@@ -20,7 +20,7 @@
 
 
 
-The key thing to remember is that you don't know how you or 
somebody else will try to find an image 2 years ahead of our time. You will 
remember past events in a different context, it's a fact of life. So if can 
narrow down your search by remembering place or time or camera or theme or 
rating or owner you stand an infinitely better chance to find it quickly than 
by just one of those criteria or none. At the beginning, at the time of taking 
a photograph, all metadata is in your head (except for the EXIF data). If you 
do not transcribe some of it into your DAM system, it will be lost eventually 
as much as every event fades into oblivion over time.
+The key thing to remember is that you don't know how you or 
somebody else will try to find an image 2 years ahead of our time. You will 
remember past events in a different context, it's a fact of life. So if you can 
narrow down your search by remembering place or time or camera or theme or 
rating or owner you stand an infinitely better chance to find it quickly than 
by just one of those criteria or none. At the beginning, at the time of taking 
a photograph, all metadata is in your head (except for the EXIF data). If you 
do not transcribe some of it into your DAM system, it will be lost eventually 
as much as every event fades into oblivion over time.
 
 
 

Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master

[Burkhard Lück]

> On Sept. 15, 2016, 11:11 vorm., Marco Martin wrote:
> > doc/kcontrol/cache/index.docbook, line 19
> > 
> >
> > shouldn't it be updated as well?

see my description
the docbooks are imported as they were splitted from kde-runtime, any other 
necessary changes/updates will happen in a separate RRs/commits
That way we can distinguish what was imported from the source repo and what was 
changed in the target repo so we have a much clearer history


- Burkhard


---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128912/#review99205
---


On Sept. 15, 2016, 9:09 vorm., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128912/
> ---
> 
> (Updated Sept. 15, 2016, 9:09 vorm.)
> 
> 
> Review request for Documentation, KDE Frameworks and Plasma.
> 
> 
> Repository: kio
> 
> 
> Description
> ---
> 
> doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent 
> doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ 
> doc/kcontrol/ebrowsing/ doc/kcontrol/smb/
> splitted from kde-runtime master using https://github.com/ajdruff/git-splits
> 
> Not included in build so far, the docbooks are imported as they were splitted
> 
> To be done next:
> Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, 
> rename ebrowsing to webshortcuts
> reapply a few updates done in plasma-desktop
> remove these imported kcontrol docbooks from plasma-desktop
> adapt scripty to these changes
> 
> 
> Diffs
> -
> 
>   doc/kcontrol/cache/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cache/index.docbook PRE-CREATION 
>   doc/kcontrol/cookies/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cookies/index.docbook PRE-CREATION 
>   doc/kcontrol/ebrowsing/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/ebrowsing/index.docbook PRE-CREATION 
>   doc/kcontrol/netpref/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/netpref/index.docbook PRE-CREATION 
>   doc/kcontrol/proxy/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/proxy/index.docbook PRE-CREATION 
>   doc/kcontrol/smb/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/smb/index.docbook PRE-CREATION 
>   doc/kcontrol/useragent/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/useragent/index.docbook PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/128912/diff/
> 
> 
> Testing
> ---
> 
> history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime 
> master
> 
> 
> File Attachments
> 
> 
> git-log-doc-kcontrol.output
>   
> https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

Re: Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code

[Burkhard Lück]

> On Sept. 15, 2016, 11:07 vorm., Marco Martin wrote:
> > doc/kcontrol/filetypes/index.docbook, line 19
> > 
> >
> > kde 4.12?

see my description
the docbook is imported as it was splitted from kde-runtime, any other 
necessary changes will happen in a separate RR/commit
That way we can distinguish what was imported from the source repo and what was 
changed in the target repo so we have a much clearer history


- Burkhard


---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128914/#review99204
---


On Sept. 15, 2016, 9:08 vorm., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128914/
> ---
> 
> (Updated Sept. 15, 2016, 9:08 vorm.)
> 
> 
> Review request for Documentation, Localization and Translation (l10n) and 
> Plasma.
> 
> 
> Repository: kde-cli-tools
> 
> 
> Description
> ---
> 
> doc/kcontrol/filetypes/ splitted from kde-runtime master using 
> https://github.com/ajdruff/git-splits
> 
> Not included in build so far, the docbook ismported as it was splitted
> 
> To be done next:
> adapt CMakeLists.txt, change dtd to kf5, 
> reapply one update done in plasma-desktop
> make co-installable, see https://git.reviewboard.kde.org/r/128912/
> remove this imported kcontrol docbook from plasma-desktop
> adapt scripty to these changes
> 
> 
> Diffs
> -
> 
>   doc/kcontrol/filetypes/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/filetypes/index.docbook PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/128914/diff/
> 
> 
> Testing
> ---
> 
> history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log 
> in kde-runtime master
> 
> 
> File Attachments
> 
> 
> git-log-doc-kcontrol-kio-cli-tools.output
>   
> https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

Re: Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master

[Marco Martin]

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128912/#review99205
---




doc/kcontrol/cache/index.docbook (line 19)


shouldn't it be updated as well?


- Marco Martin


On Sept. 15, 2016, 9:09 a.m., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128912/
> ---
> 
> (Updated Sept. 15, 2016, 9:09 a.m.)
> 
> 
> Review request for Documentation, KDE Frameworks and Plasma.
> 
> 
> Repository: kio
> 
> 
> Description
> ---
> 
> doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent 
> doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ 
> doc/kcontrol/ebrowsing/ doc/kcontrol/smb/
> splitted from kde-runtime master using https://github.com/ajdruff/git-splits
> 
> Not included in build so far, the docbooks are imported as they were splitted
> 
> To be done next:
> Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5, 
> rename ebrowsing to webshortcuts
> reapply a few updates done in plasma-desktop
> remove these imported kcontrol docbooks from plasma-desktop
> adapt scripty to these changes
> 
> 
> Diffs
> -
> 
>   doc/kcontrol/cache/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cache/index.docbook PRE-CREATION 
>   doc/kcontrol/cookies/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cookies/index.docbook PRE-CREATION 
>   doc/kcontrol/ebrowsing/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/ebrowsing/index.docbook PRE-CREATION 
>   doc/kcontrol/netpref/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/netpref/index.docbook PRE-CREATION 
>   doc/kcontrol/proxy/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/proxy/index.docbook PRE-CREATION 
>   doc/kcontrol/smb/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/smb/index.docbook PRE-CREATION 
>   doc/kcontrol/useragent/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/useragent/index.docbook PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/128912/diff/
> 
> 
> Testing
> ---
> 
> history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime 
> master
> 
> 
> File Attachments
> 
> 
> git-log-doc-kcontrol.output
>   
> https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

Re: Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code

[Marco Martin]

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128914/#review99204
---




doc/kcontrol/filetypes/index.docbook (line 19)


kde 4.12?


- Marco Martin


On Sept. 15, 2016, 9:08 a.m., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128914/
> ---
> 
> (Updated Sept. 15, 2016, 9:08 a.m.)
> 
> 
> Review request for Documentation, Localization and Translation (l10n) and 
> Plasma.
> 
> 
> Repository: kde-cli-tools
> 
> 
> Description
> ---
> 
> doc/kcontrol/filetypes/ splitted from kde-runtime master using 
> https://github.com/ajdruff/git-splits
> 
> Not included in build so far, the docbook ismported as it was splitted
> 
> To be done next:
> adapt CMakeLists.txt, change dtd to kf5, 
> reapply one update done in plasma-desktop
> make co-installable, see https://git.reviewboard.kde.org/r/128912/
> remove this imported kcontrol docbook from plasma-desktop
> adapt scripty to these changes
> 
> 
> Diffs
> -
> 
>   doc/kcontrol/filetypes/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/filetypes/index.docbook PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/128914/diff/
> 
> 
> Testing
> ---
> 
> history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log 
> in kde-runtime master
> 
> 
> File Attachments
> 
> 
> git-log-doc-kcontrol-kio-cli-tools.output
>   
> https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

Review Request 128914: Import filetypes kcm docbook from kde-runtime master to kde-cli-tools with the code

[Burkhard Lück]

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128914/
---

Review request for Documentation, Localization and Translation (l10n) and 
Plasma.


Repository: kde-cli-tools


Description
---

doc/kcontrol/filetypes/ splitted from kde-runtime master using 
https://github.com/ajdruff/git-splits

Not included in build so far, the docbook ismported as it was splitted

To be done next:
adapt CMakeLists.txt, change dtd to kf5, 
reapply one update done in plasma-desktop
make co-installable, see https://git.reviewboard.kde.org/r/128912/
remove this imported kcontrol docbook from plasma-desktop
adapt scripty to these changes


Diffs
-

  doc/kcontrol/filetypes/CMakeLists.txt PRE-CREATION 
  doc/kcontrol/filetypes/index.docbook PRE-CREATION 

Diff: https://git.reviewboard.kde.org/r/128914/diff/


Testing
---

history looks good, see git-log-doc-kcontrol-kio-cli-tools.output, same log in 
kde-runtime master


File Attachments


git-log-doc-kcontrol-kio-cli-tools.output
  
https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/32f72127-aa97-4393-88e1-d830e35dbfe2__git-log-doc-kcontrol-kio-cli-tools.output


Thanks,

Burkhard Lück