[kde-doc-english] [krecipes/2.0] doc: backport from master

Burkhard Lück lueck at hube-lueck.de
Fri Apr 11 20:27:38 UTC 2014


Git commit 484834a33433b80ead536e5f5fee0ae9402ec2ab by Burkhard Lück.
Committed on 11/04/2014 at 20:27.
Pushed by lueck into branch '2.0'.

backport from master

M  +262  -285  doc/index.docbook

http://commits.kde.org/krecipes/484834a33433b80ead536e5f5fee0ae9402ec2ab

diff --git a/doc/index.docbook b/doc/index.docbook
index c4bb2b6..c48eb9d 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -15,7 +15,7 @@
 
 <!-- The language must NOT be changed here. -->
 
-<book lang="&language;">
+<book id="krecipes" lang="&language;">
 
 <!-- This header contains all of the meta-information for the document such
 as Authors, publish date, the abstract, and Keywords -->
@@ -113,7 +113,10 @@ consistent documentation style across all KDE apps. -->
 application that explains what it does and where to report
 problems. Basically a long version of the abstract.  Don't include a
 revision history. (see installation appendix comment) -->
-
+<!--FIXME <emphasis>&krecipes;</emphasis> ist duplicated markup = <emphasis><application> 
+used here because we have no visuell representation for application markup?
+How to handle this?
+-->
 <para>
 <emphasis>&krecipes;</emphasis> is a program that lets you to manage your
 recipes, create shopping lists, choose a recipe based on available ingredients
@@ -191,8 +194,8 @@ following —</para>
 
 <itemizedlist><listitem><para>A title showing the name of the component
 selected</para></listitem>
-<listitem><para><emphasis><guilabel>Basic</guilabel></emphasis> (the default)
-and <emphasis><guilabel>Advanced</guilabel></emphasis> tabs</para></listitem>
+<listitem><para><guilabel>Basic</guilabel> (the default)
+and <guilabel>Advanced</guilabel> tabs</para></listitem>
 <listitem><para>A text box to <userinput>enter search
 criteria</userinput></para>
 <note><para>A cool feature here is that <emphasis>&krecipes;</emphasis>
@@ -214,7 +217,7 @@ right-hand corner of the pane containing the component list.  This icon appears
 in all &krecipes; components and when clicked, will open the corresponding
 section of this Handbook if you need extra help at any time.</para></tip>
 
-<para>With the <emphasis><guilabel>Basic</guilabel></emphasis> tab active and
+<para>With the <guilabel>Basic</guilabel> tab active and
 the list of recipe categories displayed, a category can be expanded by clicking
 on the <guibutton>+</guibutton> button beside the category name.  The category
 will automatically expand to show your recipes and/or subcategories, if there
@@ -229,7 +232,7 @@ created</emphasis>, <emphasis>modified</emphasis> and <emphasis>last accessed
 category name will collapse the category.</para>
 
 <sect2 id="right-click-menu">
-<title>The "Right-Click" Menu</title>
+<title>The <quote>Right-Click</quote>Menu</title>
 
 <para><emphasis>&krecipes;</emphasis> allows a multitude of ways to perform
 various actions on your recipes.  These actions are described in their
@@ -278,7 +281,7 @@ the desired recipes by clicking on them.</para></note>
 <sect2 id="advanced-tab">
 <title>The Advanced Tab</title>
 <para>
-The purpose of the <emphasis><guilabel>Advanced</guilabel></emphasis> tab
+The purpose of the <guilabel>Advanced</guilabel> tab
 is to provide advanced search capability.  Queries for recipes can be made
 based on nine search criteria, alone or in combination —
 </para>
@@ -322,7 +325,7 @@ Advanced Search tab.</screeninfo>
 </screenshot>
 </para>
 
-<para>When the <emphasis><guilabel>Advanced</guilabel></emphasis> tab is
+<para>When the <guilabel>Advanced</guilabel> tab is
 selected, the components will be collapsed and show >> beside the
 label of the component.  To expand a section, simply click on the label of
 the component.	Conversely, with the component expanded,  << will show
@@ -335,7 +338,7 @@ criteria will still be considered in the search.</para></note>
 
 
 <para>For all search components in the
-<emphasis><guilabel>Advanced</guilabel></emphasis> tab, click the
+<guilabel>Advanced</guilabel> tab, click the
 <guibutton>Search</guibutton> button to initiate the search once all desired
 search criteria have been selected.  Clicking the <guibutton>Clear</guibutton>
 button will clear the search selections and the search results.</para>
@@ -354,8 +357,8 @@ found —</quote> will display in the recipe list area.</para></note>
 <emphasis>Chicken Rice</emphasis>.  Using these words, recipes that
 contain the words <quote>Chicken</quote>, or <quote>Rice</quote>,
 or <emphasis>both</emphasis> in the title will appear in your results.
-However, if you click the tickbox beside the <emphasis><guilabel>Require
-All Words</guilabel></emphasis> label, only those recipes that have both
+However, if you click the tickbox beside the <guilabel>Require
+All Words</guilabel> label, only those recipes that have both
 <quote>Chicken</quote> <emphasis>AND</emphasis> <quote>Rice</quote> in the
 title will be found.</para>
 
@@ -364,11 +367,11 @@ title will be found.</para>
 <sect3 id="using-adv-ingredients">
 <title>The Ingredients Search</title>
 
-<para>In the <emphasis><guilabel>Ingredients</guilabel></emphasis> component
-of the <emphasis><guilabel>Advanced</guilabel></emphasis> tab, single or
+<para>In the <guilabel>Ingredients</guilabel> component
+of the <guilabel>Advanced</guilabel> tab, single or
 multi-word ingredients can be searched for. Single word ingredients are entered
 in the text box with a space between each ingredient.  Multi-word ingredients
-are enclosed in quotes, for example, "ice cream".</para>
+are enclosed in quotes, for example, <quote>ice cream</quote>.</para>
 
 <para>Searches may also be done using wild cards – <quote>*</quote>
 to replace any number of characters, or <quote>?</quote> to replace a single
@@ -384,19 +387,19 @@ the ingredient name might appear in the title.</para></note>
 
 <itemizedlist>
 
-<listitem><para><emphasis><guilabel>Uses all:</guilabel></emphasis> –
+<listitem><para><guilabel>Uses all:</guilabel> –
 If the search terms are entered in this text box, it is being stated that
 the recipe(s) <emphasis>MUST</emphasis> contain all ingredients listed
 and therefore, only those recipes that contain <emphasis>ALL</emphasis>
 ingredients will be returned as results of the search.</para></listitem>
 
-<listitem><para><emphasis><guilabel>Uses any of:</guilabel></emphasis>
+<listitem><para><guilabel>Uses any of:</guilabel>
 – If the search terms are entered in this text box, it is being stated
 that the recipe(s) <emphasis>MAY</emphasis> contain any of the ingredients
 specified.  The search results will return recipes that contain <emphasis>ANY
 OR ALL</emphasis> of the ingredients.</para></listitem>
 
-<listitem><para><emphasis><guilabel>Without:</guilabel></emphasis> –
+<listitem><para><guilabel>Without:</guilabel> –
 If the search terms are entered in this text box, it is being specified that
 the recipes returned as results of the search <emphasis>MUST NOT</emphasis>
 contain <emphasis>ANY</emphasis> of the listed ingredients.</para></listitem>
@@ -408,34 +411,34 @@ contain <emphasis>ANY</emphasis> of the listed ingredients.</para></listitem>
 <sect3 id="using-adv-categories">
 <title>The Categories Search</title>
 
-<para>As in the <emphasis><guilabel>Ingredients</guilabel></emphasis>
-component of the <emphasis><guilabel>Advanced</guilabel></emphasis> tab,
-search parameters in the <emphasis><guilabel>Categories</guilabel></emphasis>
+<para>As in the <guilabel>Ingredients</guilabel>
+component of the <guilabel>Advanced</guilabel> tab,
+search parameters in the <guilabel>Categories</guilabel>
 component are entered with a space between each parameter, or enclosed in
 quotes for multi-word parameters.  You can also use wildcards for searching
 categories.  See the section, <link linkend="using-wildcards">Using Wildcards
 in Searches</link> for an explanation on the use of wildcards.</para>
 
 <para>Searching for recipes in
-<emphasis><guilabel>Categories</guilabel></emphasis> is done by specifying
+<guilabel>Categories</guilabel> is done by specifying
 the criteria on which you wish to base the search as follows —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>In all:</guilabel></emphasis> –
+<listitem><para><guilabel>In all:</guilabel> –
 indicates that the recipes returned in the search should be in all the
 categories listed. This search might be used if you are looking for a recipe
 that appears in the <emphasis>Dessert</emphasis> category and also, in the
 <emphasis>Cakes</emphasis> category.</para></listitem>
-<listitem><para><emphasis><guilabel>In any of:</guilabel></emphasis>
+<listitem><para><guilabel>In any of:</guilabel>
 – is specifying that recipes returned in the search may be from
 <emphasis>ANY</emphasis> of the categories, but a recipe may not necessarily
 be found in all categories listed.</para></listitem>
-<listitem><para><emphasis><guilabel>Not in:</guilabel></emphasis> –
+<listitem><para><guilabel>Not in:</guilabel> –
 is indicating that the recipes returned in the search <emphasis>MUST
 NOT</emphasis> be from the categories listed.</para></listitem>
 </itemizedlist>
 
-<para>The use of the <emphasis><guilabel>Categories</guilabel></emphasis>
+<para>The use of the <guilabel>Categories</guilabel>
 search is most useful when combined with other search parameters.</para>
 
 <para>In the following screenshot, it is being specified that recipes should
@@ -488,8 +491,8 @@ a category and additional criteria.</screeninfo>
 
 <para>Are you looking for a recipe given to you by a certain person or
 input into <emphasis>&krecipes;</emphasis> from a specific magazine?
-The <emphasis><guilabel>Authors</guilabel></emphasis> component of the
-<emphasis><guilabel>Advanced</guilabel></emphasis> tab allows you to find
+The <guilabel>Authors</guilabel> component of the
+<guilabel>Advanced</guilabel> tab allows you to find
 that recipe!</para>
 
 <para>As with the searches previously described, you can search using
@@ -498,25 +501,25 @@ linkend="using-wildcards">Using Wildcards in Searches</link>.  Names are
 entered with a space between if, for instance, you are searching for a recipe
 by only a first name.  Whole names, or for situations where you have entered
 a magazine name as the recipe source (Author), the name is entered enclosed
