Git commit 1b05d6acc82c30fcedf068d2b9f1d7f5a63a4df3 by Yuri Chornoivan. Committed on 30/08/2016 at 16:43. Pushed by yurchor into branch 'master'.
Fix minor issues M +10 -10 digikam/intro-database.docbook M +1 -1 digikam/using-camera-basis.docbook M +2 -2 digikam/using-camera-processing.docbook http://commits.kde.org/digikam-doc/1b05d6acc82c30fcedf068d2b9f1d7f5a63a4df3 diff --git a/digikam/intro-database.docbook b/digikam/intro-database.docbook index f9d1914..25c9413 100644 --- a/digikam/intro-database.docbook +++ b/digikam/intro-database.docbook @@ -15,15 +15,15 @@ <orderedlist> <listitem><para> - Core database for all collection properties, i.e it hosts all albums, images and searches data. + Core database for all collection properties, &ie; it hosts all albums, images and searches data. </para></listitem> <listitem><para> - Thumbnails database for compressed thumbnails i.e. to host image thumbs with wavelets compression images. + Thumbnails database for compressed thumbnails &ie; to host image thumbs with wavelets compression images. </para></listitem> <listitem><para> - Face database for storing face recognition metadata i.e. to host face histogram for faces recognition. + Face database for storing face recognition metadata &ie; to host face histogram for faces recognition. </para></listitem> </orderedlist> @@ -44,7 +44,7 @@ </para> <para> - To make your application run fast and smoothly, it is recommended to check and optimize your databases once in awhile. This could be achieved using sqlite3 packages or sqlite browser (high quality, easy to use visual tool for managing database objects). For Ubuntu and its derivatives, it could be retrieved using sudo apt-get install sqlite3 or sudo apt-get install sqlitebrowser. Now all remains is to open the terminal, switch to the directory where databases and stored, and voila! + To make your application run fast and smoothly, it is recommended to check and optimize your databases once in awhile. This could be achieved using sqlite3 packages or sqlite browser (high quality, easy to use visual tool for managing database objects). For Ubuntu and its derivatives, it could be retrieved using <command>sudo apt-get install sqlite3</command> or <command>sudo apt-get install sqlitebrowser</command>. Now all remains is to open the terminal, switch to the directory where databases and stored, and voila! </para> <note><para> @@ -67,14 +67,14 @@ <title>The MySQL Database</title> <sect3> - <title>MySQL Versus QSlite</title> + <title>MySQL Versus SQLite</title> <para> <!-- TODO : add more description of Mysqland MAriabd, the history and differences, especially about how many items can be stored in each DB type (items and albums) --> </para> <para> - &digikam; also provides support for popular MySQL database engine. Of course, you might wonder why you’d want to switch to MySQL when SQLite already does a good job of managing the data? Using MySQL as &digikam;’s database back-end allows you to store the data on a remote server. This way, you can use multiple &digikam; installations (e.g. On your notebook and PC) to access and manage your photo collections. You can also use MySQL tools to backup and analyze &digikam;’s data. + &digikam; also provides support for popular MySQL database engine. Of course, you might wonder why you’d want to switch to MySQL when SQLite already does a good job of managing the data? Using MySQL as &digikam;’s database back-end allows you to store the data on a remote server. This way, you can use multiple &digikam; installations (⪚ On your notebook and PC) to access and manage your photo collections. You can also use MySQL tools to backup and analyze &digikam;’s data. </para> <para> @@ -84,7 +84,7 @@ <orderedlist> <listitem><para> - MySQL Internal: This allows to run an internal database server on your system. DigiKam uses Unix socket for the connection. + MySQL Internal: This allows to run an internal database server on your system. &digikam; uses Unix socket for the connection. </para></listitem> <listitem><para> @@ -116,7 +116,7 @@ <title>The MySQL Remote Server</title> <para> - Obviously, to use &digikam; with a remote MySQL, you would require a MySQL server. Or, you could also install MariaDB, which serves the purpose well.(Could be installed easily using this <ulink url="http://www.liquidweb.com/kb/how-to-install-mariadb-5-5-on-ubuntu-14-04-lts/";>link</ulink>. + Obviously, to use &digikam; with a remote MySQL, you would require a MySQL server. Or, you could also install MariaDB, which serves the purpose well. (Could be installed easily using this <ulink url="http://www.liquidweb.com/kb/how-to-install-mariadb-5-5-on-ubuntu-14-04-lts/";>link</ulink>.) </para> <para> @@ -136,7 +136,7 @@ </screen></blockquote> <note><para> - Note: If you have an enormous collection, you should start the MySQL server with “mysql --max_allowed_packet = 128M” + If you have an enormous collection, you should start the MySQL server with <command>mysql --max_allowed_packet = 128M</command> </para></note> <para> @@ -150,7 +150,7 @@ </para> <para> - Enter the IP address of your MySQL server in the Host Name field and specify the correct port in the Port field (the default port is 3306). In the Schema Name field, enter the name of the database for storing photo metadata, and specify the name of the database for storing thumbnails in the Thumbnails Schema Name field. Enter your MySQL username and password in the appropriate fields. To check whether the database connection works properly, press the Check DB Connection button. If everything works as it’s supposed to, switch to the Collections sections, and add the directories containing your photos. Hit OK, and wait till digiKam populates the databases with data from photos. This can take a while if you have a lot of photos. + Enter the IP address of your MySQL server in the <guilabel>Host Name</guilabel> field and specify the correct port in the <guilabel>Port</guilabel> field (the default port is 3306). In the <guilabel>Schema Name</guilabel> field, enter the name of the database for storing photo metadata, and specify the name of the database for storing thumbnails in the <guilabel>Thumbnails Schema Name</guilabel> field. Enter your MySQL username and password in the appropriate fields. To check whether the database connection works properly, press the <guibutton>Check DB Connection</guibutton> button. If everything works as it’s supposed to, switch to the Collections sections, and add the directories containing your photos. Hit <guibutton>OK</guibutton>, and wait till &digikam; populates the databases with data from photos. This can take a while if you have a lot of photos. </para> <para> diff --git a/digikam/using-camera-basis.docbook b/digikam/using-camera-basis.docbook index bf509dd..e33952c 100644 --- a/digikam/using-camera-basis.docbook +++ b/digikam/using-camera-basis.docbook @@ -1,5 +1,5 @@ <sect2 id="using-camera-basis"> -<title>Basic Camera Interfac Operations</title> +<title>Basic Camera Interface Operations</title> <sect3 id="using-camera-info"> <title>Getting information about photographs from the Camera</title> diff --git a/digikam/using-camera-processing.docbook b/digikam/using-camera-processing.docbook index 23a2f93..62f64f9 100644 --- a/digikam/using-camera-processing.docbook +++ b/digikam/using-camera-processing.docbook @@ -30,7 +30,7 @@ <title>Automatic Destination Albums Creation</title> <para> - If your camera provides information about the date of the photograph's taking, &digikam; can use this to automatically create subalbums in the destination Album when it is downloaded. Subalbums names will be based on image dates. All images which have the same date will be downloaded into the same subalbum. Not all cameras include this information. See the <link linkend="using-sidebar-metadata"> sidebar Meta-Data</link> section for more detail aboutinformation your camera may have embedded in your photographs. + If your camera provides information about the date of the photograph's taking, &digikam; can use this to automatically create subalbums in the destination Album when it is downloaded. Subalbums names will be based on image dates. All images which have the same date will be downloaded into the same subalbum. Not all cameras include this information. See the <link linkend="using-sidebar-metadata"> sidebar Meta-Data</link> section for more detail about information your camera may have embedded in your photographs. </para> <example> @@ -46,7 +46,7 @@ </example> <para> - This option is switched off by default and in this case &digikam; will download the photographsin the root destination Albums. If you would like to switch on this option click the <guilabel>Advanced</guilabel> button and select the <guilabel>Download photo in automatically</guilabel> option at the bottom of the window. + This option is switched off by default and in this case &digikam; will download the photographs in the root destination Albums. If you would like to switch on this option click the <guilabel>Advanced</guilabel> button and select the <guilabel>Download photo in automatically</guilabel> option at the bottom of the window. </para> </sect3>
