Merge branch 'master' into new_directory_structure

28 files changed, 120 insertions, 82 deletions

diff --git a/source/calculate.rst b/source/calculate.rst
index 7df82bc..542e010 100644
--- a/source/calculate.rst
+++ b/source/calculate.rst
@@ -55,4 +55,4 @@ The list of help topics is available with the command
 
 ``help(index)``
 
-including topics not supported on the menus. Help is not provided for the constants pi, e, gamma (Euler-Mascheroni Constanat) and phi (Golden Ratio), but these can be looked up on the Internet. Clicking their icons inserts their numeric values.
+including topics not supported on the menus. Help is not provided for the constants pi, e, gamma (Euler-Mascheroni Constant) and phi (Golden Ratio), but these can be looked up on the Internet. Clicking their icons inserts their numeric values.
diff --git a/source/fototoon.rst b/source/fototoon.rst
index 410fb4d..56caaf8 100644
--- a/source/fototoon.rst
+++ b/source/fototoon.rst
@@ -11,7 +11,7 @@ The FotoToon Activity will allow you to create everything from a simple "comic"
 
 This introduction to FotoToon will show you how to get started with a simple 4 panel project. 
 
-FotoToon, like many other Sugar Activities, is often updated to fix "bugs" that users report. There was one update, from version 11 to version 12 during the time this instruction chapter was written. By the time you use it, there may be others. The changes are usually minor and should not interfere with the usefulness of this information. Always try to be sure you are using the latest version.
+FotoToon, like many other Sugar Activities, is often updated to fix "bugs" that users report. There was one update, from version 15 to version 16 during the time this instruction chapter was written. By the time you use it, there may be others. The changes are usually minor and should not interfere with the usefulness of this information. Always try to be sure you are using the latest version.
 
 Using FotoToon
 --------------
@@ -19,65 +19,101 @@ Using FotoToon
 The Main FotoToon Toolbar
 :::::::::::::::::::::::::
 
-.. image :: images/FotoToon12_Main_Screen.png
+.. image :: images/FotoToon_0Toolbar.png
 
-The FotoToon Toolbar has 13 icons including 2 with pulldown menus. The main FotoToon toolbar allows you to access many features of the Activity. Here is a description of what each of the icons will allow you to do:
+The FotoToon Toolbar has 9 icons including 3 with pulldown menus. The main FotoToon toolbar allows you to access many features of the Activity. Here is a description of what each of the icons will allow you to do:
 
-1. The FotoToon icon. When you hover your cursor over this icon you will open a small pulldown that allows you to export your work as an image. See below for more details. 
+1. The FotoToon icon. When you hover your cursor over this icon you will open a small pulldown that allows you to export your work as an image or a book  (pdf file). See below for more details. 
+2. This icon allows you to view the content in full screen or presentation mode.
+3. The **Add Photo** icon. This icon allows you to add an image to your project. It can be a photo you take with the XO or digital camera, or import from the web. It can also be a picture, page, or project you create in another Sugar Activity. 
+4. The **Add a globe** icon. This allows you to add a globe. It is used to tell what the characters of your image is speaking. This also include some other icons such as whispher and think.
+5. The **Choose a movement line** icon. This can be used to insert some other icons such as highlight and idea to the image.
+6. The **Rotate** icon. This allows you to rotate the selected object in the clockwise direction in 90 degrees for each click.
+7. The **Delete** icon. This allows you to delete the selected object.
+8. This icon allows you to change the text properties of what you have typed. See below for more details.
+9. The familiar stop-sign icon is one way to stop the FotoToon Activity. You can also use the keyboard shortcut: ctrl-Q.
 
-2. The **Add Image** icon. This icon allows you to add an image to your project. It can be a photo you take with the XO or digital camera, or import from the web. It can also be a picture, page, or project you create in another Sugar Activity. 
-
-The next four icons allow you to add text to your drawings and photos. They include:
-
-3. A normal dialog Globe
-4. A cloud shape to tell what a character is silently Thinking
-5. A dotted globe which indicates a character is talking in a Whisper
-6. An exclamation bubble to add things like "Pow!" "Bang!" and "Wham!"
-7. Is a box where you can put the Title of your project. Just above it is a box icon that allows you to add more rectangular text boxes to your project.
-8. The Movement icon allows you to add little curves to indicate motion, highlight an object with a sunburst, add some parallel lines to show horizontal or vertical motion, or add a little light bulb to show that someone had a bright idea.
-9. The circular arrow allows you to click on an object, then on this icon and rotate it clockwise 1/4 turn (90 degrees) with each click.
-10. This icon allows you to delete something you have added.
-11. This icon opens and closes the Text pulldown where you can select the font and size of your text as well as select bold, italics, or other colors for your words. Click it to open, and when finished, click again to close. See below for more details. 
-12. The familiar stop-sign icon is one way to stop the FotoToon Activity. You can also use the keyboard shortcut: ctrl-Q. 
+**Title:** box allows you to give a name to your project. Click on it and replace the content with the name you wish for your work.
 
 The Export Pulldown
 :::::::::::::::::::
 