-in quotes, for example, <quote><emphasis>Jason Kivlighn</emphasis></quote>,
-or <quote><emphasis>Vegetarian Times</emphasis></quote>.</para>
+in quotes, for example, <quote>Jason Kivlighn</quote>,
+or <quote>Vegetarian Times</quote>.</para>
 
 <para>Searches can be performed in the following ways —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>By any of:</guilabel></emphasis>
+<listitem><para><guilabel>By any of:</guilabel>
 – This search would be used if the recipes desired are
 by <emphasis>ANY</emphasis> of the authors listed in the text
 box.</para></listitem>
-<listitem><para><emphasis><guilabel>By all:</guilabel></emphasis>
+<listitem><para><guilabel>By all:</guilabel>
 – This search would be used in situations where recipes
 have <quote>co-authors</quote>.  An example of this would
-be:  <emphasis><quote>Canadian Living Cooks</quote></emphasis>
-<emphasis><quote>Elizabeth Baird</quote></emphasis>.  This would
+be:  <quote>Canadian Living Cooks</quote>
+<quote>Elizabeth Baird</quote>.  This would
 return only recipes where <emphasis>Canadian Living Cooks</emphasis>
 and <emphasis>Elizabeth Baird</emphasis> are both listed as the recipe
 source/author.</para></listitem>
-<listitem><para><emphasis><guilabel>Not by:</guilabel></emphasis> –
+<listitem><para><guilabel>Not by:</guilabel> –
 This search would be used when you want to exclude certain authors from
 your search.</para></listitem>
 </itemizedlist>
@@ -526,29 +529,29 @@ your search.</para></listitem>
 <sect3 id="using-adv-yield">
 <title>The Yield Search</title>
 
-<para>The <emphasis><guilabel>Yield</guilabel></emphasis> component in
-the <emphasis><guilabel>Advanced</guilabel></emphasis> tab is slightly
+<para>The <guilabel>Yield</guilabel> component in
+the <guilabel>Advanced</guilabel> tab is slightly
 different from the searches described thus far in that it must be
 <emphasis>Enabled</emphasis> in order to have it utilized in the search
 criteria.</para>
 
-<para>To enable <emphasis><guilabel>Yield</guilabel></emphasis>
+<para>To enable <guilabel>Yield</guilabel>
 as a criteria for your search, click the tick box beside the
-<emphasis><guilabel>Enabled</guilabel></emphasis> label.  Once you have
+<guilabel>Enabled</guilabel> label.  Once you have
 designated this to be part of your search, you can define the yield by
 selecting from the drop-down menu as follows —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>Yields at least:</guilabel></emphasis>
+<listitem><para><guilabel>Yields at least:</guilabel>
 – This would be specified if you want the recipe(s) to be able
 to provide a minimum number of portions.  The recipe(s) returned COULD
 yield <emphasis>MORE</emphasis> than this number, but cannot yield
 less.</para></listitem>
-<listitem><para><emphasis><guilabel>Yields at most:</guilabel></emphasis>
+<listitem><para><guilabel>Yields at most:</guilabel>
 – This would be specified if you want recipe(s) that are returned in
 the search to yield <emphasis>NO MORE THAN</emphasis> a specified number
 of portions.</para></listitem>
-<listitem><para><emphasis><guilabel>Yields about:</guilabel></emphasis>
+<listitem><para><guilabel>Yields about:</guilabel>
 – This would be used to approximate the number of portions you want
 in the recipe(s). The recipes(s) returned could yield <emphasis>SLIGHTLY
 MORE</emphasis> or <emphasis>SLIGHTLY LESS</emphasis> than a specified number
@@ -573,25 +576,25 @@ results for 24 cookies, 24 squares, etc., even though these are technically
 <sect3 id="using-adv-preptime">
 <title>The Preparation Time Search</title>
 
-<para>The <emphasis><guilabel>Preparation Time</guilabel></emphasis> component
-in the <emphasis><guilabel>Advanced</guilabel></emphasis> tab is used in the
-same manner as the <emphasis><guilabel>Yield</guilabel></emphasis> component.
+<para>The <guilabel>Preparation Time</guilabel> component
+in the <guilabel>Advanced</guilabel> tab is used in the
+same manner as the <guilabel>Yield</guilabel> component.
 It must be <emphasis>Enabled</emphasis> in order to have it utilized in the
 search criteria.</para>
 
-<para>To enable <emphasis><guilabel>Preparation Time</guilabel></emphasis>
+<para>To enable <guilabel>Preparation Time</guilabel>
 as a criteria for your search, click the tick box beside the
-<emphasis><guilabel>Enabled</guilabel></emphasis> label.  Once you have
+<guilabel>Enabled</guilabel> label.  Once you have
 designated this to be part of your search, you can define the time criteria
 by selecting from the drop-down menu as follows —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>Ready in at most:</guilabel></emphasis>
+<listitem><para><guilabel>Ready in at most:</guilabel>
 – This would be utilized if you want the recipe(s) to be ready within a
 specified time frame.  The recipe(s) returned COULD be ready in <emphasis>LESS
 THAN</emphasis> or <emphasis>EXACTLY</emphasis> the time specified, but cannot
 be ready in greater than the time chosen for preparation.</para></listitem>
-<listitem><para><emphasis><guilabel>Ready in about:</guilabel></emphasis>
+<listitem><para><guilabel>Ready in about:</guilabel>
 – This choice allows some flexibility and would be used to approximate
 the time needed to prepare the recipe.	The recipe(s) that are returned
 in the search can be ready in <emphasis>SLIGHTLY MORE</emphasis>,
@@ -613,24 +616,24 @@ can be used alone or in combination.</para>
 
 <para>Are you interested in finding a recipe that contains
 certain instructions or is prepared a certain way?  The
-<emphasis><guilabel>Instructions</guilabel></emphasis> component in the
-<emphasis><guilabel>Advanced</guilabel></emphasis> tab allows you to search
+<guilabel>Instructions</guilabel> component in the
+<guilabel>Advanced</guilabel> tab allows you to search
 the recipe instructions for specific terms that might include a preparation
-method, such as <quote><emphasis>Bake at 350</emphasis></quote>, or a suggested
+method, such as <quote>Bake at 350</quote>, or a suggested
 garnish.  However, these are just examples of how this component might be
 used.  Any term(s) that might appear in the <emphasis>Instructions</emphasis>
 of a recipe can be used.</para>
 
-<para>To utilize the <emphasis><guilabel>Instructions</guilabel></emphasis>
+<para>To utilize the <guilabel>Instructions</guilabel>
 search, simply type the keyword or keywords in the text box beside the
-<emphasis><guilabel>Keywords:</guilabel></emphasis> label.  Enter keywords
+<guilabel>Keywords:</guilabel> label.  Enter keywords
 separated by spaces, or multi-word instructions enclosed in quotes.  Wild cards
 can also be used.  For instructions on the use of wildcards, see the section
 <link linkend="using-wildcards">Using Wildcards in Searches</link>.</para>
 
 <para>Should you require that the search contain all the keywords
-listed, click the tick box beside the <emphasis><guilabel>Require All
-Words</guilabel></emphasis> label.</para>
+listed, click the tick box beside the <guilabel>Require All
+Words</guilabel> label.</para>
 
 </sect3>
 
@@ -640,17 +643,17 @@ Words</guilabel></emphasis> label.</para>
 <para>By definition, <emphasis>Meta Data</emphasis> is
 <quote>data about data</quote>, or expressed another way, is
 <quote>information that describes another set of data</quote>.
-The <emphasis><guilabel>Meta Data</guilabel></emphasis> component in the
-<emphasis><guilabel>Advanced</guilabel></emphasis> tab allows you to search
+The <guilabel>Meta Data</guilabel> component in the
+<guilabel>Advanced</guilabel> tab allows you to search
 your recipes based on information about them, as follows —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>Created:</guilabel></emphasis> –
+<listitem><para><guilabel>Created:</guilabel> –
 This is the date that the recipe was created on.</para></listitem>
-<listitem><para><emphasis><guilabel>Modified:</guilabel></emphasis>
+<listitem><para><guilabel>Modified:</guilabel>
 – This is the date that the last revision was made to the
 recipe.</para></listitem>
-<listitem><para><emphasis><guilabel>Last accessed:</guilabel></emphasis>
+<listitem><para><guilabel>Last accessed:</guilabel>
 – This is the date that the recipe was last opened or
 <quote>used</quote>.</para></listitem>
 </itemizedlist>
@@ -660,7 +663,7 @@ date may be entered as an exact date if this is known or desired, or as
 a <quote>date range</quote>.  Dates are interpreted in the format that has
 been set within the &kde; environment.	For example, if the date format has
 been set to display as DD-MM-YYYY, you may enter the date directly into the
-text box in the format of "DD-MM-YYYY".  When entering the date, the two
+text box in the format of <quote>DD-MM-YYYY</quote>.  When entering the date, the two
 initial digits of the year may be entered, but are not absolutely necessary.
 However, it is imperative that you use the exact separator <abbrev>i.e.
 </abbrev> the dash (–), in the example, as set in the date format in
@@ -671,7 +674,7 @@ enter the date to reveal a calendar.</para>
 and are using a <emphasis>date range</emphasis> as opposed to an exact date,
 ensure that the dates for the start and end of the range are entered in the
 same format.  For example, if you enter the starting date for the range in
-the format of "DD-MM-YY" and the ending date for the range in the format of
+the format of <quote>DD-MM-YY</quote> and the ending date for the range in the format of
 "DD/MM/YY", either no recipes will be found or the results returned will
 include only those recipes that fit the criteria for the starting date,
 if this date agrees with the format as set in &kde;.</para></caution>
@@ -763,16 +766,16 @@ selected.</para>
 <title>Searching by Average Rating</title>
 <para>If you choose to search by average rating,
 select the <emphasis>Radio Button</emphasis> beside the
-<emphasis><guilabel>By average:</guilabel></emphasis> label.  Then,
+<guilabel>By average:</guilabel> label.  Then,
 enter a numerical value in the text box that precedes the label
-<emphasis><guilabel>stars</guilabel></emphasis>.  This value is the average
+<guilabel>stars</guilabel>.  This value is the average
 of the number of stars assigned to each parameter under which the recipe was
 rated and can be a fixed value or a range, for example <emphasis>3-4</emphasis>
 stars.	Fractional amounts are also permitted, for example, 3.5.</para>
 
 <para>Once you have entered your search parameters, click the
 <guibutton>Search</guibutton> button and the recipes that meet the search
-criteria will display under the <emphasis><guilabel>Title</guilabel></emphasis>
+criteria will display under the <guilabel>Title</guilabel>
 label on the right.  Should no recipes meet the criteria, <emphasis>---
 No matching recipes found ---</emphasis> will display.</para>
 </sect4>
