diff options
| author | Kalpa Welivitigoda <callkalpa@gmail.com> | 2013-08-08 17:38:24 (GMT) |
|---|---|---|
| committer | Kalpa Welivitigoda <callkalpa@gmail.com> | 2013-08-08 17:38:24 (GMT) |
| commit | b5f549e769fe8fcd97bc1d19bd0054b13fb32f5b (patch) | |
| tree | 4c06e113b43e6394935ae9203a1f752cb200bf11 | |
| parent | 4ef6675c1322b8a5ab7e37dfaade498a9edd6bc8 (diff) | |
| parent | a915300d70a737d8160580989643ebbad7d3d62f (diff) | |
Merge commit 'refs/merge-requests/2' of git://git.sugarlabs.org/help-activity-content/mainline
29 files changed, 129 insertions, 91 deletions
diff --git a/source/about_sugar.rst b/source/about_sugar.rst index b6c6993..2ba74c7 100644 --- a/source/about_sugar.rst +++ b/source/about_sugar.rst @@ -60,7 +60,7 @@ Sugar was designed for One Laptop per Child (OLPC), as part of an effort to prov Sugar Labs is a non-profit foundation whose mission is to produce, distribute, and support the use of the Sugar learning platform. Sugar Labs supports the community of educators and software developers who want to extend the platform and who have been creating Sugar Activities. Sugar is a community project. It is available under the open-source GNU General Public License (GPL) and free to anyone who wants to use or extend it. -.. [1] Studio thinking is a term used to describe how visual arts teachers teach and what visual arts students learn. The term is detailed in Studio Thinking: The Real Benefits of Visual Arts Education. Studio thinking includes "studio structures": demonstrations, projects, and critiques; as well as "studio habits of mind": develop craft, engage and persist, envision, express, observe, reflect, stretch and explore, and understand.the art world. In the context of Sugar, studio thinking is applied not just to the arts, but to all disciplines. +.. [1] Studio thinking is a term used to describe how visual arts teachers teach and what visual arts students learn. The term is detailed in Studio Thinking: The Real Benefits of Visual Arts Education. Studio thinking includes "studio structures": demonstrations, projects, and critiques; as well as "studio habits of mind": develop craft, engage and persist, envision, express, observe, reflect, stretch and explore, and understand the art world. In the context of Sugar, studio thinking is applied not just to the arts, but to all disciplines. .. [2] Reflective practice is a concept introduced by Donald Schön in his book The Reflective Practitioner. Reflective practice involves students applying their own experiences to practice while being mentored by domain experts. In the context of Sugar, the expert could be a teacher, a parent, a community member, or a fellow student. diff --git a/source/battery.rst b/source/battery.rst index 4de875a..9702ef6 100644 --- a/source/battery.rst +++ b/source/battery.rst @@ -9,7 +9,10 @@ The XO needs its battery or to be plugged into a wall directly. The laptop will .. image:: images/resized_600x398_xobattery.jpg -This is the XO battery. The battery goes on the back of your XO. Installing the battery +This is the XO battery. The battery goes on the back of your XO. + +Installing the battery +---------------------- - Line up the four tabs on the new battery with the long edge furthest from the catches. - Drop the battery into place. @@ -17,7 +20,7 @@ This is the XO battery. The battery goes on the back of your XO. Installing the .. image:: images/resized_200x162_3Battery.png - Slide the left-hand side catch to the left, and press the battery gently into place. - Slide the right-hand side catch to the left, to lock the battery in place. +- Slide the right-hand side catch to the left, to lock the battery in place. .. image:: images/resized_200x162_4Battery.png @@ -31,7 +34,10 @@ Charging the battery Plugging in your XO ------------------- -You can use your XO while it is plugged in, when you are charging the battery or when you have a good source for power. For power sources, you can use the generator supplied by your school, the electrical grid, or another source of electricity. When to charge the battery +You can use your XO while it is plugged in, when you are charging the battery or when you have a good source for power. For power sources, you can use the generator supplied by your school, the electrical grid, or another source of electricity. + +When to charge the battery +-------------------------- The battery icon in the Frame fills with color, showing you the current charge, or amount of power in the battery. Move the pointer over the battery icon to see how full the battery is. While the battery charges, the battery light near the power button (shaped like a battery) should display yellow, turning to green when the battery is fully charged. A red light tells you that the battery is running very low and you should charge it soon. diff --git a/source/browse.rst b/source/browse.rst index ef04ee7..a565763 100644 --- a/source/browse.rst +++ b/source/browse.rst @@ -20,13 +20,26 @@ Using Browse .. image :: images/Browse_-_toolbar.png +1. Activity Tool +2. Text/Edit Tool +3. View Tool +4. Home +5. Address Bar (URL) +6. Refresh/Reload +7. Navigation Arrows (Back & Forward) +8. Bookmark +9. Stop +10. Window tab + (Note: To see the name of the tool/button, you can put your mouse arrow on top of its picture) **Activity** .. image :: images/Browse_-_activityandprivacytool.png -**Browse Description Bar** - This will serve as the **Browse** activity description in the Journal. Change this to something distinctive especially when you have multiple window tabs opened that's related to one particular topic. +**Browse Journal Entry Name** - This will serve as the name of the Journal entry. Change this to something distinctive especially when you have multiple window tabs opened that's related to one particular topic. + +**Browse Description Bar** - This will serve as the **Browse** activity description in the Journal. **Privacy Tool** - Use this to change the privacy setting of the current Browse activity. The default is set to Private. @@ -39,7 +52,7 @@ Using Browse **Redo** - Use this button to go back to the current changes that you made after doing an "Undo". -**Copy** - This is used to copy a text or passage from the current page you are viewing. To do this, you need to first highlight(left-click while dragging your mouse arrow)the text. You know you've highlighted a text when its background color turned grey. Then, press this tool to copy it to the clipboard. A small image on the left hand side of the frame will appear. This "holds" the text you just copied. You can now "paste" this text or just simply click and drag it to other activities. The copied text will disappear once the XO is restarted or shutdown. +**Copy** - This is used to copy a text or passage from the current page you are viewing. To do this, you need to first highlight (left-click while dragging your mouse arrow) the text. You know you've highlighted a text when its background color turned grey. Then, press this tool to copy it to the clipboard. A small image on the left hand side of the frame will appear. This "holds" the text you just copied. You can now "paste" this text or just simply click and drag it to other activities. The copied text will disappear once the XO is restarted or shutdown. **Paste** - This tool is for pasting texts from other activities into the current page that you are viewing. You can only paste texts on areas of the page where pasting is allowed. It will remember this text until the XO is restarted or shutdown. @@ -72,7 +85,7 @@ Each page on the internet has its own address. The address bar shows you the cur Sometimes it is useful to remember the pages that you visited. Clicking this icon will save the web address of the current page you are viewing. A small thumbnail image of this page will appear on the bottom(tray). Bookmarks are saved only on the current Browse activity. They will not show up when you open a new Browse activity. **Stop Activity Tool** -Closes the current Browse activity. This will open up a Journal page that prompts you to name the activity and add descriptions. +Closes the current Browse activity. **OLPC Library** diff --git a/source/calculate.rst b/source/calculate.rst index 25599c6..7df82bc 100644 --- a/source/calculate.rst +++ b/source/calculate.rst @@ -14,7 +14,7 @@ For those who have used a scientific calculator, most of the functions of Calcul The Toolbars are -* Activity, Calculate icon: Name session, collaborate +* Activity, Calculate icon: Name session, Journal entry description, collaborate * Edit, scissors icon: Copy, Paste @@ -41,7 +41,7 @@ The Toolbars are Getting help ------------ -To see a help option for plot enters the command +To see a help option for plot, enter the command ``help(plot)`` @@ -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 Constant, 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 Constanat) and phi (Golden Ratio), but these can be looked up on the Internet. Clicking their icons inserts their numeric values. diff --git a/source/getting_support.rst b/source/getting_support.rst index f8fa2ed..072712a 100644 --- a/source/getting_support.rst +++ b/source/getting_support.rst @@ -24,6 +24,6 @@ If you are still unable to find an answer online, please email help@laptop.org. Did you know that our volunteers staff a live Help Chat site 24/7, on the Internet? Click here: http://forum.laptop.org/chat Login with the color-name shown; that's guest ID. Type your question in the chat line at the bottom. You may have to wait for a response as our volunteers come in and out. If you are patient, we can probably help you! To learn more about what Internet Relay Chat (the system that makes this possible) is, click here: http://wiki.laptop.org/go/IRC -We would also like to make special mention of our Support Gang, where an enthusiastic group of volunteers assist XO users all over the world. If you are impressed with the passion and hard work of our volunteers, please consider giving back, by joining our dedicated community. Take a look at the link below. We would welcome your participation! http://wiki.laptop.org/go/Support_Gang http://wiki.laptop.org/go/Support_FAQ Be sure to review the Frequently Asked Questions (FAQ)link above. Many of us join and "learn by doing." +We would also like to make special mention of our Support Gang, where an enthusiastic group of volunteers assist XO users all over the world. If you are impressed with the passion and hard work of our volunteers, please consider giving back, by joining our dedicated community. Take a look at the link below. We would welcome your participation! http://wiki.laptop.org/go/Support_Gang http://wiki.laptop.org/go/Support_FAQ Be sure to review the Frequently Asked Questions (FAQ) link above. Many of us join and "learn by doing." Thanks very much! OLPC Support Gang diff --git a/source/gnome.rst b/source/gnome.rst index 3db540d..2f51912 100644 --- a/source/gnome.rst +++ b/source/gnome.rst @@ -19,5 +19,5 @@ Switching back to Sugar from GNOME can be done via the Switch to Sugar icon on t .. image :: images/Gnome-switch_back.jpg -Further information about GNOME is available on the GNOME Web site and its extensive Help section. Additional information about how to transfer files from Sugar's Journal to GNOME's Documents folder can be found in the Journal section. +Further information about GNOME is available on the `GNOME Web site <http://gnome.org>`_ and its extensive `Help section <https://help.gnome.org/users/gnome-help/stable/>`_. Additional information about how to transfer files from Sugar's Journal to GNOME's Documents folder can be found in the Journal section. diff --git a/source/group_view.rst b/source/group_view.rst index 84bee83..5143232 100644 --- a/source/group_view.rst +++ b/source/group_view.rst @@ -2,7 +2,7 @@ Group View ========== -The Group View shows you your friends and allows you to easily interact with them. +The Group View shows you, your friends and allows you to easily interact with them. Accessing the Group View ------------------------ @@ -13,7 +13,7 @@ To show the Group View, click the Group icon on the Frame or press the F2 key. .. image:: images/Group_main.png -The Group View shows you your friends. XO icons that are dimmed represent friends who are currently offline. +The Group View shows you and your friends. XO icons that are dimmed represent friends who are currently offline. Adding a friend --------------- diff --git a/source/hardware_evolution.rst b/source/hardware_evolution.rst index 38dcab1..5d26cbe 100644 --- a/source/hardware_evolution.rst +++ b/source/hardware_evolution.rst @@ -11,21 +11,26 @@ Although the XO has continued to look pretty much the same on the outside, the e - http://wiki.laptop.org/go/Hardware_specification_1.5 -- http://wiki.laptop.org/go/XO-1.75 +- http://wiki.laptop.org/go/XO-1.75 + +- http://wiki.laptop.org/go/XO-4 To some extent, the changes were made to keep using high volume parts, and improve performance. The change from 1.5 to 1.75 involved a change of the processor from x86 to arm, and a reduction in power consumption of about 50%. With power management improvements, this permits the XO to last more than 3.5 hours. +XO-4 is available in two models, XO-4 and XO-4 Touch. XO-4 provides multi touch input on the display. As you can see from the "boot time" comparison, lower power has not been at the expense of decreased performance. -+--------+----------+--------+------------+ -|Version |Hard Disk | Memory | Boot Time | -+========+==========+========+============+ -|XO 1.0 | 1 GB |256 MB | 76 s | -+--------+----------+--------+------------+ -|XO 1.5 | 4 GB |1000 MB | 54 s | -+--------+----------+--------+------------+ -|XO-1.75 | 4 GB |512 MB | 47 s | -+--------+----------+--------+------------+ - -TODO: Add xo-4 info ++--------+----------+---------+-----------+ +|Version |Hard Disk | Memory | Boot Time | ++========+==========+=========+===========+ +|XO 1.0 | 1 GB |256 MB | 76 s | ++--------+----------+---------+-----------+ +|XO 1.5 | 4 GB |1000 MB | 54 s | ++--------+----------+---------+-----------+ +|XO-1.75 | 4 GB |512 MB | 47 s | ++--------+----------+---------+-----------+ +|XO-4 |4 or 8 GB |1 or 2 GB| | ++--------+----------+---------+-----------+ + +TODO: Add xo-4 Boot Time diff --git a/source/images/Activity-Calculate.png b/source/images/Activity-Calculate.png Binary files differindex 41b731c..dce1130 100644 --- a/source/images/Activity-Calculate.png +++ b/source/images/Activity-Calculate.png diff --git a/source/images/Browse_-_activityandprivacytool.png b/source/images/Browse_-_activityandprivacytool.png Binary files differindex c7455de..8f4eb32 100644 --- a/source/images/Browse_-_activityandprivacytool.png +++ b/source/images/Browse_-_activityandprivacytool.png diff --git a/source/images/Browse_-_toolbar.png b/source/images/Browse_-_toolbar.png Binary files differindex 9efa1e9..da321f5 100644 --- a/source/images/Browse_-_toolbar.png +++ b/source/images/Browse_-_toolbar.png diff --git a/source/images/Browse_text_and_edit_tool.png b/source/images/Browse_text_and_edit_tool.png Binary files differindex 3fd90e0..1c44787 100644 --- a/source/images/Browse_text_and_edit_tool.png +++ b/source/images/Browse_text_and_edit_tool.png diff --git a/source/images/Journal_detail-annotated.png b/source/images/Journal_detail-annotated.png Binary files differindex 00952b9..c84e11c 100644 --- a/source/images/Journal_detail-annotated.png +++ b/source/images/Journal_detail-annotated.png diff --git a/source/images/Journal_main_annotated.png b/source/images/Journal_main_annotated.png Binary files differindex cb3297e..fad48f8 100644 --- a/source/images/Journal_main_annotated.png +++ b/source/images/Journal_main_annotated.png diff --git a/source/images/My_Settings.png b/source/images/My_Settings.png Binary files differindex 71e5a58..7866136 100644 --- a/source/images/My_Settings.png +++ b/source/images/My_Settings.png diff --git a/source/images/Pippy-run.png b/source/images/Pippy-run.png Binary files differindex 3f71b70..0a5c212 100644 --- a/source/images/Pippy-run.png +++ b/source/images/Pippy-run.png diff --git a/source/images/Terminal-toolbar.png b/source/images/Terminal-toolbar.png Binary files differnew file mode 100644 index 0000000..cb37d92 --- /dev/null +++ b/source/images/Terminal-toolbar.png diff --git a/source/images/Upgrade_all_your_Software-Power_button.jpg b/source/images/Upgrade_all_your_Software-Power_button.jpg Binary files differindex 5754bda..c304e5f 100644 --- a/source/images/Upgrade_all_your_Software-Power_button.jpg +++ b/source/images/Upgrade_all_your_Software-Power_button.jpg diff --git a/source/images/leftports.jpg b/source/images/leftports.jpg Binary files differindex f1bc1d5..a840aae 100644 --- a/source/images/leftports.jpg +++ b/source/images/leftports.jpg diff --git a/source/images/leftsidefeatures.jpg b/source/images/leftsidefeatures.jpg Binary files differindex 6a7cc87..fa31c7d 100644 --- a/source/images/leftsidefeatures.jpg +++ b/source/images/leftsidefeatures.jpg diff --git a/source/images/rightsidefeatures.jpg b/source/images/rightsidefeatures.jpg Binary files differindex 6118bcb..2c1e867 100644 --- a/source/images/rightsidefeatures.jpg +++ b/source/images/rightsidefeatures.jpg diff --git a/source/journal.rst b/source/journal.rst index e1b59e1..1c3f37c 100644 --- a/source/journal.rst +++ b/source/journal.rst @@ -24,18 +24,18 @@ Journal features The Journal View contains a menu and a list of journal entries: -* Favorite star: You can mark important entries by clicking on the star icon for that entry. When you click the star icon, the star is colored in. -* Entry icon: Each Journal entry has an icon. The color of the icon shows who created the entry. For example, if you copy a photo from a friend, the photo's icon has your friend's colors. You can launch the Activity for the entry by clicking on the icon. A hover menu may reveal additional options. In particular, "Erase" deletes that entry from your Journal. Caution: "Erase" deletes any data associated with the entry shown. For example, if you delete an entry that shows that you installed an Activity, you delete the Activity as well. -* Entry name: Each entry has a name. You can edit the name by clicking it. If the Journal view is showing the contents of a removable storage device, the Linux file name is shown here, with the path and the file name extension stripped off. -* Search box: Type words in the box to search for entries that match those words. Entries are displayed when they contain all of the typed words. Comparison will be against all of: the entry name field, the description field (see "Journal detail view"), and the tag field (see "Journal detail view"). Note: A small x button at the right of the box shows that searching is being applied. To cancel your search, click on that x. -* Favorites view: Only shows the entries which have been marked as favorites. -* Type filter: You can select to have the Journal only show certain types of entries, e.g. only images or only entries associated with a specific Activity. -* Date filter: Contains option to only show Journal entries modified within the past day, week, or month. -* Sorting options: You can order Journal entries by their size, creation date and modification date. -* Documents folder: To exchange files between the Journal and the underlying file system the $HOME/DOCUMENTS folderis available in the Journal. For example: If you have created an image in GIMP under GNOME and want to open it in the Paint Activity you can place it in the $HOME/DOCUMENTS folder and then can access it in the Journal. -* Buddy icons: If other participants joined you in this Activity, icons in their colors appear here. -* Elapsed time: Displays the time since the most recent change to the entry. -* Detail view: Click this button to see detailed information about the entry. See "Journal detail view", below. +* 1 - Favorite star: You can mark important entries by clicking on the star icon for that entry. When you click the star icon, the star is colored in. +* 2 - Entry icon: Each Journal entry has an icon. The color of the icon shows who created the entry. For example, if you copy a photo from a friend, the photo's icon has your friend's colors. You can launch the Activity for the entry by clicking on the icon. A hover menu may reveal additional options. In particular, "Erase" deletes that entry from your Journal. Caution: "Erase" deletes any data associated with the entry shown. For example, if you delete an entry that shows that you installed an Activity, you delete the Activity as well. +* 3 - Entry name: Each entry has a name. You can edit the name by clicking it. If the Journal view is showing the contents of a removable storage device, the Linux file name is shown here, with the path and the file name extension stripped off. +* 4 - Search box: Type words in the box to search for entries that match those words. Entries are displayed when they contain all of the typed words. Comparison will be against all of: the entry name field, the description field (see "Journal detail view"), the comments field and the tag field (see "Journal detail view"). Note: A small x button at the right of the box shows that searching is being applied. To cancel your search, click on that x. +* 5 - Favorites view: Only shows the entries which have been marked as favorites. +* 6 - Type filter: You can select to have the Journal only show certain types of entries, e.g. only images or only entries associated with a specific Activity. +* 7 - Date filter: Contains option to only show Journal entries modified within the past day, week, or month. +* 8 - Sorting options: You can order Journal entries by their size, creation date and modification date. +* 9 - Documents folder: To exchange files between the Journal and the underlying file system the $HOME/DOCUMENTS folder is available in the Journal. For example: If you have created an image in GIMP under GNOME and want to open it in the Paint Activity you can place it in the $HOME/DOCUMENTS folder and then can access it in the Journal. +* 10 - Buddy icons: If other participants joined you in this Activity, icons in their colors appear here. +* 11 - Elapsed time: Displays the time since the most recent change to the entry. +* 12 - Detail view: Click this button to see detailed information about the entry. See "Journal detail view", below. Journal Detail view ------------------- @@ -44,18 +44,19 @@ Journal Detail view The Detail view appears when you click the Detail view button for an entry. This view lets you examine and annotate the entry. -* Back Icon: You can click anywhere in this line to return to the main Journal View. -* Resume Button: You can click the Resume button to resume an Activity. A hover menu may show additional options. For example, you can resume working with an image using either the Browser or the Paint Activity. -* Copy button: You can copy a Journal entry to the clipboard (or to a removable storage device shown on the bottom edge of the Journal screen) by clicking on the Copy button. -* Duplicate button: You can duplicate a Journal entry by clicking on the Duplicate button. -* Erase button: You can erase an entry by clicking the Erase button. Caution: Once you erase an entry, it cannot be restored unless you have backed up your Journal. -* Entry name: You can change the name of the entry by clicking it and typing in a new name. -* Elapsed time: Displays the time since the most recent change to the entry. -* Favorites Icon: This icon indicates whether an entry has been starred as a favorite which can be done by clicking it. -* Thumbnail image: Each entry has a thumbnail image that is created automatically. The image show the Activity screen when the last change to the Journal entry was saved. -* Description field: You can type a description of the entry, which you can find later using the Search box. Use a description to remind you of what you did. For example: "Flowers I saw on the hike to the waterfall". Or you can reflect on your work and process: what I have done; how I have done it; and how successful these efforts have been. "This was not easy, but I learned a lot about different types of flowers in my community by speaking with my family". This is important because these description can be shown in the reflection Activity called "Portfolio". -* Tags field: You can enter search tags. Tags are keywords used to describe a journal entry so that you can find it later using the Search box. For example, if your project is for school, maybe science class, and it is a report about local flowers, you could put "science" and "flowers" as the tags. You can write as many tags as you wish. You can also use keywords to help you "group" this entry, for instance by origin or context. -* Participants: Displays the XO icons of each person who participated in a shared Activity. +* 1 - Back Icon: You can click anywhere in this line to return to the main Journal View. +* 2 - Resume Button: You can click the Resume button to resume an Activity. A hover menu may show additional options. For example, you can resume working with an image using either the Browser or the Paint Activity. +* 3 - Copy button: You can copy a Journal entry to the clipboard (or to a removable storage device shown on the bottom edge of the Journal screen) by clicking on the Copy button. +* 4 - Duplicate button: You can duplicate a Journal entry by clicking on the Duplicate button. +* 5 - Erase button: You can erase an entry by clicking the Erase button. Caution: Once you erase an entry, it cannot be restored unless you have backed up your Journal. +* 6 - Entry name: You can change the name of the entry by clicking it and typing in a new name. +* 7 - Elapsed time: Displays the time since the most recent change to the entry. +* 8 - Favorites Icon: This icon indicates whether an entry has been starred as a favorite which can be done by clicking it. +* 9 - Thumbnail image: Each entry has a thumbnail image that is created automatically. The image show the Activity screen when the last change to the Journal entry was saved. +* 10 - Participants: Displays the XO icons of each person who participated in a shared Activity. +* 11 - Comments: Comments by the joiners will be displayed here. The comments will be from Portfolio activity and from journal share. +* 12 - Tags field: You can enter search tags. Tags are keywords used to describe a journal entry so that you can find it later using the Search box. For example, if your project is for school, maybe science class, and it is a report about local flowers, you could put "science" and "flowers" as the tags. You can write as many tags as you wish. You can also use keywords to help you "group" this entry, for instance by origin or context. +* 13 - Description field: You can type a description of the entry, which you can find later using the Search box. Use a description to remind you of what you did. For example: "Flowers I saw on the hike to the waterfall". Or you can reflect on your work and process: what I have done; how I have done it; and how successful these efforts have been. "This was not easy, but I learned a lot about different types of flowers in my community by speaking with my family". This is important because these description can be shown in the reflection Activity called "Portfolio". .. image:: images/Journal_detail-view-start.png diff --git a/source/my_settings.rst b/source/my_settings.rst index bad32a1..5c3add9 100644 --- a/source/my_settings.rst +++ b/source/my_settings.rst @@ -17,11 +17,18 @@ About Me View and change your XO colors and name. -About My Computer +About my Computer ----------------- View technical information about your computer: serial number, software versions (Sugar, firmware, wireless), copyright, and license. -[edit] Date & Time + +Background +---------- + + + +Date & Time +----------- Set timezone for date and time display. @@ -45,17 +52,12 @@ Network View and change settings for turning off wireless in order to save battery power, and view or set the jabber server name for collaboration. -Power ------ - -Options for automatic power management, which extends the battery life, and for extreme power management. Note: this will stop the wireless function (the Internet) from working. - -Switch desktop --------------- - -Switch from Sugar to GNOME desktop. GNOME is one of the most popular desktop managers for Linux. Switching to GNOME enables you to use any Fedora Linux software packages that your computer's storage and memory capacity will accommodate, other than Sugar. From GNOME, you can return to Sugar by clicking the Switch to Sugar icon on the desktop, or by selecting this command from the GNOME Applications menu. - Software update --------------- If you are able, check over the Internet for software updates, and install any that are available. + +Configure your Web Services +--------------------------- + +Manage your online accounts and interventions to Journal. diff --git a/source/pippy.rst b/source/pippy.rst index ae536fc..6171008 100644 --- a/source/pippy.rst +++ b/source/pippy.rst @@ -10,12 +10,12 @@ Pippy allows the student to examine, execute, and modify simple Python programs. Where to get Pippy ------------------ -Pippy is included in the standard releases of the OLPC software. It is available for download `here <http://activities.sugarlabs.org/en-US/sugar/search?q=pippy&cat=all>`_ +Pippy is included in the standard releases of the OLPC software. It is available for download `here <http://activities.sugarlabs.org/en-US/sugar/addon/4041>`_ Using ----- -The left column is a list of python programs, which can be viewed, and modified in the upper left window, and where the results of execution are displayed in the lower right window. +The left column is a list of python programs, which can be viewed, and modified in the upper right window, and where the results of execution are displayed in the lower right window. .. image :: images/Pippy-run.png diff --git a/source/ports.rst b/source/ports.rst index 1ca773e..1e53a3c 100644 --- a/source/ports.rst +++ b/source/ports.rst @@ -5,7 +5,7 @@ Physical Features Features and Ports ------------------ -The XO laptop has many built-in features. These include a camera, microphone, speakers and wireless antennae. In addition, the laptop allows for the attachment of other external devices. This is often done by plugging the devices into connectors (some are more commonly referred to as ports, jacks or slots). +The XO laptop has many built-in features. These include a camera, microphone, speakers and wireless antenna. In addition, the laptop allows for the attachment of other external devices. This is often done by plugging the devices into connectors (some are more commonly referred to as ports, jacks or slots). Backlit screen -------------- @@ -13,6 +13,7 @@ Backlit screen The display functions in a full-color mode similar to other laptop displays and in an ultra-low-power, ultra-high-resolution, black-and-white mode that is readable in direct sunlight. .. image:: images/leftsidefeatures.jpg +.. image:: images/rightsidefeatures.jpg 1, 2 - Built-in microphone :::::::::::::::::::::::::: @@ -34,8 +35,6 @@ Two sets of four-direction cursor-control keys can be game controllers. Since th A button on the XO laptop’s display frame changes the orientation of the screen, so it can be viewed right-side-up from any direction. -.. image:: images/rightsidefeatures.jpg - 6, 7 - Built-in camera :::::::::::::::::::::: @@ -49,28 +48,28 @@ The game buttons can be used when the screen is folded down into e-book mode, cr 10 - Power button, indicator :::::::::::::::::::::::::::: -From left to right: the battery-level indicator; the power indicator; and the power button. Ports +From left to right: the battery-level indicator; the power indicator; and the power button. Along with offering unique connectivity options, the XO laptop can work with a wide range of external devices. .. image:: images/leftports.jpg -Antennae ears +11 - Antennae ears ::::::::::::: When the wireless antennae "ears" are rotated up, they provide the XO with a connection range vastly superior to those of conventional laptops. When down, they keep dirt out of the connectors and act as a latch. -External headphones and microphone jacks +12, 13 - External headphones and microphone jacks :::::::::::::::::::::::::::::::::::::::: Along with built-in speakers and microphone, the XO laptop features jacks for external headphones and an external microphone. -USB/memory ports +14 - USB/memory ports :::::::::::::::: The XO laptop features three external USB ports to support a variety of plug-in peripherals (one seen in the photo above, and two others under the other "ear"). Right side ports + battery -Power jack +15 - Power jack :::::::::: The XO comes with a power cord that can be plugged into any 110-to-240-volt AC outlet for charging. The power jack also accepts DC power from a solar panel for charging the XO laptop’s battery. diff --git a/source/starting_the_xo.rst b/source/starting_the_xo.rst index 75cddc2..a5f770e 100644 --- a/source/starting_the_xo.rst +++ b/source/starting_the_xo.rst @@ -16,7 +16,7 @@ If you have difficulty starting your XO, refer to the Repairing chapter for idea Starting for the first time --------------------------- -After you press the power button and the XO initially starts up, the XO sceen asks for your first name. The next time you start it, it remembers your name and goes directly to the Home View. Later on you can learn how to change to a nick name of your choosing. +After you press the power button and the XO initially starts up, the XO screen asks for your first name. The next time you start it, it remembers your name and goes directly to the Home View. Later on you can learn how to change to a nick name of your choosing. - Type your name. @@ -51,7 +51,7 @@ TODO: < we need a screen shot of the stop sign image > Forced Shutdown --------------- -Whenever the XO becoumes unresponsive to the keyboard or the touchscreen, you can make an emergency shutdown by pressing and holding the power button for a few seconds. Be careful that your power button does not get "stuck" in the down position. If it does get stuck, the XO does not detect the depression of the power button, and does not turn on. If this happens, refer to the Repairing chapter for information. +Whenever the XO becomes unresponsive to the keyboard or to the touchscreen, you can make an emergency shutdown by pressing and holding the power button for a few seconds. Be careful that your power button does not get "stuck" in the down position. If it does get stuck, the XO does not detect the depression of the power button, and does not turn on. If this happens, refer to the Repairing chapter for information. :author: diff --git a/source/switching_activities.rst b/source/switching_activities.rst index 0c3dccc..962116b 100644 --- a/source/switching_activities.rst +++ b/source/switching_activities.rst @@ -10,11 +10,11 @@ You can switch between Activities in two ways: .. image :: images/800px-Screenshot_of_Home_for_switching_screens.png -pressing again +pressing alt + tab again .. image :: images/800px-Screenshot_of_TurtleArt_window_switchingscreens.png -pressing again +pressing alt + tab again .. image :: images/800px-Screenshot_of_Maze_Activity_Switching_Screens.png diff --git a/source/terminal.rst b/source/terminal.rst index 175d24d..afa1cd1 100644 --- a/source/terminal.rst +++ b/source/terminal.rst @@ -7,14 +7,14 @@ About Terminal is a full-screen text mode program that provides a Command-Line Interface (CLI) to the software on a Linux system, such as the Fedora Linux that Sugar on the XO is based on. Users type (sometimes cryptic) commands to perform file management, system administration, or in fact almost anything that can be done within Linux that does not involve graphics or video. -For example, typing **pwd** (Print name of current/Working Directory) at the command line in the home directory gives that location as /home/olpc, and typing **ls** at the command line in /home/olpc in a fresh installation of Sugar 0.94.1 in English results in this listing of its contents. +For example, typing **pwd** (Print name of current/Working Directory) at the command line in the home directory gives that location as /home/olpc, and typing **ls** at the command line lists the content of the current directory. Where to get Terminal --------------------- Terminal is provided with Sugar on every XO. However, by default it is not selected for display in the Home view as a Favorite. -* To select Terminal as a Favorite, go to Home view, then click the List view icon. Type Te into the search box. Click the star next to Terminal. When you switch back to the ring of icons in Home view, Terminal will be visible. +* To select Terminal as a Favorite, go to Home view, then click the List view icon. Type **Te** into the search box. Click the star next to Terminal. When you switch back to the ring of icons in Home view, Terminal will be visible. * Alternatively, you can leave Terminal unselected, and start it from list view by clicking its icon or selecting Start from its hover menu. @@ -25,7 +25,7 @@ Using * Type commands with options that modify their effects and arguments, usually file names or other indications of where to get input and where to put output. -Examples: pwd and ls, as shown above +Examples: **pwd** and **ls**, as shown above * Chain programs together, so that the following program processes the output of the earlier program. @@ -33,9 +33,9 @@ Examples: pwd and ls, as shown above ls | grep "Sugar" -Get a listing of the current directory, but show only lines where the file or directory name includes the text "Sugar". The | symbol, read pipe, represents the data link between the programs. +Get a listing of the current directory, but show only lines where the file or directory name includes the text "Sugar". The **|** symbol, read pipe, represents the data link between the programs. -* Get information on programs. For example, many commands respond to the -h or --help options with a concise summary. +* Get information on programs. For example, many commands respond to the **-h** or **--help** options with a concise summary. :: @@ -43,16 +43,20 @@ Get a listing of the current directory, but show only lines where the file or di Usage: grep [OPTION]... PATTERN [FILE]... Try `grep --help' for more information. -The man and info utilities are unfortunately not available on XOs, but will undoubtedly be included in Sugar whenever the XO of that time is capacious enough for all of the manual and information pages in all of the supported languages. +The **man** and **info** utilities are unfortunately not available on XOs, but will undoubtedly be included in Sugar whenever the XO of that time is capacious enough for all of the manual and information pages in all of the supported languages. -The Toolbars +The Toolbar ------------ -* Activity: Name this session, Exit -* Edit (scissors icon) Copy and Paste -* View (eye icon) Increase or Decrease font size; Full Screen -* Tabs: Open new tab; Close current tab; Next tab; Previous tab +.. image :: images/Terminal-toolbar.png + +* Activity: Name this session and add a description to Journal +* Edit (scissors icon): Copy and Paste +* View (eye icon): Increase or Decrease font size, view in full screen +* Help: Display useful commands +* Stop: Close terminal activity +* Tabs: Open and close tabs Learning with Terminal ---------------------- diff --git a/source/upgrade_all.rst b/source/upgrade_all.rst index c49b93e..1c26e21 100644 --- a/source/upgrade_all.rst +++ b/source/upgrade_all.rst @@ -16,16 +16,24 @@ Clear instructions on how to to change, upgrade, downgrade, or replace your XO's Decide whether you want to do a clean install (Installation) which will completely reformat your XO with files from a USB drive, or an online or offline update which will update the current software without erasing the existing Journal. Follow the instruction for the update method chosen. -A clean install uses a USB stick and the "four button procedure" to begin the update. Warning Reminder: This method re-formats your XO and EVERYTHING on your XO will be deleted if you use this method. You will follow the instructions in the Release Notes for the build chosen, and you will need A USB storage device that has at least 1 GB of space free and a computer with Internet access that will allow you to download the required 300-400MB within about an hour). +A clean install uses a USB stick and the "four button procedure" to begin the update. Warning Reminder: This method re-formats your XO and EVERYTHING on your XO will be deleted if you use this method. You will follow the instructions in the Release Notes for the build chosen, and you will need A USB storage device that has at least 1 GB of space free and a computer with Internet access that will allow you to download the required 300-400MB within about an hour. -* Connect your XO to their charger. +.. image :: images/Upgrade_all_your_Software-Power_button.jpg + +* 1 - Battery indicator +* 2 - Power indicator +* 3 - Power button +* 4 - Game buttons + +.. +Follow these steps to upgrade your XO + +* Connect your XO to its charger. * Turn off your XO. * Connect your prepared USB storage device to your XO. -.. image :: images/Upgrade_all_your_Software-Power_button.jpg - * Next, hold down all four gamepad keys above the power button, and then push the power button to turn the XO on. You will see a message that tells you to "Release the game key to continue". Do not continue until you see this message. * Release the gamepad keys. The reflash process runs automatically; first you will see the XO arrange and color in a grid of boxes, then the XO will display "Rebooting in 10 seconds..." |
