Git commit bd8139e1b2f802fa4569ec9e7c4196dde7166889 by Gilles Caulier.
Committed on 01/09/2016 at 10:31.
Pushed by cgilles into branch 'master'.

factoring Intro Contrib section between digiKam and Showfoto

M  +1    -0    TODO
M  +2    -1    digikam/index.docbook
M  +1    -45   digikam/intro-background.docbook
A  +53   -0    digikam/intro-contrib.docbook
M  +4    -46   showfoto/index.docbook

http://commits.kde.org/digikam-doc/bd8139e1b2f802fa4569ec9e7c4196dde7166889

diff --git a/TODO b/TODO
index 8267053..0fa4fb4 100644
--- a/TODO
+++ b/TODO
@@ -62,6 +62,7 @@ editor-transform-rotateflip.docbook
 editor-using.docbook
 index.docbook                              DONE            DONE               
Gilles
 intro-background.docbook
+intro-contrib.docbook                      DONE            DONE               
Gilles
 intro-camerasupport.docbook                *               DONE              
Wolfgang
 intro-database.docbook                                                        
Swati                Need to be created
 intro-fileformats.docbook                  DONE            DONE              
Wolfgang
diff --git a/digikam/index.docbook b/digikam/index.docbook
index 51e3adf..eda01bc 100644
--- a/digikam/index.docbook
+++ b/digikam/index.docbook
@@ -11,6 +11,7 @@
     <!-- Introduction Chapter -->
 
     <!ENTITY doc-intro-background                SYSTEM 
"intro-background.docbook">
+    <!ENTITY doc-intro-contrib                   SYSTEM 
"intro-contrib.docbook">
     <!ENTITY doc-intro-firstrun                  SYSTEM 
"intro-firstrun.docbook">
     <!ENTITY doc-intro-imageformats              SYSTEM 
"intro-imageformats.docbook">
     <!ENTITY doc-intro-movieformats              SYSTEM 
"intro-movieformats.docbook">
@@ -209,7 +210,7 @@
             <para>
                 <inlinemediaobject>
                     <imageobject><imagedata fileref="&path;logo-digikam.png" 
format="PNG"/></imageobject>
-                    <textobject> <phrase>&digikam; logo</phrase> </textobject>
+                    <textobject><phrase>&digikam; logo</phrase></textobject>
                 </inlinemediaobject>
             </para>
 
diff --git a/digikam/intro-background.docbook b/digikam/intro-background.docbook
index 915c7bb..deeedc9 100644
--- a/digikam/intro-background.docbook
+++ b/digikam/intro-background.docbook
@@ -22,51 +22,7 @@
 
     </sect2>
 
-    <sect2>
-        <title>Reporting Bugs</title>
-
-        <para>
-            &digikam; is an Open Source project. This means that it relies on 
its users to play their part by, at least, reporting problems and suggesting 
possible improvements.
-        </para>
-
-        <para>
-            &digikam; makes it as easy as possible for you to report bugs or 
suggest improvements. Wherever you are in the application the Help menu will 
include a Report Bugs option. This will display a message box with a 
highlighted link. Click on the link and your web browser will open the page for 
the reporting system. All the information required will already be filled in, 
just follow the instructions for completing your report.
-        </para>
-
-    </sect2>
-
-    <sect2>
-        <title>Support</title>
-
-        <para>
-            &digikam; is a community supported project, which means that users 
and developers support one another. If you become a regular user of &digikam; 
you are encouraged to join the &digikam; Users Mailing List. You can start off 
by asking questions to other &digikam; users and hopefully soon you will be 
answering the support questions of others.
-        </para>
-
-        <para>
-            <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-users";>&digikam; Users 
Mailing
-            List joining instructions.</ulink>
-        </para>
-
-        <para>
-            You can also visit the <ulink 
url="http://www.digikam.org";>&digikam; Home Page.</ulink> for news of new 
releases and other &digikam; related information.
-        </para>
-
-    </sect2>
-
-    <sect2>
-        <title>Getting Involved</title>
-
-        <para>
-            There are many ways that you can get involved with the continued 
development of &digikam;. You do not need to be a software developer. You can 
help with documentation, translation and user interface design or just 
contribute really good ideas to the wish-list. You can also get involved by 
testing early development code as it is being developed and providing feedback 
to the developers. Of course, if you are a software developer then you can help 
to make &digikam; the best digital photograph application there is.
-        </para>
-
-        <para>
-            The best way to start getting involved with &digikam; is to join 
the Developers Mailing List.
-            <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-devel";>&digikam; Developer 
Mailing
-            List joining instructions.</ulink>
-        </para>
-
-    </sect2>
+    &doc-intro-contrib;
 
 </sect1>
 