@@ -780,8 +783,8 @@ No matching recipes found ---</emphasis> will display.</para>
 <sect4 id="rating-criteria-srch">
 <title>Searching by Rating Criteria</title>
 <para>To search by rating criteria, select the <emphasis>Radio
-Button</emphasis> beside the <emphasis><guilabel>By
-criteria:</guilabel></emphasis> label.	First, select the criteria that you
+Button</emphasis> beside the <guilabel>By
+criteria:</guilabel> label.	First, select the criteria that you
 want to use for your rating from the drop-down menu.  In the text box next
 to this, enter the value of the number of stars for which you want recipes
 displayed, for example, 4.  Entry is permitted in the following formats
@@ -815,7 +818,7 @@ fileref="list-add.png" format="PNG"/></imageobject></inlinemediaobject>
 the criteria added to the list. More than one criteria may be utilized in the
 search. Once you have entered your search parameters, click the <guibutton>
 Search</guibutton> button and the recipes that meet the search criteria will
-display under the <emphasis><guilabel>Title</guilabel></emphasis> label on the
+display under the <guilabel>Title</guilabel> label on the
 right. Should no recipes meet the criteria, <emphasis>--- No matching recipes
 found ---</emphasis> will display.</para>
 
@@ -884,10 +887,10 @@ The <quote>Edit Recipe</quote> screen will display.
 entry of a different aspect of the recipe.  These tabs are —</para>
 
 <itemizedlist>
-<listitem><para><emphasis><guilabel>Recipe</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Ingredients</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Instructions</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Ratings</guilabel></emphasis></para></listitem>
+<listitem><para><guilabel>Recipe</guilabel></para></listitem>
+<listitem><para><guilabel>Ingredients</guilabel></para></listitem>
+<listitem><para><guilabel>Instructions</guilabel></para></listitem>
+<listitem><para><guilabel>Ratings</guilabel></para></listitem>
 
 </itemizedlist>
 
@@ -993,14 +996,14 @@ linkend="categories-component">The Categories Component</link>.</para></tip>
 
 <para>Setting the amount that the recipe will yield is
 performed by entering a value in the text box beneath the
-<emphasis><guilabel>Amount</guilabel></emphasis> label.  It is possible to
+<guilabel>Amount</guilabel> label.  It is possible to
 enter a numerical range for this number, for example, 3-4.  When entering a
 range, if an incorrect value or format is entered, the entry will turn red
 indicating that a correction is necessary.</para>
 
 <para>The second part of entering a yield is to enter the
 <emphasis>type</emphasis>.  This is done by entering text in the text box
-beneath the <emphasis><guilabel>Type</guilabel></emphasis> label.  The text
+beneath the <guilabel>Type</guilabel> label.  The text
 entered can be anything you choose that is appropriate for the recipe yield
 type, for example, <emphasis>servings</emphasis>, <emphasis>dozen</emphasis>,
 or <emphasis>squares</emphasis>.  As you begin to type the yield type,
@@ -1033,7 +1036,7 @@ number is reached.</para></listitem>
 <sect3 id="photo-change">
 <title>Changing the Default Photo</title>
 
-<para>In the <emphasis><guilabel>Recipe</guilabel></emphasis>
+<para>In the <guilabel>Recipe</guilabel>
 tab, the displayed photo can also be changed by clicking on the
 <guibutton>...</guibutton> button and selecting a photo for insertion.
 Alternatively, a  photo may be inserted by dragging a graphic from any other
@@ -1078,21 +1081,21 @@ Recipe tab of the &krecipes; recipe entry interface.</screeninfo>
 <title>Entering Recipe Ingredients</title>
 
 <para>To enter the recipe ingredients, click on the
-<emphasis><guilabel>Ingredients</guilabel></emphasis>
+<guilabel>Ingredients</guilabel>
 tab.  By default, the radio button beside the label
-<emphasis><guilabel>Ingredient:</guilabel></emphasis> is selected.
+<guilabel>Ingredient:</guilabel> is selected.
 However, <emphasis>&krecipes;</emphasis> also allows the entry of a
-<emphasis><guilabel>Header:</guilabel></emphasis> by selecting the radio
+<guilabel>Header:</guilabel> by selecting the radio
 button beside this label.</para>
 
 <para>Ideally, the header should be created first, for example
 <quote>Cake</quote> or <quote>Frosting</quote>.  To do this, ensure that
-the <emphasis><guilabel>Header:</guilabel></emphasis> radio button is
+the <guilabel>Header:</guilabel> radio button is
 selected. Enter the desired name for the header in the text box then,
 press the &Enter; key, or click the <guibutton>Add ingredient</guibutton>
 button located at the top right-hand side of the ingredient list.
 Once this is done, the radio button will automatically revert to the
-<emphasis><guilabel>Ingredient:</guilabel></emphasis> selection.  Then,
+<guilabel>Ingredient:</guilabel> selection.  Then,
 ingredients can be entered.  You will note that as you enter each ingredient,
 it will appear below the header indented in a <quote>file tree</quote>
 type of format.</para>
@@ -1135,7 +1138,7 @@ will allow the entry of ranges for ingredients</para></listitem>
 <para>When you enter a unit, if it does not exist in your <emphasis>Units
 list</emphasis>, it will automatically be added and a dialog box will appear
 prompting for the entry of a plural for the unit.  Enter the plural in the
-text box beside the label <emphasis><guilabel>Plural:</guilabel></emphasis>.
+text box beside the label <guilabel>Plural:</guilabel>.
 Additionally, you can add an abbreviation for both the singular and plural
 forms of the unit as shown in the following diagram.</para>
 
@@ -1262,8 +1265,8 @@ instructions on all aspects of setting ingredient details.</para>
 <para>or,</para></listitem>
 
 <listitem><para>Conversion information is lacking.</para>
-<para>For this example, you are being told that a conversion from "No unit" to
-"cup" and "cup" to "grams" cannot be done.  Conversion factors for your units
+<para>For this example, you are being told that a conversion from <quote>No unit</quote> to
+<quote>cup</quote> and <quote>cup</quote> to <quote>grams</quote> cannot be done. Conversion factors for your units
 are set in the <emphasis>Units</emphasis> component.  For more information
 on Units and their conversions see <link linkend="units-component">The Units
 Component</link>.</para></listitem>
@@ -1379,8 +1382,8 @@ into <emphasis>&krecipes;</emphasis>?  You can do that with the
 <para>Find the recipe that you wish to enter into
 <emphasis>&krecipes;</emphasis>.  Start the interface for
 entering a new recipe and enter the appropriate parameters in the
-<emphasis><guilabel>Recipe</guilabel></emphasis> tab.  Move to
-the <emphasis><guilabel>Ingredients</guilabel></emphasis>
+<guilabel>Recipe</guilabel> tab.  Move to
+the <guilabel>Ingredients</guilabel>
 tab.  Copy the recipe ingredients from your chosen
 source and initiate the Copy/Paste interface by clicking the
 <guiicon><inlinemediaobject><imageobject><imagedata fileref="edit-paste.png"
@@ -1399,8 +1402,8 @@ will be added to your ingredient and/or units list if it does not exist.</para>
 <para>Once your ingredients are formatted to your liking, click
 the <guibutton>Parse Text</guibutton> button.  The ingredient
 list will be transferred to the lower portion of the window
-beneath the label <emphasis><guilabel>Ingredients as understood by
-&krecipes;:</guilabel></emphasis>.  From this portion of the screen, you
+beneath the label <guilabel>Ingredients as understood by
+&krecipes;:</guilabel>.  From this portion of the screen, you
 can set any <emphasis>Headers</emphasis> by clicking on the <guibutton>Set
 Header</guibutton> button to the right.</para>
 
@@ -1419,7 +1422,7 @@ described above.</para>
 <para>You can now proceed to enter the recipe instructions as
 described below.  The method for preparing your recipe can be
 copied from the source that you are using and pasted into the
-<emphasis><guilabel>Instructions</guilabel></emphasis> tab.</para>
+<guilabel>Instructions</guilabel> tab.</para>
 
 <para>
 <screenshot>
@@ -1444,7 +1447,7 @@ Parser interface.</screeninfo>
 <title>Entering the Recipe Instructions</title>
 
 <para>To enter the recipe instructions, click on the
-<emphasis><guilabel>Instructions</guilabel></emphasis> tab.</para>
+<guilabel>Instructions</guilabel> tab.</para>
 
 <para>Entering the recipe instructions is easy – in the white space
 provided,  simply type in the steps necessary to complete the preparation
@@ -1526,7 +1529,7 @@ recipe are —</para>
 <listitem><para>Overall</para></listitem>
 </itemizedlist>
 
-<para>Initially, in the <emphasis><guilabel>Ratings</guilabel></emphasis> tab,
+<para>Initially, in the <guilabel>Ratings</guilabel> tab,
 there is only a blank screen with the <guibutton>Add Rating...</guibutton>
 button at the bottom.  Clicking this button will start the interface for
 entering ratings.</para>
@@ -1539,13 +1542,13 @@ elements —</para>
 their opinion of the recipe</para>
 <para>To complete this element <userinput>enter the rater's
 name</userinput> in the text box that appears beside the label
-<emphasis><guilabel>Rater:</guilabel></emphasis>.</para></listitem>
+<guilabel>Rater:</guilabel>.</para></listitem>
 
 <listitem><para>Criteria: – this is the criteria on which the recipe
 is rated</para>
 <para>Select the criteria against which you want to rate
 the recipe from the drop-down menu that appears beside the
-<emphasis><guilabel>Criteria:</guilabel></emphasis> label. Five default choices
+<guilabel>Criteria:</guilabel> label. Five default choices
 exist for rating criteria, as listed above, but if you have another against
 which you want to rate your recipe, it can be typed directly into the text box
 and will automatically be added to your rating criteria list.</para></listitem>
@@ -1585,7 +1588,7 @@ recipe, or a serving suggestion such as <emphasis>Great served with ice
 cream</emphasis></para>
 
 <para>To enter a comment, simply position your cursor in the white space
-beneath the <emphasis><guilabel>Comments:</guilabel></emphasis> label and
+beneath the <guilabel>Comments:</guilabel> label and
 begin typing.</para></listitem>
 
 </itemizedlist>
@@ -1634,7 +1637,7 @@ recipe entry interface.</screeninfo>
 <itemizedlist>
 <listitem><para>Spell-check – this is accomplished by selecting 
 <guilabel>Check Spelling</guilabel> from the context menu of the input area in the