-.. image :: images/FotoToonExportPulldown.png
+.. image :: images/FotoToon_1Toolbar.png
 
 1a- This little panel allows you to name your project before you export it as an image. If you do nothing, it will appear in the Journal as, "FotoToon as image." If you give it a name, such as "My Project-1" before exporting it will appear in the Journal as "My Project-1 as image". This will make it easier to find later in the Journal. Just erase the FotoToon label and replace it with the title you want to use. If you forget to name it when saving, you can always go to the Journal and select and rename it. 
 
-1b- This greyed out icon for home view is currently inactive. 
+1b- This allows you to add a description to the journal entry.
+
+1c- This greyed out icon for home view is currently inactive. 
+
+1d- Click on this icon to export your project as an image. The export will just show your project. The tool bars and other things on the screen will not be included. If you wish a screen shot of the entire screen, you can make one by using the usual alt-1 (press the alt key and the 1 key at the same time). 
+
+1e- Click this icon to export your project as an book. The export will just show your project. The tool bars and other things on the screen will not be included. The book will be saved in PDF format. It can be viewed from Read Activity.
+
+The View Pulldown
+:::::::::::::::::
+
+.. image :: images/FotoToon_2Toolbar.png
+
+2a- Click this to view your project in slideshow mode. It will allow you to view your project slide by slide. In the slideshow, click on the arrows by the sides to navigate forward and backword in your slides. Click on the **slidshow** icon again to return to edit mode.
+
+2b - Click this to work in full screen. This will hide the toolbar and thus you will have more space for your design. Once you are in the full screen mode, the same icon will appear on the top right corner of the window. Click that icon to return to the normal edit mode.
+
+Add a globe menu
+::::::::::::::::::::
+
+.. image :: images/FotoToon_3Toolbar.png
+
+3a- You can use this to present an expression of exclamation.
 
-1c- Click on this icon to export your project as an image. The export will just show your project. The tool bars and other things on the screen will not be included. If you wish a screen shot of the entire screen, you can make one by using the usual alt-1 (press the alt key and the 1 key at the same time). 
+3b- You can use this when some one (a character) in your projects whispers someting to another.
+
+3c- You can use this to express what the characters of your projects are speaking.
+
+3d- You can use this to add a box to your project.
+
+3e- You can use this to express that some character in your project are thinking.
+
+Choose a movement line menu
+:::::::::::::::::::::::::::
+
+.. image :: images/FotoToon_4Toolbar.png
+
+4a- You can use this to add a highlight to your project.
+
+4b- You can use this to add straight lines to your project.
+
+4c- You can use this to add an idea to your project.
+
+4d- You can use this to add curves to your project.
 
 The Text Pulldown
 :::::::::::::::::
 
-.. image :: images/FotoToonTextPulldown.png
+.. image :: images/FotoToon_5Toolbar.png
 
 The Text Pulldown menu allows you to control the appearance of the text you add to your project. Generally, they apply to everything in the box or bubble you are currently working on. You do not have to highlight the text to change it.
 
-    11a- Selecting this icon will change the text you are working on to Bold. Clicking it again reverts back to regular text, 
+8a- Selecting this icon will change the text you are working on to Bold. Clicking it again reverts back to regular text, 
 
-    11b- Selecting this icon will change the text your are working on to Italics. 
+8b- Selecting this icon will change the text your are working on to Italics. 
 
 Note: clicking on both of these icons, in any order, will give you Bold Italic text. Clicking both again, in any order, will get you back to regular text.
 
-    11c- Clicking on this icon will open the Text Color Pallete. See below for information on how to use it. 
+8c- Clicking on this icon will open the Text Color Palette. See below for information on how to use it. 
 
-    11d- This is a non-functioning icon that identifies this as the Text Pulldown toolbar. 
+8d-  Clicking this will reduce the size of the text. The current size will be displayed just next to this icon.
 
-    11e- This little pull down allows you to choose the size of the text you are working on. 
+8e - Clicking this will increase the size of the text. The current size will be displayed just before the icon.
 
-    11f- This pull down offers a choice of 37 different fonts, listed in alphabetical order. Some, such as "Ding Bats" don't actually produce anything. Be sure to test the font on your text to see if it looks the way you would like it to. 
+8f- This pull down offers a choice of different fonts, listed in alphabetical order. Some, such as "Ding Bats" don't actually produce anything. Be sure to test the font on your text to see if it looks the way you would like it to. 
 
-The Color Pallete Pulldown
+The Color Palette Pulldown
 ::::::::::::::::::::::::::
 
-.. image :: images/ScreenshotofFTColorPallete.png
+.. image :: images/FotoToon_ColorPallete.png
 
