[rkward-cvs] [rkward] rkward/pages: Fix typos

[Yuri Chornoivan]

Git commit b71606db7335edca349d2a2184427b5d3b327224 by Yuri Chornoivan.
Committed on 14/12/2014 at 13:06.
Pushed by yurchor into branch 'master'.

Fix typos

M  +5    -5    rkward/pages/rkward_console.rkh
M  +3    -3    rkward/pages/rkward_for_new_users.rkh
M  +3    -3    rkward/pages/rkward_for_r_users.rkh

http://commits.kde.org/rkward/b71606db7335edca349d2a2184427b5d3b327224

diff --git a/rkward/pages/rkward_console.rkh b/rkward/pages/rkward_console.rkh
index 92d7ce2..523bc5e 100644
--- a/rkward/pages/rkward_console.rkh
+++ b/rkward/pages/rkward_console.rkh
@@ -16,15 +16,15 @@ Many console features are available from the context menu. To invoke the context
 	</section>
 
 	<section id="interrupt" title="Interrupting commands">
-To interrupt a running command, press Ctrl+C, or chose "Interrupt running command" from the context menu. Note that the command will not necessarily end immediately. If there are several other commands running at the same time (e.g. some action you invoked from the Analysis menu), the console will only become available again, when the R backend becomes idle.
+To interrupt a running command, press Ctrl+C, or choose "Interrupt running command" from the context menu. Note that the command will not necessarily end immediately. If there are several other commands running at the same time (e.g. some action you invoked from the Analysis menu), the console will only become available again, when the R backend becomes idle.
 	</section>
 
 	<section id="running_selection" title="Re-running selected commands">
-To re-run (a sequence of) selected commands, select them using the mouse. Then chose "Run selection" from the context menu (default shortcut is Ctrl+Return). Leading "> " and "+ " on the selected lines will be removed automatically.
+To re-run (a sequence of) selected commands, select them using the mouse. Then choose "Run selection" from the context menu (default shortcut is Ctrl+Return). Leading "> " and "+ " on the selected lines will be removed automatically.
 	</section>
 
 	<section id="copy" title="Copying commands / output">
-There are two copy modes available from the context menu (or the Edit menu). One allows you to copy the selection literally, i.e. including the prompts "> " and "+ ". In contrast, "Copy selection cleaned" will remove the prompts from the text copied into the clipboard.
+There are two copy modes available from the context menu (or the Edit menu). One allows you to copy the selection literally, i.e. including the prompts "> " and "+ ". In contrast, "Copy commands, only" will remove the prompts from the text copied into the clipboard.
 
 Note that the customary shortcut for copying text - Ctrl+C - does NOT work in the console, as Ctrl+C already means interrupting the current command.
 	</section>
@@ -58,8 +58,8 @@ To configure the behavior of the console, select "Configure" from the context me
 
 <ul>
 	<li><b>Load/save command history</b>: Whether the <link href="#command_history">command history</link> is saved when closing RKWard, and reloaded when next starting RKWard again. If this is not checked, each session of RKWard will start out with an empty command history.</li>
-	<li><b>Maximum length command history</b>: Only this many lines are kept in the <link href="#command_history">command history</link>.</li>
-	<li><b>Maximum number of paragraphs/lines to display in the console</b>: No more than this many total lines (commands and output) will be shown in the console. When this number of lines is exceeded, lines will be removed at the top of the console window. To clear the console entirely, chose "Clear" from the context menu or the Edit menu.</li>
+	<li><b>Maximum length of command history</b>: Only this many lines are kept in the <link href="#command_history">command history</link>.</li>
+	<li><b>Maximum number of paragraphs/lines to display in the console</b>: No more than this many total lines (commands and output) will be shown in the console. When this number of lines is exceeded, lines will be removed at the top of the console window. To clear the console entirely, choose "Clear" from the context menu or the Edit menu.</li>
 	<li><b>Run commands from script editor through the console</b>: Commands coming from script editors may be sent through the console, i.e. the commands and their results will be shown in the console. If this option is not checked, the commands will only be visible in the Command log, but not in the console.</li>
 	<li><b>Also add those commands to console history</b>: If the above option is checked, this affects, whether such commands are also added to the console history. Turning off this option may help to keep the console history "clean".</li>
 	<li><b>Command history is context sensitive by default</b>: If this is checked, the context sensitive mode of navigating the <link href="#command_history">command history</link> is the default, i.e. available with Up/Down without Shift. Else the key binding for this is Shift+Up/Down.</li>
diff --git a/rkward/pages/rkward_for_new_users.rkh b/rkward/pages/rkward_for_new_users.rkh
index 8342573..ed4f74d 100644
--- a/rkward/pages/rkward_for_new_users.rkh
+++ b/rkward/pages/rkward_for_new_users.rkh
@@ -13,7 +13,7 @@ R - and hence RKWard - can deal with a large number of different types of data:
 
 At the same time, R is not confined to working with just one piece of data at a time, but rather you have a "Workspace", where all your different variables, tables, etc. are accessible. You can have many data.frames at once, and additional data of other types. At the left side of the application window, there should be an icon labelled "Workspace". You can click on this to see all the objects present in your workspace. All the objects you create or modify will be visible inside the ".GlobalEnv". Most other objects are predefined in libraries, such as "package:base". See <link href="rkward://page/rkward_workspace_browser"/> for details.
 