-<emphasis><guilabel>Instructions</guilabel></emphasis> tab</para></listitem>
+<guilabel>Instructions</guilabel> tab</para></listitem>
 <listitem><para>Save – click on the <guibutton>Save recipe</guibutton> button
 that appears on the bottom of the screen</para>
 
@@ -1693,10 +1696,10 @@ button to resize the recipe</para>
 <listitem><para>Scale by yield —</para>
 
 <para>To scale by yield, select the <emphasis>Radio Button</emphasis> beside
-the <emphasis><guilabel>Scale by yield</guilabel></emphasis> label.  Below this
-and beside the <emphasis><guilabel>Current yield:</guilabel></emphasis> label,
-the current yield of your recipe is shown.  Beside the <emphasis><guilabel>New
-yield:</guilabel></emphasis>, there is a text box in which to <userinput>enter
+the <guilabel>Scale by yield</guilabel> label.  Below this
+and beside the <guilabel>Current yield:</guilabel> label,
+the current yield of your recipe is shown.  Beside the <guilabel>New
+yield:</guilabel>, there is a text box in which to <userinput>enter
 the new yield amount desired</userinput>.</para>
 
 <note><para>If you have entered a range for your yield amount,
@@ -1707,10 +1710,10 @@ it is scaling.</para></note></listitem>
 <listitem><para>Scale by factor —</para>
 
 <para>To scale by factor, click the <emphasis>Radio Button</emphasis>
-beside the <emphasis><guilabel>Scale by factor</guilabel></emphasis>
+beside the <guilabel>Scale by factor</guilabel>
 label.	Enter <userinput>the desired scaling factor</userinput> in the
-text box beside the <emphasis><guilabel>Factor (i.e. 1/2 to half; 3 to
-triple):</guilabel></emphasis> label.</para></listitem>
+text box beside the <guilabel>Factor (i.e. 1/2 to half; 3 to
+triple):</guilabel> label.</para></listitem>
 </orderedlist>
 
 <para>In either of these scenarios, click the <guibutton>OK</guibutton>
@@ -1756,9 +1759,9 @@ Recipe</link>.</para>
 <itemizedlist>
 <listitem><para>the Recipe Name, Authors, Categories, Yield
 Amount, Yield Type, Preparation Time and/or graphic from the
-<emphasis><guilabel>Recipe</guilabel></emphasis> tab</para></listitem>
+<guilabel>Recipe</guilabel> tab</para></listitem>
 <listitem><para>the Amount, Units, and/or Preparation method for each of the
-listed ingredients in the <emphasis><guilabel>Ingredients</guilabel></emphasis>
+listed ingredients in the <guilabel>Ingredients</guilabel>
 tab</para>
 <note><para>Also in this tab, an ingredient can be added by clicking
 on the <guibutton>New Ingredient</guibutton> button that appears on the
@@ -1767,7 +1770,7 @@ top, right-hand side of the ingredient list, or deleted by clicking on the
 format="PNG"/></imageobject></inlinemediaobject></guiicon>
 button</para></note></listitem>
 <listitem><para>the preparation directions from the
-<emphasis><guilabel>Instructions</guilabel></emphasis> tab</para></listitem>
+<guilabel>Instructions</guilabel> tab</para></listitem>
 </itemizedlist>
 
 <para>As with entering a new recipe, the buttons <guibutton>Save
@@ -2066,16 +2069,16 @@ menu bar.  From the available choices, select <guimenuitem>Import from File
 <para>A window will appear that allows the navigation to the file that you wish
 to import.  Navigation can be done using the <quote>point and click</quote>
 method, or the location of the file may be entered directly into the box
-labeled <emphasis><guilabel>Location:</guilabel></emphasis>.</para>
+labeled <guilabel>Location:</guilabel>.</para>
 
-<para>The <emphasis><guilabel>Filter:</guilabel></emphasis> box is used to
+<para>The <guilabel>Filter:</guilabel> box is used to
 select the format of the recipe being imported from the drop-down menu.</para>
 
 <tip><para>To position the cursor for entry into the
-<emphasis><guilabel>Location:</guilabel></emphasis> box, the key
+<guilabel>Location:</guilabel> box, the key
 combination <keycombo action="simul">&Alt;<keycap>L</keycap></keycombo>
 can be used.  To position the cursor for entry into the
-<emphasis><guilabel>Filter:</guilabel></emphasis> box, the key combination
+<guilabel>Filter:</guilabel> box, the key combination
 <keycombo action="simul">&Alt;<keycap>F</keycap></keycombo> can be
 used.</para></tip>
 
@@ -2083,13 +2086,13 @@ used.</para></tip>
 want to import and have selected the correct format, all the recipes saved
 in the selected format will appear in the file list.  If  import of only
 one recipe is desired, select the file that you wish to import and its name
-will appear in the <emphasis><guilabel>Location:</guilabel></emphasis> box.
+will appear in the <guilabel>Location:</guilabel> box.
 Press the <guibutton>OK</guibutton> button to proceed with the import, or
 the <guibutton>Cancel</guibutton> button to close the file selection window
 and return to the previous screen.</para>
 
-<para>If you have selected the <quote><emphasis>Ask which recipes
-to import</emphasis></quote> tickbox in the <quote>Configure
+<para>If you have selected the <quote>Ask which recipes
+to import</quote> tickbox in the <quote>Configure
 <emphasis>&krecipes;</emphasis>, Import/Export</quote> interface,
 when you click on the <guibutton>OK</guibutton> button, the
 <emphasis>&krecipes;</emphasis> <interface>Import Recipes</interface>
@@ -2116,7 +2119,7 @@ no prompt.</para>
 </screenshot>
 </para>
 
-<para>Under the heading <emphasis><guilabel>Recipes</guilabel></emphasis>,
+<para>Under the heading <guilabel>Recipes</guilabel>,
 drop-down lists will appear —</para>
 
 <para>All – This list will be expanded by default and is selected by
@@ -2124,7 +2127,7 @@ default whether one recipe or multiple recipes are being imported (the tickbox
 to the left of the label will contain  a check mark).  In brackets, to the
 right of the label, the number of recipes being imported will appear.</para>
 
-<para>Below the <emphasis><guilabel>All</guilabel></emphasis> label, all the
+<para>Below the <guilabel>All</guilabel> label, all the
 remaining <emphasis>Categories</emphasis> will be listed and the tickbox to
 the left of each category label will contain a check mark indicating that
 the category is selected.  These categories will be collapsed by default
@@ -2136,7 +2139,7 @@ category by clicking on the <guiicon>+</guiicon> sign that appears to the left
 of the tickbox.  Again, by default, recipes within each category are selected
 as indicated by the checkmark in the tickbox to the left of the category name.
 Any recipes that do not have a category attached to them will appear under the
-<emphasis><guilabel>Uncategorized</guilabel></emphasis> group.	To deselect
+<guilabel>Uncategorized</guilabel> group.	To deselect
 any recipes that you do not wish to import, simply clear the tickbox beside
 the recipe name by clicking on it.</para>
 
@@ -2153,13 +2156,13 @@ does not <quote>rollback</quote> completed imports on cancellation of the
 import process.</para>
 
 <para>Any recipes that have been placed in the
-<emphasis><guilabel>Uncategorized</guilabel></emphasis> group can be
+<guilabel>Uncategorized</guilabel> group can be
 individually edited to place them in the appropriate existing category.
 You may also define a new category in which to place them.  See the
 section <link linkend="edit-recipe">Editing Saved Recipes</link> and <link
 linkend="categories-component">The Categories Component</link> for instruction
 on how to do this.  Once you have edited your recipes to categorize them and
-the <emphasis><guilabel>Uncategorized</guilabel></emphasis> group is empty,
+the <guilabel>Uncategorized</guilabel> group is empty,
 it will automatically be removed from the category list.</para>
 
 <para>If the recipe(s) are categorized, <emphasis>&krecipes;</emphasis> will
@@ -2209,13 +2212,13 @@ SQLite database.</screeninfo>
 </screenshot>
 </para>
 
-<para>If you choose SQLite, beneath the heading <emphasis><guilabel>Database
-file:</guilabel></emphasis>, there is a text box and beside this, the
+<para>If you choose SQLite, beneath the heading <guilabel>Database
+file:</guilabel>, there is a text box and beside this, the
 <guiicon>Open File Dialog</guiicon> icon which, when clicked, will <action>open
 the file dialog window</action>.  This window is used to navigate to the
 location of the database that you want to import.  Once you have located
 the appropriate database file, select it from the file list.  The name
-will appear in the <emphasis><guilabel>Location:</guilabel></emphasis>
+will appear in the <guilabel>Location:</guilabel>
 box.  Click the <guibutton>OK</guibutton> button to proceed or the
 <guibutton>Cancel</guibutton> button to close the file dialog window and
 return to the previous screen.</para>
@@ -2259,12 +2262,12 @@ MySQL database.</screeninfo>
 Import</interface> window, you will be required to enter the following
 parameters in the text box beside the appropriate label —</para>
 
-<itemizedlist><listitem><para><emphasis><guilabel>Server:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Username:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Password:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Port:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Database
-name:</guilabel></emphasis></para></listitem>
+<itemizedlist><listitem><para><guilabel>Server:</guilabel></para></listitem>
+<listitem><para><guilabel>Username:</guilabel></para></listitem>
+<listitem><para><guilabel>Password:</guilabel></para></listitem>
+<listitem><para><guilabel>Port:</guilabel></para></listitem>
+<listitem><para><guilabel>Database
+name:</guilabel></para></listitem>
 
 </itemizedlist>
 
@@ -2283,12 +2286,12 @@ and return to the previous screen.</para>
 Import</interface> window, you will be required to enter the following
 parameters in the text box beside the appropriate label —</para>
 
-<itemizedlist><listitem><para><emphasis><guilabel>Server:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Username:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Password:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Port:</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Database
-name:</guilabel></emphasis></para></listitem>
+<itemizedlist><listitem><para><guilabel>Server:</guilabel></para></listitem>
+<listitem><para><guilabel>Username:</guilabel></para></listitem>
+<listitem><para><guilabel>Password:</guilabel></para></listitem>
+<listitem><para><guilabel>Port:</guilabel></para></listitem>
+<listitem><para><guilabel>Database
+name:</guilabel></para></listitem>
 
 </itemizedlist>
 
@@ -2310,7 +2313,7 @@ to increment the port to the desired number. </para></note>
 <sect3 id="common-import">
 <title>Steps Common to All Database Imports</title>
 <para>Similar to importing recipes from a file, if you have selected the
