Documentation fixes [attached]

[Antoni Bella Pérez]

 

Hi,

 

Other small review included in the attached file.

 

Happy Holidays!

Toni

[Gilles Caulier-4]

Hi Antoni, and happy new year 2018.

I applied locally your patch and it do not compile :

[gilles@localhost doc]$ patch -p1 < digikam-doc_20171230.diff  
patching file digikam/editor-cm-connection.docbook
patching file digikam/editor-cm-definitions.docbook
patching file digikam/editor-cm-monitor.docbook
patching file digikam/editor-cm-rawfile.docbook
patching file digikam/editor-cm-wkspace.docbook
patching file digikam/editor-color-auto.docbook
patching file digikam/editor-color-bw.docbook
patching file digikam/editor-color-correction.docbook
patching file digikam/editor-color-curves.docbook
patching file digikam/editor-color-levels.docbook
patching file digikam/editor-color-mixer.docbook
patching file digikam/editor-color-wb.docbook
patching file digikam/editor-color.docbook
patching file digikam/editor-decorate-texture.docbook
patching file digikam/editor-enhance-inpaint.docbook
patching file digikam/editor-enhance-nr.docbook
patching file digikam/editor-enhance-restoration.docbook
patching file digikam/editor-enhance-sharpen.docbook
patching file digikam/editor-filters-blurfx.docbook
patching file digikam/editor-photoediting.docbook
patching file digikam/editor-transform-crop.docbook
patching file digikam/editor-transform-resize.docbook
patching file digikam/editor-using.docbook
patching file digikam/menu-editor.docbook
patching file digikam/menu-mainwindow.docbook
patching file digikam/tool-maintenance.docbook
patching file digikam/tool-metadataeditor.docbook
patching file digikam/using-dam-build.docbook
patching file digikam/using-mainwindow-albumsview.docbook
patching file digikam/using-mainwindow-fuzzysearches.docbook
patching file digikam/using-mainwindow-imageview.docbook
patching file digikam/using-setup-views.docbook

[gilles@localhost doc]$ make
Scanning dependencies of target doc-digikam-index-cache-bz2
Generating index.cache.bz2
using-mainwindow-imageview.docbook:62: element menuchoice: validity error : Element menuchoice content does not follow the DTD, ex
pecting (shortcut? , (guibutton | guiicon | guilabel | guimenu | guimenuitem | guisubmenu | interface)+), got (shortcut menuchoice
)
           </menuchoice>  
                        ^
kf5.kdoctools: Error: `xmllint --noout` outputted text
doc/digikam/CMakeFiles/doc-digikam-index-cache-bz2.dir/build.make:218: recipe for target 'doc/digikam/index.cache.bz2' failed
make[2]: *** [doc/digikam/index.cache.bz2] Error 1
CMakeFiles/Makefile2:21064: recipe for target 'doc/digikam/CMakeFiles/doc-digikam-index-cache-bz2.dir/all' failed
make[1]: *** [doc/digikam/CMakeFiles/doc-digikam-index-cache-bz2.dir/all] Error 2
Makefile:138: recipe for target 'all' failed
make: *** [all] Error 2

Best

Gilles Caulier

2017-12-30 20:17 GMT+01:00 Antoni Bella Pérez <[hidden email]>:

 

Hi,

 

Other small review included in the attached file.

 

Happy Holidays!

Toni

[Antoni Bella Pérez]

El dimarts, 2 de gener de 2018, a les 12:21:49 CET, Gilles Caulier va
escriure:
> using-mainwindow-imageview.docbook:62: element menuchoice: validity error :
> Element menuchoice content does not follow the DTD, ex
> pecting (shortcut? , (guibutton | guiicon | guilabel | guimenu |
> guimenuitem | guisubmenu | interface)+), got (shortcut menuchoice
> )
>            </menuchoice>
>                         ^

  Hi,

        "Element menuchoice content does not follow the DTD"

 Remove menuchoice tags on line 61 (digikam/using-mainwindow-
imageview.docbook):

<menuchoice>
  <shortcut><keycombo action="press"><keycap>F3</keycap></keycombo></shortcut>
  <menuchoice><guimenu>View</guimenu><guimenuitem>Preview Image</
guimenuitem></menuchoice>
</menuchoice>

to

<menuchoice>
  <shortcut><keycombo action="press"><keycap>F3</keycap></keycombo></shortcut>
  <guimenu>View</guimenu><guimenuitem>Preview Image</guimenuitem>
</menuchoice>

  With a single key the keycombo tag is not necessary...  This does not
infringe anything :)

  Regards
  Toni

[Gilles Caulier-4]

Done Antoni :

https://commits.kde.org/digikam-doc/3229b2d1111f369067364ef42411ba48db40a924

Gilles

2018-01-03 11:05 GMT+01:00 Antoni Bella Pérez <[hidden email]>:

El dimarts, 2 de gener de 2018, a les 12:21:49 CET, Gilles Caulier va
escriure:
> using-mainwindow-imageview.docbook:62: element menuchoice: validity error :
> Element menuchoice content does not follow the DTD, ex
> pecting (shortcut? , (guibutton | guiicon | guilabel | guimenu |
> guimenuitem | guisubmenu | interface)+), got (shortcut menuchoice
> )
>            </menuchoice>
>                         ^

  Hi,

        "Element menuchoice content does not follow the DTD"

 Remove menuchoice tags on line 61 (digikam/using-mainwindow-
imageview.docbook):

<menuchoice>
  <shortcut><keycombo action="press"><keycap>F3</keycap></keycombo></shortcut>
  <menuchoice><guimenu>View</guimenu><guimenuitem>Preview Image</
guimenuitem></menuchoice>
</menuchoice>

to

<menuchoice>
  <shortcut><keycombo action="press"><keycap>F3</keycap></keycombo></shortcut>
  <guimenu>View</guimenu><guimenuitem>Preview Image</guimenuitem>
</menuchoice>

  With a single key the keycombo tag is not necessary...  This does not
infringe anything :)

  Regards
  Toni

[Antoni Bella Pérez]

El dimecres, 3 de gener de 2018, a les 15:09:19 CET, Gilles Caulier va
escriure:
> Done Antoni :
>
> https://commits.kde.org/digikam-doc/3229b2d1111f369067364ef42411ba48db40a924
>
> Gilles

  Hi,

  Thank you very much for this software.

  That is my KDE Identity:
        <https://identity.kde.org/index.php?r=people/view&uid=bellaperez>

  More commits, questions, etc. soon. ;-)

  Regards
  Toni

[Gilles Caulier-4]

2018-01-03 16:52 GMT+01:00 Antoni Bella Pérez <[hidden email]>:

El dimecres, 3 de gener de 2018, a les 15:09:19 CET, Gilles Caulier va
escriure:
> Done Antoni :
>
> https://commits.kde.org/digikam-doc/3229b2d1111f369067364ef42411ba48db40a924
>
> Gilles

  Hi,

  Thank you very much for this software.

  That is my KDE Identity:
        <https://identity.kde.org/index.php?r=people/view&uid=bellaperez>

  More commits, questions, etc. soon. ;-)

yes, let's go. don't hesitate.

As you have a git account, your are able to commit yourself. Right ?

Of course, to commit files, all must compile properly...

Gilles

[Antoni Bella Pérez]

El dimecres, 3 de gener de 2018, a les 17:14:19 CET, Gilles Caulier va
escriure:
> yes, let's go. don't hesitate.
>
> As you have a git account, your are able to commit yourself. Right ?
>
> Of course, to commit files, all must compile properly...

  Sure. First I will compile it.

  Toni