-The Color Pallete Pulldown allows you to choose the color of your font. It will apply to everything in the box or bubble but can vary from one box or bubble to the next as you choose. There are 12 preset colors you can use, or you can create a custom color by selecting one of the preset colors and dragging the sliders to give more or less Red, Green, or Blue in the selected color. The little circle at the top of the Color Pallete shows the current color. When you are satisfied with the color you have selected/modified, click on the little circle to accept the chosen color and close the Color Pallete. It may take a few seconds for the new color to appear in the text box. But, don't worry, it will!
+The Color Palette Pulldown allows you to choose the color of your font. It will apply to everything in the box or bubble but can vary from one box or bubble to the next as you choose. There are 12 preset colors you can use, or you can create a custom color by selecting one of the preset colors and dragging the sliders to give more or less Red, Green, or Blue in the selected color. The little circle at the top of the Color Palette shows the current color. When you are satisfied with the color you have selected/modified, click on the little circle to accept the chosen color and close the Color Palette. It may take a few seconds for the new color to appear in the text box. But, don't worry, it will!
 
 Learning with FotoToon
 ----------------------
@@ -100,10 +136,10 @@ Place Your Images
 
 * Open the Journal and check to be sure your images are there and can be viewed in the Image Viewer (click on the file to open it and check). Be sure the images have names that include the number of the pane you plan to place them (1,2,3, or 4). 
 
-* Open FotoToon and find the "Add Photo" icon (number 2 in the FotoToon main toolbar shown above). A list of available images will appear. Click on the one you want to put in the first pane. When it has loaded, you can either leave it or remove it with the minus sign icon (number 10 in the main toolbar shown above). Warning: You can only remove the last image entered. That is why it is important to number the images according to the panes you wish to place them in. After the first image has been placed, continue adding images until all four for your first project have been placed. If you decide later that you want to change their order after they have been placed, you will need to delete them and replace them in the new order. It is best to get your final placement before adding any text. 
+* Open FotoToon and find the "Add Photo" icon (number 3 in the FotoToon main toolbar shown above). A list of available images will appear. Click on the one you want to put in the first pane. When it has loaded, you can either leave it or remove it with the minus sign icon (number 7 in the main toolbar shown above). Warning: You can only remove the last image entered. That is why it is important to number the images according to the panes you wish to place them in. After the first image has been placed, continue adding images until all four for your first project have been placed. If you decide later that you want to change their order after they have been placed, you will need to delete them and replace them in the new order. It is best to get your final placement before adding any text. 
 
 
-.. image :: images/SmallImportImages.png
+.. image :: images/FotoToon_FotoToon.png
 
 
 If you would like to use the same images that will be used in this sample project, you will find them at these links. Go to each link, upload the photo to a usb drive, plug it into your XO, and open by clicking on the image names. They will open in the Image Viewer and be automatically saved so you can access them for your project.
@@ -116,32 +152,32 @@ If you would like to use the same images that will be used in this sample projec
 
     Pane-4 http://wiki.laptop.org/go/File:4-HealthySnacks.png 
 
-Add Dialogue and Titles
+Add Dialog and Titles
 -----------------------
 
 If you have planned well with your storyboard, you will have a pretty good idea of what you want to put in your dialog balloons and text boxes. You may even have a title in mind for your project. You can actually start this process anywhere in your project. All of the balloons and boxes you will be using to do this will be identified in the first image above, the The Main PhotoToonToolbar.
 
-*  Making and placing your Title: If you know what you would like your title to be, you can start with that. It can always be changed later. When you start a project in FotoToon there will already be a tiny box for the title in a narrow band across the top of the project window. You can drag the upper left corner of the box to enlarge it (look for the cursor arrow to change to a thinner double headed arrow). You can also move it around in the band across the top. Click on the box and type all or part of your title. Then you can change the type style and size using the pull downs in the Text Pulldown menu (see 11e and 11f in the picture above). Experiment until you find a style and size you like. You can also change the color of the type. Don't worry if it isn't perfect, you can always come back later and change it. Notice that you can erase part of the text by backspacing over it. 
+*  Making and placing your Title: If you know what you would like your title to be, you can start with that. It can always be changed later. When you start a project in FotoToon there will already be a tiny box for the title in a narrow band across the top of the project window. You can drag the upper left corner of the box to enlarge it (look for the cursor arrow to change to a thinner double headed arrow). You can also move it around in the band across the top. Click on the box and type all or part of your title. Then you can change the type style and size using the pull downs in the Text Pulldown menu (see 8d and 8e) in the picture above). Experiment until you find a style and size you like. You can also change the color of the type. Don't worry if it isn't perfect, you can always come back later and change it. Notice that you can erase part of the text by backspacing over it. 
 
 
-.. image :: images/SmallAddTitle.png
+.. image :: images/FotoToon_Captura2.png
 
 
-In this image you can see that we selected bold, a red color from the color palette, a type size of 48, and the Font "Georgia".
+In this image you can see that we selected bold, a red color from the color palette, a type size of 26, and the Font "Monospace".
 
 
-*  Adding Text Balloons: You can place the text balloons wherever you like within a pane. Click on the pane, then on the balloon you want to use (see 3,4,and 5 above for explanations). The balloon will appear in the pane. You can drag it to the position where you want it, and also can drag the little tail to point to the source of the dialog. Add the words to the balloon in the same way you added them to the Title box. 
+*  Adding Text Balloons: You can place the text balloons wherever you like within a pane. Click on the pane, then on the balloon you want to use (see "Add a global menu" and "Choose a movement line menu" above for explanations). The balloon will appear in the pane. You can drag it to the position where you want it, and also can drag the little tail to point to the source of the dialog. Add the words to the balloon in the same way you added them to the Title box. 
 
 
-.. image :: images/AddBalloonsCropSM3.png
+.. image :: images/FotoToon_Captura3.png
 