-<quote><emphasis>Ask which recipes to import</emphasis></quote> tickbox in
+<quote>Ask which recipes to import</quote> tickbox in
 the <quote>Configure <emphasis>&krecipes;</emphasis>, Import/Export</quote>
 interface, when you click on the <guibutton>OK</guibutton> button, the
 <emphasis>&krecipes;</emphasis> <interface>Import Recipes</interface>
@@ -2320,7 +2323,7 @@ linkend="import-export-preference">Choosing Import/Export Preferences</link>.
 If this selection is not made, your recipes will be imported silently with
 no prompt.</para>
 
-<para>Again the <emphasis><guilabel>All</guilabel></emphasis> label will
+<para>Again the <guilabel>All</guilabel> label will
 show and beneath this, the list of all categories being imported.  Also like
 importing from a file, the list items will have tick boxes on the left from
 which whole categories and/or recipes can be deselected by clicking on the
@@ -2465,33 +2468,33 @@ select <guimenuitem>Export ...</guimenuitem></para>
 where you wish to save your exported recipe.  The location will default
 to your home folder, but another existing folder can be chosen, or
 you can create a new folder.  The name of the recipe will appear in
-the box labeled <emphasis><guilabel>Location:</guilabel></emphasis>
+the box labeled <guilabel>Location:</guilabel>
 and this will default to the name that was given to the recipe in the
 <emphasis>&krecipes;</emphasis> database.  However, this name can be changed
 to another at your discretion.</para>
 
-<para>The <emphasis><guilabel>Filter:</guilabel></emphasis> box is used
+<para>The <guilabel>Filter:</guilabel> box is used
 to select the format that you wish to use for the exported recipe from the
 drop-down menu.</para>
 
 <para>	You will also note that at the bottom of this
 window, there is a tickbox that allows you to select or
-deselect to <emphasis><guilabel>Automatically select filename
-extension</guilabel></emphasis>.  The extension of the chosen export format
+deselect to <guilabel>Automatically select filename
+extension</guilabel>.  The extension of the chosen export format
 will appear beside the phrase.	If you choose to keep the tickbox selected,
 this extension will automatically be attached to the filename of your exported
 recipe. </para>
 
 <tip><para>To position the cursor for entry into the
-<emphasis><guilabel>Location:</guilabel></emphasis> box, the key
+<guilabel>Location:</guilabel> box, the key
 combination <keycombo action="simul">&Alt;<keycap>L</keycap></keycombo>
 can be used.  To position the cursor for entry into the
-<emphasis><guilabel>Filter:</guilabel></emphasis> box, the key combination
+<guilabel>Filter:</guilabel> box, the key combination
 <keycombo action="simul">&Alt;<keycap>F</keycap></keycombo> can be
 used.</para></tip>
 
 <para>Once the name of the exported recipe appears in the
-<emphasis><guilabel>Location:</guilabel></emphasis> box and you have
+<guilabel>Location:</guilabel> box and you have
 chosen the format you wish to use for your exported recipe, click the
 <guibutton>Save</guibutton> button to proceed with the export, or the
 <guibutton>Cancel</guibutton> button to halt the export process and return
@@ -2561,22 +2564,22 @@ can navigate to the location where you want to store your backup file
 and provide a name for it.  By default, this interface opens to your
 home folder.  You can navigate to another location and then, type the
 name that you wish to utilize for your backup in the text box beside the
-label <emphasis><guilabel>Location:</guilabel></emphasis>.  To position
-the cursor in the <emphasis><guilabel>Location:</guilabel></emphasis>
+label <guilabel>Location:</guilabel>.  To position
+the cursor in the <guilabel>Location:</guilabel>
 text box, either click in the box or use the keyboard shortcut <keycombo
 action="simul">&Alt;<keycap>L</keycap></keycombo>.  If you have previously
 backed up your database, you can also select it from the drop-down menu
-beside the <emphasis><guilabel>Location:</guilabel></emphasis> text box.</para>
+beside the <guilabel>Location:</guilabel> text box.</para>
 
-<para>The <emphasis><guilabel>Filter:</guilabel></emphasis> text box shows
+<para>The <guilabel>Filter:</guilabel> text box shows
 the type of file that you are creating.  In the situation where you are
 backing up your <emphasis>&krecipes;</emphasis> database file, there is
 only one type of file available – a &krecipes; Backup File (*.krecbk),
 and that shows as the default selection.</para>
 
 <para>The final item in this window is a tick box beside the
-label <emphasis><guilabel>Automatically select filename extension
-(.krecbk)</guilabel></emphasis>.  With this option active,
+label <guilabel>Automatically select filename extension
+(.krecbk)</guilabel>.  With this option active,
 <abbrev>i.e.</abbrev> there is an x in the tick box, you can provide a
 filename, but do not have to supply an extension.  The extension .krecbk
 will be attached to your filename automatically.  However, you do not
@@ -2608,21 +2611,21 @@ restore your database, the <emphasis><interface>Restore Backup –
 &krecipes;</interface></emphasis> window will appear where you can navigate
 to the location where you saved your backup.  Once you have located the
 file and selected it, its name will appear in the text box beside the label
-<emphasis><guilabel>Location:</guilabel></emphasis>.</para>
+<guilabel>Location:</guilabel>.</para>
 
 <para>By default, the <emphasis><interface>Restore Backup –
 &krecipes;</interface></emphasis> window opens to your home folder.
 An alternative to navigating to the location of your backup file and
 selecting it would be to type its name, including the path, directly into the
-<emphasis><guilabel>Location:</guilabel></emphasis> text box.  To position
-the cursor in the <emphasis><guilabel>Location:</guilabel></emphasis>
+<guilabel>Location:</guilabel> text box.  To position
+the cursor in the <guilabel>Location:</guilabel>
 text box, either click in the box or use the keyboard shortcut <keycombo
 action="simul">&Alt;<keycap>L</keycap></keycombo>.  If you have previously
 backed up your database, you can also select it from the drop-down menu
-beside the <emphasis><guilabel>Location:</guilabel></emphasis> text box.</para>
+beside the <guilabel>Location:</guilabel> text box.</para>
 
 <para>As with the backup function, the text box beside the
-<emphasis><guilabel>Filter:</guilabel></emphasis> label shows the type of
+<guilabel>Filter:</guilabel> label shows the type of
 file as <emphasis>&krecipes; Backup File (*.krecbk)</emphasis>.
 </para>
 
@@ -2652,8 +2655,8 @@ the &krecipes; database.</screeninfo>
 </screenshot>
 </para>
 
-<para>You can select the tick box beside the label <emphasis><guilabel>Do
-not ask again</guilabel></emphasis> to prevent this message from showing
+<para>You can select the tick box beside the label <guilabel>Do
+not ask again</guilabel> to prevent this message from showing
 in the future.	However, if you choose to do this, your backup file will be
 restored silently and you will not be able to change your mind.</para>
 
@@ -2704,7 +2707,7 @@ pane of the window.</para>
 of a recipe</userinput> to search for.	Recipes can also be chosen by
 selecting them from the list.  Either way, the selected recipe must
 by transferred to the right-hand side of the screen under the heading
-<emphasis><guilabel>Shopping List</guilabel></emphasis> by clicking on the
+<guilabel>Shopping List</guilabel> by clicking on the
 <guiicon><inlinemediaobject><imageobject><imagedata fileref="go-next.png"
 format="PNG"/></imageobject></inlinemediaobject></guiicon>  button between
 the two portions of the screen.</para>
@@ -2729,7 +2732,7 @@ button.</para></listitem>
 a window will appear that lists all ingredients contained in the
 <emphasis>&krecipes;</emphasis> database on the left and the ingredients
 required for the selected recipe(s) on the right.  Above each of these is a
-<emphasis><guilabel>Search:</guilabel></emphasis> text box to <userinput>enter
+<guilabel>Search:</guilabel> text box to <userinput>enter
 the name of an ingredient</userinput> to search for within each of the
 lists.</para>
 
@@ -2793,8 +2796,8 @@ the right pane under the heading <emphasis>Diet Helper</emphasis>.</para>
 select the number of days that you are planning for and the number of meals
 per day.</para>
 
-<para>In the rectangular area under the heading <emphasis><guilabel>Number of
-Days</guilabel></emphasis>, the number of days is set at <quote>- 1 -</quote>.
+<para>In the rectangular area under the heading <guilabel>Number of
+Days</guilabel>, the number of days is set at <quote>- 1 -</quote>.
 To increase this value, click and hold the &LMB; and move the slider to
 the right.  The value will increment up to <quote>- 6 -</quote> and then,
 change to <quote>- 1 week -</quote>.  After the number of days changes to
@@ -2802,17 +2805,17 @@ change to <quote>- 1 week -</quote>.  After the number of days changes to
 of 4 weeks.</para>
 
 <para>Similarly, in the rectangular area under the heading
-<emphasis><guilabel>Meals per Day</guilabel></emphasis>, the number of meals
+<guilabel>Meals per Day</guilabel>, the number of meals
 displays as <quote>- 1 -</quote>.  This value is incremented by clicking and
 holding the &LMB; and moving the slider to the right until the desired number
 of meals is displayed, up to a maximum of 10.  When the slider is adjusted,
 a tab will appear for each of the meals.</para>
 
 <para>The next step is to specify the number of dishes per meal.
-This is done by using the spinbox beside the <emphasis><guilabel>No. of
-dishes:</guilabel></emphasis> label to adjust the number.</para>
+This is done by using the spinbox beside the <guilabel>No. of
+dishes:</guilabel> label to adjust the number.</para>
 
-<para>Beside the <emphasis><guilabel>No. of dishes:</guilabel></emphasis> are
+<para>Beside the <guilabel>No. of dishes:</guilabel> are
 the <guibutton>Previous Dish</guibutton> and <guibutton>Next Dish</guibutton>
 buttons that are used to navigate back and forth between dishes as you
 specify the type of recipe for each.  As you utilize these buttons to move
@@ -2820,24 +2823,24 @@ back and forth between dishes, you will note that in the <emphasis>Dish
 Characteristics</emphasis> area of the screen, the dish label changes as
 follows —</para>
 
-<itemizedlist><listitem><para><emphasis><guilabel>1st
-Course</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>2nd
-Course</guilabel></emphasis></para></listitem>
-<listitem><para><emphasis><guilabel>Dessert</guilabel></emphasis></para></listitem>
+<itemizedlist><listitem><para><guilabel>1st
+Course</guilabel></para></listitem>
+<listitem><para><guilabel>2nd
+Course</guilabel></para></listitem>
+<listitem><para><guilabel>Dessert</guilabel></para></listitem>
 </itemizedlist>
 
 <para>And for subsequent meals —</para>
 <itemizedlist>