diff --git a/digikam/intro-contrib.docbook b/digikam/intro-contrib.docbook
new file mode 100644
index 0000000..4366b3f
--- /dev/null
+++ b/digikam/intro-contrib.docbook
@@ -0,0 +1,53 @@
+<sect2>
+    <title>Reporting Bugs</title>
+
+    <para>
+        &digikam; is an Open Source project. This means that it relies on its 
users to play their part by, at least, reporting problems and suggesting 
possible improvements.
+    </para>
+
+    <para>
+        &digikam; makes it as easy as possible for you to report bugs or 
suggest improvements. Wherever you are in the application the Help menu will 
include a Report Bugs option. This will display a message box with a 
highlighted link. Click on the link and your web browser will open the page for 
the reporting system. All the information required will already be filled in, 
just follow the instructions for completing your report.
+    </para>
+
+</sect2>
+
+<sect2>
+    <title>Support</title>
+
+    <para>
+        &digikam; is a community supported project, which means that users and 
developers support one another. If you become a regular user of &digikam; you 
are encouraged to join the &digikam; Users Mailing List. You can start off by 
asking questions to other &digikam; users and hopefully soon you will be 
answering the support questions of others.
+    </para>
+
+    <para>
+        <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-users";>&digikam; Users 
Mailing
+        List joining instructions.</ulink>
+    </para>
+
+    <para>
+        You can also visit the <ulink url="http://www.digikam.org";>&digikam; 
Home Page.</ulink> for news of new releases and other &digikam; related 
information.
+    </para>
+
+</sect2>
+
+<sect2>
+    <title>Getting Involved</title>
+
+    <para>
+        There are many ways that you can get involved with the continued 
development of &digikam;. You do not need to be a software developer. You can 
help with documentation, translation and user interface design or just 
contribute really good ideas to the wish-list. You can also get involved by 
testing early development code as it is being developed and providing feedback 
to the developers. Of course, if you are a software developer then you can help 
to make &digikam; the best digital photograph application there is.
+    </para>
+
+    <para>
+        The best way to start getting involved with &digikam; is to join the 
Developers Mailing List.
+        <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-devel";>&digikam; Developer 
Mailing
+        List joining instructions.</ulink>
+    </para>
+
+</sect2>
+
+<!--
+Local Variables:
+mode: sgml
+sgml-omittag: nil
+sgml-shorttag: t
+End:
+-->
diff --git a/showfoto/index.docbook b/showfoto/index.docbook
index 376736d..5c38954 100644
--- a/showfoto/index.docbook
+++ b/showfoto/index.docbook
@@ -10,6 +10,7 @@
     <!ENTITY digikam-app '<application>digiKam</application>'>
     <!ENTITY path "../digikam/"><!-- relative path to snapshots for showfoto 
-->
 
+    <!ENTITY doc-intro-contrib                   SYSTEM 
"../digikam/intro-contrib.docbook">
     <!ENTITY doc-intro-imageformats              SYSTEM 
"../digikam/intro-imageformats.docbook">
 
     <!ENTITY doc-using-sidebar                   SYSTEM 
"../digikam/using-sidebar.docbook">
@@ -99,7 +100,7 @@
     <!ENTITY doc-annexes-credits                 SYSTEM 
"../digikam/annexes-credits.docbook">
 
     <!-- Do not define any other entities; instead, use the entities
-        from kde-genent.entities and $LANG/user.entities. -->
+         from kde-genent.entities and $LANG/user.entities. -->
 ]>
 
 <book id="showfoto" lang="&language;">
@@ -165,50 +166,7 @@
 
             </sect2>
 
-            <sect2>
-                <title>Reporting Bugs</title>
-
-                <para>
-                    &showfoto; is an Open Source project. This means that it 
relies on its users to play their part by, at least, reporting problems and 
suggesting possible improvements.
-                </para>
-
-                <para>
-                    &showfoto; makes it as easy as possible for you to report 
bugs or suggest improvements. Wherever you are in the application the Help menu 
will include a Report Bugs option. This will display a message box with a 
highlighted link. Click on the link and your web browser will open the page for 
the reporting system. All the information required will already be filled in, 
just follow the instructions for completing your report.
-                </para>
-            </sect2>
-
-            <sect2>
-                <title>Support</title>
-
-                <para>
-                    &showfoto; is a community supported project, which means 
that users and developers support one another. If you become a regular user of 
&showfoto; you are encouraged to join the &showfoto; Users Mailing List. You 
can start off by asking questions of other &showfoto; users and hopefully soon 
you will be answering the support questions of others.
-                </para>
-
-                <para>
-                    <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-users";>&showfoto; Users 
Mailing
-                    List joining instructions.</ulink>
-                </para>
-
-                <para>
-                    You can also visit the <ulink 
url="http://www.digikam.org";>&digikam-app; Home Page.</ulink> for news of new 
releases and other &showfoto; related information.
-                </para>
-
-            </sect2>
-
-            <sect2>
-                <title>Getting Involved</title>
-
-                <para>
-                    There are many ways that you can get involved with the 
continued development of &showfoto;. You do not need to be a software 
developer. You can help with documentation, translation and user interface 
design or just contribute really good ideas to the wish-list. You can also get 
involved by testing early development code as it is being developed and 
providing feedback to the developers. Of course, if you are a software 
developer then you can help to make &showfoto; the best digital photograph 
application there is.
-                </para>
-
-                <para>
-                    The best way to start getting involved with &showfoto; is 
to join the Developers Mailing List.
-                <ulink 
url="https://mail.kde.org/mailman/listinfo/digikam-devel";>&showfoto; Developer 
Mailing
-                List joining instructions.</ulink>
-                </para>
-
-            </sect2>
+            &doc-intro-contrib;
 
         </sect1>
 
@@ -240,7 +198,7 @@
             <para>
                 <inlinemediaobject>
                     <imageobject><imagedata fileref="setup-general.png" 
format="PNG"/></imageobject>
-                    <textobject> <phrase>General Settings</phrase> 
</textobject>
+                    <textobject><phrase>General Settings</phrase></textobject>
                 </inlinemediaobject>
             </para>
 

Reply via email to