-In this image you can see that we have added 4 dialog balloons (#3 in the main toolbar). We could also have used the "cloud" balloon (#4 in the main toolbar), or the "whisper" balloon (#5 in the main toolbar). The first pane is OK, but the first balloon in the second pane needs to be dragged to a better shape and size. The second ballon in the second pane appears just as it does when it is first added. It still needs to have text added and to be resized (by dragging a corner). You can see that our type size is 12, text color is black, and we are still using the Georgia font.
+In this image you can see that we have added 4 dialog balloons (#4 in the main toolbar). We could also have used the "think" balloon, or the "whisper" balloon. The first pane is OK, but the first balloon in the second pane needs to be dragged to a better shape and size. The second balloon in the second pane appears just as it does when it is first added. It still needs to have text added and to be resized (by dragging a corner). You can see that our type size is 10, text color is black, and we are still using the "Monospace" font.
 
-As you work with the various text items, you may wish to eliminate one entirely. Just click on it, then on the icon with the minus (-) sign (#10 in the main toolbar), and it will disappear.
+As you work with the various text items, you may wish to eliminate one entirely. Just click on it, then on the icon with the minus (-) sign (#7 in the main toolbar), and it will disappear.
 
-*  Adding Exclamation Balloons: You may wish to include special exclamations to your project. Choose the exclamation balloon (# 6 in the main toolbar). It is possible to eliminate the one longer point on the balloon by dragging it so that it matched the others. Again, type into the balloon just as you did in the title box and dialog balloons. 
+*  Adding Exclamation Balloons: You may wish to include special exclamations to your project. Choose the exclamation balloon (choose from # 4 in the main toolbar). It is possible to eliminate the one longer point on the balloon by dragging it so that it matched the others. Again, type into the balloon just as you did in the title box and dialog balloons. 
 
-*  Adding extra Text Boxes: You can add a text box anywhere in any pane by clicking on the pane and then on the box icon in the diagram (#7 in the main toolbar). 
+*  Adding extra Text Boxes: You can add a text box anywhere in any pane by clicking on the pane and then on the box icon in the diagram (choose from #4 in the main toolbar). 
 
 .. image :: images/Exclamations&Boxes.png
 
@@ -154,25 +190,27 @@ Now, if you have followed the instructions above, you should have a small, compl
 
 .. image :: images/FotoToonFoodFinalSm.png
 
-Notice the little red cursor mark at the end of the title in the image. This export was done in FotoToon 11. The update, FotoToon 12 eliminates all stray cursors when exporting. Always be sure you are using the latest version of an Activity.
-
 Regardless of what you have made for your project, you will probably want to share it with others. You can do this as an email attachment or print it out as a paper copy. To do this, you need to export your project as an image stored in your Journal. The instructions for exporting your project are shown above. We will repeat them here as well.
 
 The Export Pulldown
 -------------------
 
-.. image :: images/FotoToonExportPulldown.png
+.. image :: images/FotoToon_1Toolbar.png
 
 1a- This little panel allows you to name your project before you export it as an image. If you do nothing, it will appear in the Journal as, "FotoToon as image." If you give it a name, such as "My Project-1" before exporting it will appear in the Journal as "My Project-1 as image". This will make it easier to find later in the Journal. Just erase the FotoToon label and replace it with the title you want to use. If you forget to name it when saving, you can always go to the Journal and select and rename it. 
 
-1b- This greyed out icon for home view is currently inactive. 
+1b- This allows you to add a description to jounal entry.
+
+1c- This greyed out icon for home view is currently inactive. 
+
+1d- Click on this icon to export your project as an image. The export will just show your project. The tool bars and other things on the screen will not be included. If you wish a screen shot of the entire screen, you can make one by using the usual alt-1 (press the alt key and the 1 key at the same time).
 
-1c- Click on this icon to export your project as an image. The export will just show your project. The tool bars and other things on the screen will not be included. If you wish a screen shot of the entire screen, you can make one by using the usual alt-1 (press the alt key and the 1 key at the same time). 
+1e- Click this icon to export your project as an book. The export will just show your project. The tool bars and other things on the screen will not be included. The book will be saved in PDF format. It can be viewed from Read Activity.
 
 Look in the Journal. Your project should appear there with the name you gave it before exporting. If you forgot to give it a name, it will just say "FotoToon." If this happened, rename it now, in the Journal before you forget to do it. 
 
-Extending FotoToon 12
----------------------
+Extending FotoToon
+------------------
 
 FotoToon can be used for much more than the simple 4-pane example we built in the instructions. It can be adapted for use in many different subject areas where students and teachers can construct lessons on any topic. Here are some possible ideas for projects:
 
@@ -180,24 +218,24 @@ FotoToon can be used for much more than the simple 4-pane example we built in th
 
 *  Student produced magazine articles for any topic they and their teachers choose. A single page or two-page "spread" will make it like the ones you see in actual magazines. One or more panes on the page can be used just for text to extend the story. The text could be written in another program and imported as an image or put in a large text box that fills the pane. The advantage of doing it all in FotoToon is that it would be easier to edit and/or change the text there than if it is imported as an image. Some possible ideas for these articles could be: 
 
-*  Cooking favorite foods (with recipes) 
+    *  Cooking favorite foods (with recipes) 
 
-*  Family pets (pictures and stories) 
+    *  Family pets (pictures and stories) 
 
-    Our neighborhood (pictures and stories of places to see or problems that need to be solved) 
+    *  Our neighborhood (pictures and stories of places to see or problems that need to be solved) 
 
-*  Science articles with photos of plants, animals, rocks, etc. including descriptions and information 
+    *  Science articles with photos of plants, animals, rocks, etc. including descriptions and information 
 
-*  Historical articles with photos of people or places imported from the web 
+    *  Historical articles with photos of people or places imported from the web 
 
-*  "How To" articles on any topic the students or teacher choose 
+    *  "How To" articles on any topic the students or teacher choose 
 
 
-Modifying FotoToon 12
----------------------
+Modifying FotoToon
+------------------
 
 FotoToon is free open source software and, as such is available to be modified by the user as they wish as long as they give the original source proper credit. So, if you are a programmer and want to change something to suit your needs, you may do so. Just don't forget to give credit where credit is due.
 
-If you are not a programmer, you can suggest changes or modifications to the Activity to the original programmer at the same place where you would report problems (see next section). If it is something that will improve the Activity and not interfere with other parts of it, the programmers will be happy to consider including it in a future update.
+If you are not a programmer, you can suggest changes or modifications to the Activity to the original programmer at the same place where you would report problems. If it is something that will improve the Activity and not interfere with other parts of it, the programmers will be happy to consider including it in a future update.
 
 Because there are always updates and improvements happening with this program, be sure to always check to be sure you have the latest version. 
diff --git a/source/gnome.rst b/source/gnome.rst
index 2f51912..7d9ccbb 100644
--- a/source/gnome.rst
+++ b/source/gnome.rst
@@ -11,7 +11,7 @@ Users can switch from Sugar to GNOME through the Switch Desktop option under My
 
 .. image :: images/Gnome-control_panel.png
 
-After selecting the Switch Desktop option another confirmation dialogue with addtional information appears. The switch to GNOME can be initiated by clicking the Restart now button.
+After selecting the Switch Desktop option another confirmation dialogue with additional information appears. The switch to GNOME can be initiated by clicking the Restart now button.
 
 .. image :: images/Gnome-confirmation.png
 
diff --git a/source/group_view.rst b/source/group_view.rst
index 5143232..65cac7a 100644
--- a/source/group_view.rst
+++ b/source/group_view.rst
@@ -33,7 +33,7 @@ Inviting a friend
 
 .. image:: images/Group_invite.png
 
-From the hover menu, you can also invite friends to join your current Actvity. There is more information about invitations and sharing in the Collaborating chapter.
+From the hover menu, you can also invite friends to join your current Activity. There is more information about invitations and sharing in the Collaborating chapter.
 
 Removing a friend
 -----------------
diff --git a/source/images/FotoToon12_Main_Screen.png b/source/images/FotoToon12_Main_Screen.png
deleted file mode 100644
index e2eee78..0000000
--- a/source/images/FotoToon12_Main_Screen.png
+++ /dev/null
diff --git a/source/images/FotoToonExportPulldown.png b/source/images/FotoToonExportPulldown.png
deleted file mode 100644
index 4930d01..0000000
--- a/source/images/FotoToonExportPulldown.png
+++ /dev/null
diff --git a/source/images/FotoToonTextPulldown.png b/source/images/FotoToonTextPulldown.png
deleted file mode 100644
index 81cf462..0000000
--- a/source/images/FotoToonTextPulldown.png
+++ /dev/null
diff --git a/source/images/FotoToon_0Toolbar.png b/source/images/FotoToon_0Toolbar.png
new file mode 100644
index 0000000..675f045
--- /dev/null
+++ b/source/images/FotoToon_0Toolbar.png
diff --git a/source/images/FotoToon_1Toolbar.png b/source/images/FotoToon_1Toolbar.png
new file mode 100644
index 0000000..3af31ae
--- /dev/null
+++ b/source/images/FotoToon_1Toolbar.png
diff --git a/source/images/FotoToon_2Toolbar.png b/source/images/FotoToon_2Toolbar.png
new file mode 100644
index 0000000..dfa928b
--- /dev/null
+++ b/source/images/FotoToon_2Toolbar.png
diff --git a/source/images/FotoToon_3Toolbar.png b/source/images/FotoToon_3Toolbar.png
new file mode 100644
index 0000000..c0bb350
--- /dev/null
+++ b/source/images/FotoToon_3Toolbar.png
diff --git a/source/images/FotoToon_4Toolbar.png b/source/images/FotoToon_4Toolbar.png
new file mode 100644
index 0000000..18af8ea
--- /dev/null
+++ b/source/images/FotoToon_4Toolbar.png
diff --git a/source/images/FotoToon_5Toolbar.png b/source/images/FotoToon_5Toolbar.png
new file mode 100644
index 0000000..d713ba7
--- /dev/null
+++ b/source/images/FotoToon_5Toolbar.png
diff --git a/source/images/FotoToon_Captura2.png b/source/images/FotoToon_Captura2.png
new file mode 100644
index 0000000..0d176a4
--- /dev/null
+++ b/source/images/FotoToon_Captura2.png
diff --git a/source/images/FotoToon_Captura3.png b/source/images/FotoToon_Captura3.png
new file mode 100644
index 0000000..a54c479
--- /dev/null
+++ b/source/images/FotoToon_Captura3.png
diff --git a/source/images/FotoToon_ColorPallete.png b/source/images/FotoToon_ColorPallete.png
new file mode 100644
index 0000000..182977c
--- /dev/null
+++ b/source/images/FotoToon_ColorPallete.png
diff --git a/source/images/FotoToon_FotoToon.png b/source/images/FotoToon_FotoToon.png
new file mode 100644
index 0000000..2c4ba06
--- /dev/null
+++ b/source/images/FotoToon_FotoToon.png
diff --git a/source/images/SmallAddTitle.png b/source/images/SmallAddTitle.png
deleted file mode 100644
index 78bd487..0000000
--- a/source/images/SmallAddTitle.png
+++ /dev/null
diff --git a/source/journal.rst b/source/journal.rst
index 1c3f37c..3788aa4 100644
--- a/source/journal.rst
+++ b/source/journal.rst
@@ -6,7 +6,7 @@ The Journal Activity is an automated diary of everything you do within Sugar. Su
 
 The Journal keeps a record of what you do and the things your create such as photos, drawings, and writings. You can search for items in the Journal or sort entries by type or date. You can also click an entry to get a detailed view. You can resume an activity by clicking on the icon for that entry.
 
-The Journal also supports external storage media such as a USB device or a SD card. When you plug a USB device into the XO, you can access the contents of the USB device using the Journal. Click the USB icon to see the content on an attached USB storage device. You can also copy information from the Journal onto removeable media—such as a USB device—as a means of backing it up. If you are connected to a school server, you can access its backup system.
+The Journal also supports external storage media such as a USB device or a SD card. When you plug a USB device into the XO, you can access the contents of the USB device using the Journal. Click the USB icon to see the content on an attached USB storage device. You can also copy information from the Journal onto removable media—such as a USB device—as a means of backing it up. If you are connected to a school server, you can access its backup system.
 
 Accessing the Journal
 ---------------------
@@ -62,16 +62,16 @@ The Detail view appears when you click the Detail view button for an entry. This
 
 When resuming from the Detail View, you can choose among different Activities.
 
-Using removeable media
+Using removable media
 ----------------------
 
 .. image:: images/Journal_usb-drive.png
 
-When you insert removeable media—such as a USB device or SD card—it appears as an icon on the bottom edge of the main Journal view.
+When you insert removable media—such as a USB device or SD card—it appears as an icon on the bottom edge of the main Journal view.
 
 *  Journal: Click the Journal icon to shows the Journal View.
 *  Documents folder: Click the Documents icon to show the contents of
-*  USB device: Click the USB icon (or SD icon) to show the removeable-media file system. 
+*  USB device: Click the USB icon (or SD icon) to show the removable-media file system. 
 
 .. image:: images/Journal_dragndrop-annotated.png
 
@@ -83,7 +83,7 @@ To remove (unmount) the external file system, choose Remove on the hover menu.
 
 Caution: It may take time for the hover menu to appear. It is easy to make a mistake and click the icon itself when you intended to click Unmount.
 
-Caution: If you have a Terminal running you may inadvertently have your removeable media locked. The safest way to remove media is after powering off your computer.
+Caution: If you have a Terminal running you may inadvertently have your removable media locked. The safest way to remove media is after powering off your computer.
 
 Sending Journal Entries via a Network
 -------------------------------------
diff --git a/source/maintaining.rst b/source/maintaining.rst
index 9e40971..14c522f 100644
--- a/source/maintaining.rst
+++ b/source/maintaining.rst
@@ -12,7 +12,7 @@ Although your XO is tough, try to keep it dry and clean. Here are some tips for
 - If it gets dirty, wipe it with a damp cloth and dry it.
 - Do not dip it into water. If it gets wet, such as from rain, let it dry completely before using it. 
 
-The XO laptop has no hard drive and only two internal cables. With care it can be dissassembled for repair. For added robustness, the XO's plastic walls are thicker than other laptops. Its green mesh network antennae give a better wireless connection than typical laptops. Plus, they double as external covers for the USB ports, which are protected internally as well. Internal bumpers protect the screen display by cushioning it.
+The XO laptop has no hard drive and only two internal cables. With care it can be disassembled for repair. For added robustness, the XO's plastic walls are thicker than other laptops. Its green mesh network antennae give a better wireless connection than typical laptops. Plus, they double as external covers for the USB ports, which are protected internally as well. Internal bumpers protect the screen display by cushioning it.
 
 Sometimes, It happens that the keys you are pressing appear somewhat dark shade of green or somewhat blackish. Remember, don't keep your hand on a single key for long. And wipe it with clean cloth to clean it.
 
diff --git a/source/measure.rst b/source/measure.rst
index 35d1e20..edf29c4 100644
--- a/source/measure.rst
+++ b/source/measure.rst
@@ -45,7 +45,7 @@ The secondary toolbar - measurement settings
 
 16. Starts/stops saving a text file 'Measure Log' with measured values as readable text
 
-17. This feature is not working well in version 36, the intention is to synchronise the sample period to the waveform so that the sample will start on a rising edge or falling edge
+17. This feature is not working well in version 36, the intention is to synchronize the sample period to the waveform so that the sample will start on a rising edge or falling edge
 
 Applying
 --------
diff --git a/source/memorize.rst b/source/memorize.rst
index 4f54d08..f301320 100644
--- a/source/memorize.rst
+++ b/source/memorize.rst
@@ -118,9 +118,9 @@ Sharing
 
 To play these games with users on more than one XO, so that the turn moves from one user to the other, when a user fails to make a matching selection:
 
-1.  Open the memorize activity and load the game you want to share on the main XO
+1.  Open the Memorize activity and load the game you want to share on the main XO
 2.  Click on “Activity” then in menu bar click on the circle with a single dot
-3.  All the other XOs will see the memorize activity icon close to your XO symbol on their neighborhood view
+3.  All the other XOs will see the Memorize activity icon close to your XO symbol on their neighborhood view
 4.  They can then join the activity by moving their cursor over the game icon. 
 
 .. image :: images/100px-MemorizeSharing.jpg
diff --git a/source/paint.rst b/source/paint.rst
index 44b951d..2f7eda0 100644
--- a/source/paint.rst
+++ b/source/paint.rst
@@ -153,10 +153,10 @@ Extending
 *  take a photo of an animal with Record, crop the image with Paint, use as a custom turtle in Turtle Blocks
 *  start a school newspaper, take photos with Record, crop with Paint, import them into Write
 *  do a portfolio of your schoolwork, get screenshots (Alt-1) crop with Paint and add explanatory labels then make a slideshow in Portfolio Activity
-*  create a custom Memorize Activity Activity game, create the images in Paint
+*  create a custom Memorize Activity game, create the images in Paint
 *  create custom cards for the Dimensions (Visual Match) Activity
 *  create custom foods for the Nutrition Activity
-*  create custom images for the Labrynth Activity (mind maps)
+*  create custom images for the Labyrinth Activity (mind maps)
 *  create a web page with images from Paint
 *  take photos of plants or animals, crop the photos, label them
 *  take the output of SimpleGraph and use the flood-fill tool to make a multicolored graph 
diff --git a/source/pippy.rst b/source/pippy.rst
index 13a089b..795c1f6 100644
--- a/source/pippy.rst
+++ b/source/pippy.rst
@@ -32,7 +32,7 @@ In particular, it is instructive to play with the sounds:
 Extending Pippy
 ---------------
 
-If Pippy is used in parallel with the Write Activity, it is possible to develop  larger programs. Copy the program that you develop in the Write Activity by selecting all (<ctl>a) and copying it to the clipboard (<ctl>c), then switch to the Pippy Activity, and paste (<ctl>v) it into the code window. If there are errors that you want to correct, you can make the changes in the code window, and immediately see the results of your changes. Then by copying the changed program back to the clipboard, you can paste it back into the Word Activity, and save the changes to the Journal.
+If Pippy is used in parallel with the Write Activity, it is possible to develop  larger programs. Copy the program that you develop in the Write Activity by selecting all (<ctrl>a) and copying it to the clipboard (<ctrl>c), then switch to the Pippy Activity, and paste (<ctrl>v) it into the code window. If there are errors that you want to correct, you can make the changes in the code window, and immediately see the results of your changes. Then by copying the changed program back to the clipboard, you can paste it back into the Word Activity, and save the changes to the Journal.
 
 Modifying Pippy
 ---------------
diff --git a/source/read.rst b/source/read.rst
index dfd82d4..8efc416 100644
--- a/source/read.rst
+++ b/source/read.rst
@@ -32,7 +32,7 @@ When the screen is in the upright position, the keyboard is available for naviga
 
 **Screen GamePad and Directional Button Navigation**
 
-* The screen rotation key (the bottom key on the left side of the screen) will turn the screen image to accomodate tablet use.
+* The screen rotation key (the bottom key on the left side of the screen) will turn the screen image to accommodate tablet use.
 * The directional pad on the left hand side of the screen will also scroll a few lines
 * On the right hand side of the screen the gamepad buttons 'circle' and 'cross' also act as page up and page down (with a small overlap to keep context).
 * The gamepad buttons 'square' and 'tick' act as a zoom in and zoom out 
@@ -40,8 +40,8 @@ When the screen is in the upright position, the keyboard is available for naviga
 **Brightness Control**
 
 * The brightness can be increased or decreased with the keys
-* Clarity is improved in tablet mode (turning the screeen and laying it flaot) by using monochrome mode. Select CTL + Brightness keys to turn it on or off.
-* Monochrome outside is easier to view books (CTL Brightness Down) 
+* Clarity is improved in tablet mode (turning the screen and laying it flat) by using monochrome mode. Select CTRL + Brightness keys to turn it on or off.
+* Monochrome outside is easier to view books (CTRL Brightness Down) 
 
 .. image :: images/Read-BrightnessControls.jpg
 
diff --git a/source/record.rst b/source/record.rst
index af1a589..984fece 100644
--- a/source/record.rst
+++ b/source/record.rst
@@ -41,7 +41,7 @@ Once Record successfully takes a photo, it shows up as an icon on the tray. You
 
 In the Photo View screenshot above, item 1 shows how the tray displays a history of your previously taken photos. When you click on a photo, you are taken to the interface you see in the screenshot, which includes a text field where you can name your photo (item 2). You also see the image taken by your camera (in this case, the skyline of Chicago). Item 3 is a small output window of what your camera sees (in this case, a very happy student!). If you click on this small window, you are returned to the main photo screen from which you can take more pictures.
 
-Item 4 on the bottom right of your image is a little tab that allows you to find out even more about the photo that was taken. The screenshot below shows the new window that appears. Here, you can read and enter new 'tags' for your image, and find out about when the picture was taken and by whom. A tag is a single word that helps categorise or describe the photo.
+Item 4 on the bottom right of your image is a little tab that allows you to find out even more about the photo that was taken. The screenshot below shows the new window that appears. Here, you can read and enter new 'tags' for your image, and find out about when the picture was taken and by whom. A tag is a single word that helps categorize or describe the photo.
 
 As with the photo view window, you have the output of your camera on the bottom left. You can click this to go back to taking photos.
 
@@ -92,7 +92,7 @@ To replay the audio click the icon of the recording at the bottom of the page.
 Sharing Media
 -------------
 
-You can share photos, video and audio recordings (these can just be refered to as 'media') with your friends. To share media you must first have some media in the bottom tray. In our example we have the image of a Bison (see below) in the tray. Now select the Activity Tab on the left and the Record Activity looks something like this:
+You can share photos, video and audio recordings (these can just be referred to as 'media') with your friends. To share media you must first have some media in the bottom tray. In our example we have the image of a Bison (see below) in the tray. Now select the Activity Tab on the left and the Record Activity looks something like this:
 
 .. image :: images/sharing_2.png 
 
diff --git a/source/schoolserver.rst b/source/schoolserver.rst
index 1743b6d..0ff8f6a 100644
--- a/source/schoolserver.rst
+++ b/source/schoolserver.rst
@@ -18,7 +18,7 @@ Two installation options are available:
 
 2) On top of another system (advanced): install the XS software packages on top of an existing operating system installation. See details at http://wiki.laptop.org/go/XS_Installing_Software_0.7#Installing_on_top_of_existing_OS_installation
 
-The installation is fairly straight forward and requires minimal configuration after the intial installation to the XS hard drive.
+The installation is fairly straight forward and requires minimal configuration after the initial installation to the XS hard drive.
 
 Configuration
 -------------
@@ -38,7 +38,7 @@ The XS provides collaboration services across a variety of activities. When XOs
 Caching
 :::::::
 
-The XS uses Squid to cache content locally. At sites where Internet access is limited, slow or expensive, content caching helps in speeding up acccess to content by making copies on the XS and serving these up locally.
+The XS uses Squid to cache content locally. At sites where Internet access is limited, slow or expensive, content caching helps in speeding up access to content by making copies on the XS and serving these up locally.
 
 Backup and Restore
 ::::::::::::::::::
diff --git a/source/write.rst b/source/write.rst
index 3a34e57..ac6fb3b 100644
--- a/source/write.rst
+++ b/source/write.rst
@@ -34,7 +34,7 @@ In order from left to right
 
 1. The Activity Button: Allows you to name your file, Share it, and save it as RTF, HTML, TXT and PDF.
 2. The Edit Button: Allows to Copy, Paste, Undo, Redo, and search inside your document.
-3. The View Button: Allows you to zoom in and out of the document and to navigate trhough the pages quickly.
+3. The View Button: Allows you to zoom in and out of the document and to navigate through the pages quickly.
 4. The Fonts Button: Allows you to change the font and the size.
 5. The Paragraph Button : Allows you to change the headings, the text dispositions and the different justify possibilities.
 6. The List Button : Allows you to create multiple lists: bullet, dashed, numbered, lower case list, upper case list.