-<listitem><para><emphasis><guilabel>Dish 4</guilabel></emphasis>,
-<emphasis><guilabel>Dish 5</guilabel></emphasis>, etc.</para></listitem>
+<listitem><para><guilabel>Dish 4</guilabel>,
+<guilabel>Dish 5</guilabel>, etc.</para></listitem>
 </itemizedlist>
 
 <sect3 id="menu-plan-only">
 <title>Planning Menus</title>
 <para>In the <emphasis>Dish Characteristics</emphasis> area of the screen
-and beside the dish label, there is a tick box to <emphasis><guilabel>Enable
-Category Filtering</guilabel></emphasis>.  Clicking this box <action>enables
+and beside the dish label, there is a tick box to <guilabel>Enable
+Category Filtering</guilabel>.  Clicking this box <action>enables
 the feature</action>.  It is important that you choose to do this because
 you may otherwise end up having <emphasis>Cheesecake</emphasis>, or some
 other unreasonable dish for breakfast!</para>
@@ -2845,15 +2848,15 @@ other unreasonable dish for breakfast!</para>
 <para>With <quote>category filtering</quote> turned on, you can select the
 category to be used for the dish as specified by the dish label located
 beside the category selection box.  For instance, the dish label might
-show <emphasis><guilabel>1st Course</guilabel></emphasis>.  If you are
+show <guilabel>1st Course</guilabel>.  If you are
 selecting courses for your dinner meal, you might then select the category
 <emphasis>Salads</emphasis> from the category list.  A scrollbar exists to
 the right that allows moving up and down within the list.</para>
 
 <para>Continuing with the example of selecting dishes for your dinner meal,
 you would then click the <guibutton>Next Dish</guibutton> button.  When you
-do this, you will note that the dish label changes to <emphasis><guilabel>2nd
-Course</guilabel></emphasis> and that again, you must turn <emphasis>category
+do this, you will note that the dish label changes to <guilabel>2nd
+Course</guilabel> and that again, you must turn <emphasis>category
 filtering</emphasis> on.  Now, you can proceed with the selection of the
 category for your next dish, for example, <emphasis>Pasta</emphasis>.</para>
 
@@ -2900,8 +2903,8 @@ linkend="ingredient-units">Units in Ingredients</link> for additional
 information.</para></listitem>
 <listitem><para>The equivalencies between the units of measure must
 be completed in the <emphasis>Units</emphasis> component within
-the <emphasis><guilabel>Mass Conversions</guilabel></emphasis> and
-<emphasis><guilabel>Volume  Conversions</guilabel></emphasis> tabs.
+the <guilabel>Mass Conversions</guilabel> and
+<guilabel>Volume  Conversions</guilabel> tabs.
 See the section <link linkend="set-equivalents">Completing Your Conversion
 Tables</link> for instructions.</para></listitem>
 </orderedlist>
@@ -2913,23 +2916,23 @@ creating your menu/diet, since the consideration of nutrient values is a
 continuation of planning a basic menu.</para>
 
 <para>In the portion of the screen that lists the nutrients, under the heading
-<emphasis><guilabel>Enabled</guilabel></emphasis>, select the nutrient that you
+<guilabel>Enabled</guilabel>, select the nutrient that you
 want to consider by clicking on the tick box that appears to the left of the
 nutrient name.	Note that you do not have to select <emphasis>every</emphasis>
 ingredient, only those that you wish to take into consideration.  A scrollbar
 exists to the right that allows moving up and down within the list.</para>
 
 <para>To the right of the nutrient name, columns labeled
-<emphasis><guilabel>Min. Value</guilabel></emphasis> and
-<emphasis><guilabel>Max. Value</guilabel></emphasis> exist.  These are used
+<guilabel>Min. Value</guilabel> and
+<guilabel>Max. Value</guilabel> exist.  These are used
 to set the minimum and maximum values of nutrients so that when the search
 for appropriate recipes is done, only recipes that have a particular nutrient
 falling into the specified range will be considered for your menu/diet.</para>
 
 <para>To set the ranges for a nutrient that you want to take
 into consideration, select it (it will be highlighted).  Under the
-headings for <emphasis><guilabel>Min. Value</guilabel></emphasis> and
-<emphasis><guilabel>Max. Value</guilabel></emphasis>, the <quote>0</quote>
+headings for <guilabel>Min. Value</guilabel> and
+<guilabel>Max. Value</guilabel>, the <quote>0</quote>
 that was under each heading prior to selecting the nutrient will change to
 <quote>0.00</quote>.  A spinbox will show beside each of these values that you
 can utilize to set the value that you want.  Alternatively, you can click on
@@ -2975,7 +2978,7 @@ window.</para>
 
 <para>Once the component starts, typical of all <emphasis>&krecipes;</emphasis>
 components, the name will appear at the top of the window in the right frame.
-Beneath this, beside the <emphasis><guilabel>Search:</guilabel></emphasis>
+Beneath this, beside the <guilabel>Search:</guilabel>
 label, there is a text box to <userinput> enter the recipe
 ingredient</userinput> that you want to search for.</para>
 
@@ -2995,8 +2998,8 @@ component.</screeninfo>
 </screenshot>
 </para>
 
-<para>Below the <emphasis><guilabel>Search:</guilabel></emphasis> box, under
-the heading <emphasis><guilabel>Ingredient</guilabel></emphasis> there is a
+<para>Below the <guilabel>Search:</guilabel> box, under
+the heading <guilabel>Ingredient</guilabel> there is a
 list of all the ingredients that are in the <emphasis>&krecipes;</emphasis>
 database, both ones provided by default and those that you have entered by
 either adding them in the <emphasis>Ingredients</emphasis> component or
@@ -3060,15 +3063,15 @@ box.</para></tip>
 <para>Before the recipes containing the selected ingredients will
 display, you must select the number of missing ingredients permitted in
 your recipes.  This is accomplished by using the spinbox beside the label
-<emphasis><guilabel>Missing ingredients allowed:</guilabel></emphasis>.
+<guilabel>Missing ingredients allowed:</guilabel>.
 There will always be certain ingredients that you have on hand, for example,
 <emphasis>salt</emphasis> or <emphasis>sugar</emphasis>.  One of the purposes
 of allowing missing ingredients is to compensate for those ingredients that are
 normally in your cupboard.  It is for this reason that you might want to set
-the <emphasis><guilabel>Missing ingredients allowed:</guilabel></emphasis>
+the <guilabel>Missing ingredients allowed:</guilabel>
 to a reasonably high number.  Or, if the number of missing ingredients
 shows as <emphasis>0</emphasis>, you can click on the text box beside the
-<emphasis><guilabel>Missing ingredients allowed:</guilabel></emphasis> label
+<guilabel>Missing ingredients allowed:</guilabel> label
 to activate it and then, press the <keycap>↓</keycap> directional
 arrow which will cause <emphasis>Any</emphasis> to appear in the text box,
 indicating that any number of missing ingredients are permitted.</para>
@@ -3082,10 +3085,10 @@ more missing ingredients.</para></caution>
 <para>Click the <guibutton>Find matching recipes</guibutton> button to display
 the search results in the area beneath the phrase <emphasis>Possible recipes
 with the specified ingredients</emphasis>.  The recipe title will appear under
-the heading <emphasis><guilabel>Title</guilabel></emphasis>.  The recipe id
-will appear under the heading <emphasis><guilabel>Id</guilabel></emphasis>
+the heading <guilabel>Title</guilabel>.  The recipe id
+will appear under the heading <guilabel>Id</guilabel>
 and the missing ingredients will display under the heading
-<emphasis><guilabel>Missing ingredients</guilabel></emphasis>.	The width
+<guilabel>Missing ingredients</guilabel>.	The width
 of the columns that apply to each of these headings can be adjusted for
 viewing purposes.  When your recipes are listed, they are grouped according
 to the number of missing ingredients and for each group, prior to listing
@@ -3129,8 +3132,8 @@ clicking on the <guibutton>Data</guibutton> button to reveal the additional
 <guibutton>Ingredients</guibutton> button.</para>
 
 <para>When the <emphasis>Ingredients</emphasis> component opens, the component
-title will be seen at the top. Below the heading <emphasis><guilabel>Ingredient
-list</guilabel></emphasis>, there is a list of ingredients contained in the
+title will be seen at the top. Below the heading <guilabel>Ingredient
+list</guilabel>, there is a list of ingredients contained in the
 <emphasis>&krecipes;</emphasis> database is shown. This list includes
 ingredients that have be provided as defaults in the program and also,
 ingredients that you have added.</para>
@@ -3181,7 +3184,7 @@ lists:
 
 <listitem><para>USDA ingredient list: Below the <guilabel>Property information
 for...</guilabel> label, the list of ingredients in the USDA database is shown.
-Beside the <guilabel>Search:</guilabel> label there is a textbox to search in
+Beside the <guilabel>Search:</guilabel> label there is a text box to search in
 the USDA Database. Below to the list there is a <guibutton>Load</guibutton>
 button to load the data for the given ingredient from the USDA database to your
 personal database. </para>
@@ -3191,14 +3194,14 @@ personal database. </para>
 values of each ingredient.</para>
 
 <para>In this list, the name of the nutrient is shown under the
-heading <emphasis><guilabel>Property</guilabel></emphasis>, the
+heading <guilabel>Property</guilabel>, the
 amount of the nutrient present in the ingredient is shown under
-the heading <emphasis><guilabel>Amount</guilabel></emphasis> and
+the heading <guilabel>Amount</guilabel> and
 the measurement value for the nutrient is shown under the heading
-<emphasis><guilabel>Units</guilabel></emphasis>.  For example, if the
+<guilabel>Units</guilabel>.  For example, if the
 ingredient <emphasis>orange juice</emphasis> has been selected, one
 of the nutrients displayed will be <emphasis>Vitamin C</emphasis>.
-Under the <emphasis><guilabel>Units</guilabel></emphasis> heading,
+Under the <guilabel>Units</guilabel> heading,
 <emphasis>mg/g</emphasis> will display, which means that there are the
 number of milligrams shown under the amount (in this case, 0.5) per gram of
 the ingredient.</para>
@@ -3338,7 +3341,7 @@ component.</para>
 </imageobject></inlinemediaobject></guiicon> button that appears beside the
 ingredient list. A window will be presented where <userinput>the name of the new
 ingredient</userinput> can be typed in the text box beneath the heading
-<emphasis><guilabel>New Ingredient</guilabel></emphasis>. Once the name has been
+<guilabel>New Ingredient</guilabel>. Once the name has been
 added, click the <guibutton>OK</guibutton> button to complete the addition and
 close the window. The ingredient will now appear in the ingredient list. If you
 do not wish to add the ingredient to the list, click the <guibutton>