-You do not need to worry about all these details. To create a new spreadsheet (data.frame), chose File->New->Dataset from the menu. All you need to do is to assign a name to this table, then you can start editing. To work with pre-existing data, pick the appropriate option from the File->Import menu.
+You do not need to worry about all these details. To create a new spreadsheet (data.frame), choose File->New->Dataset from the menu. All you need to do is to assign a name to this table, then you can start editing. To work with pre-existing data, pick the appropriate option from the File->Import menu.
 	</section>
 	<section id="use_output_external" title="How can I make use of my results in an external application?">
 In this section you will learn about some basic methods how to make use of your results in external applications.
@@ -23,9 +23,9 @@ Suppose you produced a textual output from tests you performed. Such will be pre
 See <link href="rkward://page/rkward_output"/> for details on working with the output. The easiest method of reusing the output is to select the relevant portion, and copy and paste them to an office suite.
 	</section>
 	<section id="basic_stats" title="Basic Analyses">
-In order to familiarize yourself with RKWard (or with your data), one of the first things to do might be to chose Analysis->Descriptive Statistics from the Menu. You will be presented with a dialog that allows you to select one or more variables to analyse. This looks similar to the workspace browser introduced above. On the additional tabs you can choose which types of descriptive statistics should be calculated.
+In order to familiarize yourself with RKWard (or with your data), one of the first things to do might be to choose Analysis->Descriptive Statistics from the Menu. You will be presented with a dialog that allows you to select one or more variables to analyse. This looks similar to the workspace browser introduced above. On the additional tabs you can choose which types of descriptive statistics should be calculated.
 
-At the lower right of the dialog, there is a button labelled "Code". Using this, you can show/hide a text area. If you look at the contents of this text area (you may have to resize the window to view it more comfortably), you can see the text changing according to the settings you chose in the dialog. This text is actually R syntax. It is the code that is needed to perform these calculations in R. Most of RKWard is based on generating this code for you, and then running it inside R. Later, when you feel more comfortable, have specific needs not covered by RKWard, or you want to automate repetitive tasks, you can use this syntax to literally program your analyses. Note that the code is divided into up to three sections: "Preprocess" for loading required libraries or defining helper functions, "Calculate" to perform the actual calculations, and "Printout" to generate output in RKWard's output window.
+At the lower right of the dialog, there is a button labelled "Code". Using this, you can show/hide a text area. If you look at the contents of this text area (you may have to resize the window to view it more comfortably), you can see the text changing according to the settings you choose in the dialog. This text is actually R syntax. It is the code that is needed to perform these calculations in R. Most of RKWard is based on generating this code for you, and then running it inside R. Later, when you feel more comfortable, have specific needs not covered by RKWard, or you want to automate repetitive tasks, you can use this syntax to literally program your analyses. Note that the code is divided into up to three sections: "Preprocess" for loading required libraries or defining helper functions, "Calculate" to perform the actual calculations, and "Printout" to generate output in RKWard's output window.
 
 For now, just click submit, once you've made your choices, and watch the results show up in a new window.
 	</section>
diff --git a/rkward/pages/rkward_for_r_users.rkh b/rkward/pages/rkward_for_r_users.rkh
index 4b07603..2e791f5 100644
--- a/rkward/pages/rkward_for_r_users.rkh
+++ b/rkward/pages/rkward_for_r_users.rkh
@@ -19,11 +19,11 @@
 	See <link href="rkward://page/rkward_console"/> for more details.
 	</section>
 	<section title="Script Editors" id="script_editor">
-	Often it is more convenient to write scripts in a separate file, instead of typing them directly in the console. To open a new script editor (with syntax highlighting, and many more features), chose File->New->Script File, or open an already existing Script file using File->Open R Script File.
+	Often it is more convenient to write scripts in a separate file, instead of typing them directly in the console. To open a new script editor (with syntax highlighting, and many more features), choose File->New->Script File, or open an already existing Script file using File->Open R Script File.
 
 	You will note that the editor opens in a new window in the main workplace (the area of the window, that you are most likely reading this text, in). You can open any number of script editor windows at the same time.
 
-	To run the code in a script editor window, either copy and paste it to the console, or chose one of the actions in the Run menu. such as Run All or Run Selection. Note: The contents of the menus may change according to the type of active window. Hence, if you look at the Run menu while reading this, there will be no entries.
+	To run the code in a script editor window, either copy and paste it to the console, or choose one of the actions in the Run menu. such as Run All or Run Selection. Note: The contents of the menus may change according to the type of active window. Hence, if you look at the Run menu while reading this, there will be no entries.
 	</section>
 	<section title="Workspace View" id="workspace_browser">
 	RKWard comes with a "workspace view" or "object browser". By default this is available by clicking on "Workspace" on the left side of the application window. This allows you to examine and manipulate all objects in the R workspace. By default, only the ".GlobalEnv" environment	is shown (where you'll typically do your work; see <link href="rkward://rhelp/.GlobalEnv"/>). But, checking "Show All Environments", you can easily explore data and functions in loaded R libraries (and even in package namespaces).
@@ -44,7 +44,7 @@
 	Tool windows (e.g. the R Console) can be detached and re-attached using the arrow-icon in their window border.
 	</section>
 	<section title="Editing data" id="editing_data">
-	RKWard provides a built-in editor for data.frames. In fact, you can edit many data.frames at the same time, and even while running lengthy calculations. Still the data is stored as a regular data.frame in R. To explore the data editor, either chose File->New->Dataset, or right click a data.frame in the Workspace browser, and chose Edit from the menu.
+	RKWard provides a built-in editor for data.frames. In fact, you can edit many data.frames at the same time, and even while running lengthy calculations. Still the data is stored as a regular data.frame in R. To explore the data editor, either choose File->New->Dataset, or right click a data.frame in the Workspace browser, and choose Edit from the menu.
 
 	Support for adding other types of data, esp. single vectors is planned, but not currently supported.
 	</section>