@@ -3358,7 +3361,7 @@ there are no recipes using that ingredient</emphasis>.</para>
 display with the prompt <emphasis>The following elements will have
 to be removed also, since currently they use the element you have
 chosen to be removed.</emphasis>  Below the prompt, under the heading
-<emphasis><guilabel>Recipes</guilabel></emphasis>, a list of recipes that
+<guilabel>Recipes</guilabel>, a list of recipes that
 use that ingredient will display.  Click the <guibutton>OK</guibutton>
 button to proceed with the removal of the ingredient AND recipe(s), or the
 <guibutton>Cancel</guibutton> to close the window and return to the previous
@@ -3657,9 +3660,9 @@ the <emphasis>&krecipes;</emphasis> window and then, click on the
 
 <para>As with other <emphasis>&krecipes;</emphasis> components, the name of the
 component appears in the right pane of the window at the top.  Below this,
-beneath the heading <emphasis><guilabel>Property</guilabel></emphasis>,
+beneath the heading <guilabel>Property</guilabel>,
 the list of nutrients is displayed.  Beneath the heading
-<emphasis><guilabel>Units</guilabel></emphasis>, the units associated with
+<guilabel>Units</guilabel>, the units associated with
 the properties are shown.</para>
 
 <para>
@@ -3679,7 +3682,7 @@ component.</screeninfo>
 </para>
 
 <para>For example, one of the nutrients under the
-<emphasis><guilabel>Property</guilabel></emphasis> heading is
+<guilabel>Property</guilabel> heading is
 <quote>iron</quote>.  If a recipe ingredient contains this nutrient,
 the amount of iron contained in the ingredient will show as a number of
 <emphasis>milligrams</emphasis> or <quote>mg</quote>.</para>
@@ -3701,9 +3704,9 @@ button that appears near the top in the right-hand side of
 the <emphasis>&krecipes;</emphasis> window.  The <interface>New
 Property</interface> window will appear.  In this window, the <userinput>name
 of the nutrient</userinput> can be entered in the text box beside the
-<emphasis><guilabel>Property name:</guilabel></emphasis> label, and the
+<guilabel>Property name:</guilabel> label, and the
 associated <userinput>unit of measure</userinput> is entered in the text
-box beside the <emphasis><guilabel>Units:</guilabel></emphasis> label.
+box beside the <guilabel>Units:</guilabel> label.
 Click the <guibutton>OK</guibutton> button to proceed with the addition,
 or the <guibutton>Cancel</guibutton> button to close the window and return
 to the previous screen.</para>
@@ -3787,7 +3790,7 @@ with ingredient weights.  Refer to <link linkend="set-equivalents">Completing
 Your Conversion Tables</link> later in this section for an outline on setting
 your conversion factors.</para>
 
-<para>In the <emphasis><guilabel>Units</guilabel></emphasis> tab, a list
+<para>In the <guilabel>Units</guilabel> tab, a list
 of all the units of measure will appear.  This list includes the units of
 measure that have been provided by default and those that you have added,
 either by entering a new unit while entering a new recipe, or by adding the
@@ -3820,8 +3823,8 @@ specified for each unit.</para>
 <para>To add a unit of measure, click the <guibutton>Create...</guibutton>
 button that appears to the right of the <emphasis>Unit</emphasis> list.
 The <interface>New Unit</interface> dialog box will appear where the name
-of the new unit can be added.  Beneath the heading <emphasis><guilabel>New
-Unit</guilabel></emphasis>, there is a text box to <userinput>enter
+of the new unit can be added.  Beneath the heading <guilabel>New
+Unit</guilabel>, there is a text box to <userinput>enter
 the singular form of the unit</userinput> and one to <userinput>enter
 the plural form of the unit</userinput>.  To the right of each of these
 text boxes is another pair of text boxes in which to <userinput>enter the
@@ -3871,7 +3874,7 @@ the unit of measure will be removed.</para>
 removed, a window will appear with the <quote>alert</quote> <emphasis>The
 following will have to be removed also, since currently they use the
 element you have chosen to be removed</emphasis>.  Beneath the heading
-<emphasis><guilabel>Recipes</guilabel></emphasis>, the list of recipes
+<guilabel>Recipes</guilabel>, the list of recipes
 utilizing that unit will appear.  Beneath the heading <emphasis>Ingredient
 Weights</emphasis> a list of ingredients is shown that utilize the unit of
 measure in the <emphasis>Ingredient Weights</emphasis> section. Click the
@@ -3884,10 +3887,10 @@ action and close the window.</para>
 
 <sect3 id="set-equivalents">
 <title>Completing Your Conversion Tables</title>
-<para>Conversions between units are entered in the <emphasis><guilabel>Mass
-Conversions</guilabel></emphasis> tab for those units associated with a
+<para>Conversions between units are entered in the <guilabel>Mass
+Conversions</guilabel> tab for those units associated with a
 weight.  For those units associated with a volume, the conversions are set
-in <emphasis><guilabel>Volume Conversions</guilabel></emphasis> tab.  Both of
+in <guilabel>Volume Conversions</guilabel> tab.  Both of
 these tables are set up in a <quote>spreadsheet</quote> style format.  Down the
 side of the table, you will note that each <quote>row</quote> is labeled
 with a unit name.  Similarly, along the top, each <quote>column</quote> is
@@ -4126,7 +4129,7 @@ the change.</para>
 
 <para>When the <emphasis>Categories</emphasis> component is selected,
 the list of all created categories will appear under the heading
-<emphasis><guilabel>Category</guilabel></emphasis>.  Those categories that
+<guilabel>Category</guilabel>.  Those categories that
 have <emphasis>sub-categories</emphasis> will be shown with a + (plus) sign
 beside them, indicating that the category can be expanded.  Once expanded,
 the main category will show a - (dash) beside it and the list of sub-categories
@@ -4155,9 +4158,9 @@ component.</screeninfo>
 button.</para>
 
 <para>A window will pop up where the name of the new category can
-be entered in a text box under the label <emphasis><guilabel>New
-Category</guilabel></emphasis>.  A subcategory can be selected using
-the <quote><guimenu>Subcategory of</guimenu></quote> drop-down menu,
+be entered in a text box under the label <guilabel>New
+Category</guilabel>.  A subcategory can be selected using
+the <guimenu>Subcategory of</guimenu> drop-down menu,
 which lists existing categories.  The default for the subcategory is
 <emphasis>**NONE**</emphasis>.</para>
 
@@ -4207,7 +4210,7 @@ list of authors appears in the main portion of the window.</para>
 screen.</para>
 
 <para>A window will appear that allows entry of the author's name in the
-text box labeled <emphasis><guilabel>New Author</guilabel></emphasis></para>
+text box labeled <guilabel>New Author</guilabel></para>
 
 <para>
 <screenshot>
@@ -4297,7 +4300,7 @@ starting screen.</screeninfo>
 <para>To access the Toolbar configuration interface,
 select <guimenu>Settings</guimenu> and <guimenuitem>Configure
 Toolbars...</guimenuitem> from the <emphasis>&krecipes;</emphasis> menu.  The
-<emphasis><guilabel>Configure Toolbars – &krecipes;</guilabel></emphasis>
+<guilabel>Configure Toolbars – &krecipes;</guilabel>
 screen will appear.</para>
 
 <para>
@@ -4317,11 +4320,11 @@ screen.</screeninfo>
 </screenshot>
 </para>
 
-
+<!--FIXME replace with link to fundamentals-->
 <para>From the screenshot, you will notice that choices available for addition
-to the toolbar are on the left under the heading <emphasis><guilabel>Available
-actions:</guilabel></emphasis>.  On the right, under the heading
-<emphasis><guilabel>Current actions:</guilabel></emphasis> are the icons that
+to the toolbar are on the left under the heading <guilabel>Available
+actions:</guilabel>.  On the right, under the heading
+<guilabel>Current actions:</guilabel> are the icons that
 presently appear on the toolbar – note that your toolbar, by default,
 may appear differently from that displayed in the screenshot.</para>
 
@@ -4340,7 +4343,7 @@ screen to close the window and attach the icon to the toolbar selection.</para>
 
 <para>In order to apply your changes, you must click the
 <guibutton>Apply</guibutton> button that appears at the bottom of the
-<emphasis><guilabel>Configure Toolbars – &krecipes;</guilabel></emphasis>
+<guilabel>Configure Toolbars – &krecipes;</guilabel>
 screen.  This will apply your changes, but leave the window open
 in order to make other changes, if desired.  To apply your changes
 and exit the interface, click the <guibutton>OK</guibutton> button.
@@ -4362,12 +4365,12 @@ aspects of <emphasis>&krecipes;</emphasis>.</para>
 <sect2 id="configure-server-settings">
 <title>Server Settings</title>
 <para>The first preference that you can configure is the
-<emphasis><guilabel>Database Server Options</guilabel></emphasis>.
+<guilabel>Database Server Options</guilabel>.
 You will notice from the following screenshot that this label shows that
 an SQLite database has been selected.  However, if the database selected
 is either <emphasis>MySQL</emphasis> or <emphasis>PostgreSQL</emphasis>
 the label would show the name of the appropriate database format.
-The <emphasis><guilabel>Database file:</guilabel></emphasis> label shows
+The <guilabel>Database file:</guilabel> label shows
 the complete path to the database file.</para>
 
 <para>
@@ -4389,15 +4392,15 @@ window.</screeninfo>
 <para>If you wanted to choose another database file, you would click on the
 <guiicon>File</guiicon> icon and in the window that appears, navigate to the
 location of the database file that you want to use.  This change would be
-reflected in the <emphasis><guilabel>Database file:</guilabel></emphasis>
+reflected in the <guilabel>Database file:</guilabel>
 text box.</para>
 
 <para>The second preference available for configuration in the
-<emphasis><guilabel>Server Settings</guilabel></emphasis> screen is for the
+<guilabel>Server Settings</guilabel> screen is for the
 <emphasis>Backup</emphasis> operation.	It is required that the path to your
 database program be known for the <emphasis>Backup</emphasis> operation to
 work properly.	Therefore, beside the label that is shown in the screenshot
-as <emphasis><guilabel>Path to 'sqlite3':</guilabel></emphasis>, there is
+as <guilabel>Path to 'sqlite3':</guilabel>, there is
 a text box which shows the name of the database program.  The text in this
 box can be changed by directly editing it, or by clicking the File icon,
 which will activate the screen that allows you to navigate to the location
@@ -4414,14 +4417,14 @@ the database file.  For specific information on backing up your database,
 see the section <link linkend="backup-db">Backing Up Your &krecipes;
 Database</link>.</para></note>
 
-<para>Also exclusive to the <emphasis><guilabel>Server
-Settings</guilabel></emphasis> screen, is the <emphasis><guilabel>Re-run
-wizard on next startup</guilabel></emphasis> tickbox that can be selected
+<para>Also exclusive to the <guilabel>Server
+Settings</guilabel> screen, is the <guilabel>Re-run
+wizard on next startup</guilabel> tickbox that can be selected
 to reload the database with the recipes and USDA data that come as defaults
 with the <emphasis>&krecipes;</emphasis> program.</para>
 
-<para>Buttons that appear at the bottom of the <emphasis><guilabel>Server
-Settings</guilabel></emphasis> screen are common to each of the preference
+<para>Buttons that appear at the bottom of the <guilabel>Server
+Settings</guilabel> screen are common to each of the preference
 screens and function as follows —</para>
 
 <itemizedlist>
@@ -4440,15 +4443,6 @@ section</para></listitem>
 <sect2 id="custom-formatting">
 <title>Customizing Formatting</title>
 
-<para>Like accessing the <interface>&krecipes; Preferences
-- &krecipes;</interface> <emphasis><guilabel>Server
-Settings</guilabel></emphasis> preferences, you access the
-<emphasis><guilabel>Formatting</guilabel></emphasis> preferences, by
-first choosing <guimenu>Settings</guimenu> and <guimenuitem>Configure
-&krecipes;...</guimenuitem> from the <emphasis>&krecipes;</emphasis> menu
-and then, choosing the <emphasis><guilabel>Formatting</guilabel></emphasis>
-option that appears on the left of the window.</para>
-<para>
 <screenshot>
 <screeninfo>Here's a screenshot of the &krecipes; Formatting configuration
 window.</screeninfo>
@@ -4463,19 +4457,18 @@ window.</screeninfo>
 	  Formatting interface</para></caption>
 	</mediaobject>
 </screenshot>
-</para>
 
 <para>From this window, there are two formatting preferences that can be
 customized —</para>
 
-<orderedlist><listitem><para><emphasis><guilabel>Number
-Format</guilabel></emphasis> – either
-<emphasis><guilabel>Fraction</guilabel></emphasis> or
-<emphasis><guilabel>Decimal</guilabel></emphasis> can be selected by clicking
+<orderedlist><listitem><para><guilabel>Number
+Format</guilabel> – either
+<guilabel>Fraction</guilabel> or
+<guilabel>Decimal</guilabel> can be selected by clicking
 on the appropriate radio button and this choice controls how the units of
 measure will display in your recipes</para></listitem>
 
-<listitem><para><emphasis><guilabel>Use abbreviations</guilabel></emphasis>
+<listitem><para><guilabel>Use abbreviations</guilabel>
 – this feature is turned on by clicking on the tickbox beside the
 label</para>
 
@@ -4510,20 +4503,12 @@ window.</screeninfo>
 </screenshot>
 </para>
 
-<para>Accessing the <interface>&krecipes; Preferences - &krecipes;</interface>
-<emphasis><guilabel>Import/Export</guilabel></emphasis> preferences,
-is accomplished by first, choosing <guimenu>Settings</guimenu>
-and <guimenuitem>Configure &krecipes;...</guimenuitem> from
-the <emphasis>&krecipes;</emphasis> menu and then, choosing the
-<emphasis><guilabel>Import/Export</guilabel></emphasis> option that appears
-on the left of the window.</para>
-
 <para>On this screen under the heading
-<emphasis><guilabel>Import</guilabel></emphasis>, two options exist
+<guilabel>Import</guilabel>, two options exist
 —</para>
 
-<para>The first is <emphasis><guilabel>Overwrite recipes with same
-title</guilabel></emphasis> and this feature can be turned on by clicking the
+<para>The first is <guilabel>Overwrite recipes with same
+title</guilabel> and this feature can be turned on by clicking the
 tickbox beside the label.  This might be a good idea if you are re-importing
 a currently loaded database.</para>
 
@@ -4535,8 +4520,8 @@ the listing will appear as —</para>
 <para>Chocolate Cheesecake</para>
 <para>Chocolate Cheesecake (2)</para>
 
-<para>The second option is <emphasis><guilabel>Ask which recipes to
-import</guilabel></emphasis> and again, this feature can be turned
+<para>The second option is <guilabel>Ask which recipes to
+import</guilabel> and again, this feature can be turned
 on by selecting the text box.  If this feature is not turned on, your
 recipes will be imported silently with no prompt.  See the section <link
 linkend="import-export-recipes">Importing and Exporting Recipes</link> for
@@ -4544,7 +4529,7 @@ a screenshot that will show the result of this option being selected.</para>
 
 <sect3 id="copy-clipboard">
 <title>Copying to the Clipboard</title>
-<para>Under the heading <emphasis><guilabel>Export</guilabel></emphasis>,
+<para>Under the heading <guilabel>Export</guilabel>,
 a drop-down menu exists from which you can select the <quote>Copy to
 Clipboard</quote> format you wish to use.</para>
 
@@ -4624,14 +4609,6 @@ window.</screeninfo>
 </screenshot>
 </para>
 
-<para>Accessing the <interface>&krecipes; Preferences - &krecipes;</interface>
-<emphasis><guilabel>Performance</guilabel></emphasis> preferences,
-is accomplished by first, choosing <guimenu>Settings</guimenu>
-and <guimenuitem>Configure &krecipes;...</guimenuitem> from
-the <emphasis>&krecipes;</emphasis> menu and then, choosing the
-<emphasis><guilabel>Performance</guilabel></emphasis> option that appears
-on the left of the window.</para>
-
 <para>In this interface, you are customizing two settings. For
 a reason that you might want to do this, see the section <link
 linkend="config-performance-reason">Reasons for Configuring Performance
@@ -4642,8 +4619,8 @@ not at all.</para>
 the <emphasis>Find/Edit Recipes</emphasis> component is selected.  By default,
 this number is set to <quote>Unlimited</quote>, which means that all categories
 will be displayed. To change this setting, adjust the <quote>slider</quote>
-that appears below the label <quote><emphasis><guilabel>Number of categories
-to display at once:</guilabel></emphasis></quote> until the desired number
+that appears below the label <guilabel>Number of categories
+to display at once:</guilabel> until the desired number
 appears, or use the <quote>spinbox</quote> to set the number.</para>
 
 <para>The second setting that you might wish to change is for
@@ -4651,12 +4628,12 @@ the number of items that are displayed in lists, for example, the
 <emphasis>Ingredients</emphasis> list or <emphasis>Properties</emphasis>
 list. Again, by default this is set to <quote>Unlimited</quote> and to
 change the setting you would adjust the <quote>slider</quote> that appears
-below the label <quote><emphasis><guilabel>Number of elements to display
-at once:</guilabel></emphasis></quote>, or use the <quote>spinbox</quote>
+below the label <guilabel>Number of elements to display
+at once:</guilabel>, or use the <quote>spinbox</quote>
 until the desired number appears.</para>
 
-<para>It should be noted that for the <quote><emphasis><guilabel>Number
-of elements to display at once:</guilabel></emphasis></quote> setting, the
+<para>It should be noted that for the <guilabel>Number
+of elements to display at once:</guilabel> setting, the
 adjustment is done in increments of 1000 when using the <quote>spinbox</quote>.
 Should you wish to set smaller numbers, you can do this by highlighting the
 word <quote>Unlimited</quote> or whatever numeric entry appears in the box
@@ -4666,10 +4643,10 @@ used when you have a very large database of recipes.</para>
 <sect3 id="config-performance-reason">
 <title>Reasons for Configuring Performance Settings</title>
 
-<para>In most instances, the settings to adjust the <emphasis><guilabel>Number
-of categories to display at once:</guilabel></emphasis>
-and/or the <emphasis><guilabel>Number of elements to display at
-once:</guilabel></emphasis> will not have to be changed.  The ultimate
+<para>In most instances, the settings to adjust the <guilabel>Number
+of categories to display at once:</guilabel>
+and/or the <guilabel>Number of elements to display at
+once:</guilabel> will not have to be changed.  The ultimate
 reason that you might want to do so occurs when you have a very large
 database of recipes.  Adjusting these settings so that your Categories or
 list items are loaded in groups will greatly improve the speed of loading
@@ -4684,7 +4661,7 @@ for these items.</para>
 
 <chapter id="report-problems">
 <title>Reporting Problems</title>
-
+<!--FIXME copy move to fundamentals ? -->
 <para>In the event that <emphasis>&krecipes;</emphasis> program does something
 unexpected and you think this might be a bug, you can submit a bug report
 to the program maintainer.  Even if you do not encounter any problems and
@@ -4739,7 +4716,7 @@ or menu bars. -->
 <title>The main <emphasis>&krecipes;</emphasis> window</title>
 
 <sect2 id="file-menu">
-<title>The <guimenu>File</guimenu> Menu</title>
+<title>The File Menu</title>
 <para>
 <variablelist>
 <varlistentry>
@@ -4854,7 +4831,7 @@ Your <emphasis>&krecipes;</emphasis> Database</link>.</para></listitem>
 </sect2>
 
 <sect2 id="edit-menu">
-<title>The <guimenu>Edit</guimenu> Menu</title>
+<title>The Edit Menu</title>
 
 <para>
 <variablelist>
@@ -4892,7 +4869,7 @@ for example an email.</para></listitem>
 </sect2>
 
 <sect2 id="view-menu">
-<title>The <guimenu>View</guimenu> Menu</title>
+<title>The View Menu</title>
 <para>
 <variablelist>
 
@@ -4926,7 +4903,7 @@ recipe.</action></para></listitem>
 </sect2>
 
 <sect2 id="tools-menu">
-<title>The <guimenu>Tools</guimenu> Menu</title>
+<title>The Tools Menu</title>
 
 <para>
 <variablelist>
@@ -4951,7 +4928,7 @@ for instruction.</para></listitem>
 </sect2>
 
 <sect2 id="settings-menu">
-<title>The <guimenu>Settings</guimenu> Menu</title>
+<title>The Settings Menu</title>
 <para>
 <variablelist>
 
@@ -5033,7 +5010,7 @@ defined.</para>
 </sect2>
 
 <sect2 id="help-menu">
-<title>The <guimenu>Help</guimenu> Menu</title>
+<title>The Help Menu</title>
 
 <para>
 &krecipes; has the common &kde; <guimenu>Help</guimenu>


More information about the kde-doc-english mailing list