Changes between Version 24 and Version 25 of OurTutorial

Timestamp:

Apr 13, 2025, 4:20:35 PM (4 weeks ago)

Author:

jac

Comment:

Wording

OurTutorial

@@ -1 +1 @@
 == What is what ==
 
-SVN = Subversion = manager for file repositories with full change history.
+SVN = Subversion = a manager for file repositories with full change history.
 
 Trac = a web application that includes a wiki, SVN view, and tickets.
 
-Ticket = submitted bug or idea, e.g. jhusak submitted ticket:1 for putting ASMA in the SVN, and pfusik did it.
+Ticket = submitted bug or idea. For example jhusak submitted ticket:1 for putting ASMA in the SVN, and pfusik did it.
 
 == Language ==
 
-Make sure Trac interface is in English. Polish translation is incomplete.
+Ensure the Trac interface is in English. The Polish translation is incomplete.
 
-On the top, click Preferences, Language, English (United States), and save your changes.
+Click Preferences, Language, English (United States) on the top, and save your changes.
 
 == Trac navigation ==
@@ -29 +29 @@
 == SVN Basics ==
 
-SVN (subversion) is a version control system. In such systems, nothing is ever lost, the history of changes is always available with the author, and you can always revert to a previous version and fix any problem (see below).
+SVN (subversion) is a version control system. In such systems, nothing is ever lost. The history of changes is always available with the author, and you can always revert to a previous version and fix any problem (see below).
 
 As you can see in the Browse Source tab, there are three top directories in SVN:
@@ -36 +36 @@
  * trunk - it's the main workspace. You can browse it from Trac, but it's much more comfortable to have a copy on your disk (see below)
 
-Every update to SVN is registered in its history - which you see in Timeline. A write is a "changeset". A changeset has the following attributes:
+Every update to SVN is registered in its history, which you see in Timeline. A write is a "changeset". A changeset has the following attributes:
  * ordinal number
  * author's login
@@ -54 +54 @@
 == Getting a local copy of SVN ==
 
-Create an ordinary empty directory on your disk containing your SVN copy. Let's say it's called asma-trunk (use any name and location you like). Enter this directory in Windows Explorer, click the empty space, and select TortoiseSVN / Checkout. In the URL of the repository, paste:
+First, create an empty directory on your disk containing your SVN copy. Let's say it's called asma-trunk (use any name and location you like). Enter this directory in Windows Explorer, click the empty space, and select TortoiseSVN / Checkout. In the URL of the repository, paste:
 {{{svn://asma.scene.pl/asma/trunk}}}
 Make sure that the checkout directory is exactly your empty directory. Click OK and wait for the download.
 
-The downloaded files are regular files - you can play and edit them. However, deleting, renaming, and moving must be done in a special way described below).
+The downloaded files are regular files. You can play and edit them. However, deleting, renaming, and moving must be done in a special way described below).
 
 == Basic SVN commands ==
 
-Right-click on your directory gives you the following commands:
+Right-clicking on your directory gives you the following commands:
  * SVN Update - download new changes if someone made them
  * SVN Show Log - history (like Trac's Timeline, but limited to SVN changes)
- * SVN Commit - upload your local changes; this may block if someone made changes to the same file as you - in this case do SVN Update and resolve the conflicts (more info on demand: '''pfusik''')
+ * SVN Commit - upload your local changes; this may block if someone made changes to the same file as you - in this case, do SVN Update and resolve the conflicts (more info on demand: '''pfusik''')
  * SVN Revert - reverts your local changes, replacing the files with their SVN version '''(cannot be undone, use with care!)'''
 
@@ -72 +72 @@
 == Making changes ==
 
-The easiest change is modifying a file that is already in SVN. Modify the file as you normally do - e.g. edit text files in the notepad. Next, choose SVN Commit - it will display the list of modified files. Enter the change description in the top edit box (the description is important so it's easier to browse the history), and accept. Enter your SVN login and password. Our changes are sent to the server and are available for the others who need to do SVN updates.
+The easiest change is to modify a file that is already in SVN. Modify the file as you normally do, e.g., edit text files in Notepad. Next, choose SVN Commit. It will display the list of modified files. Enter the change description in the top edit box (the description is essential so it's easier to browse the history), and accept. Enter your SVN login and password. Our changes are sent to the server and are available for the others who need to do SVN updates.
 
-To add a file, put it in the directory, right-click it, and select TortoiseSVN / Add. The file won't be sent to the server until you select SVN Commit, as described above.
+To add a file, put it in the directory, right-click it, and select "TortoiseSVN / Add". The file will be sent to the server only after you select "SVN Commit", as described above.
 
-To delete a file '''don't just delete it'''. Instead, TortoiseSVN / Delete, then SVN Commit.
+To delete a file '''don't just delete it'''. Instead use "TortoiseSVN / Delete", then "SVN Commit".
 
 To rename a file, TortoiseSVN / Rename, then SVN Commit.
 
-To copy or move a file, drag it '''with the right button''' - a menu will appear with options to SVN Move or Copy versioned items and optionally rename. '''Make sure to use SVN commands, not plain Windows move/copy! ''' Then SVN Commit.
+To copy or move a file, drag it '''with the right mouse-button''' - a menu will appear with options to SVN Move or Copy versioned items and optionally rename. '''Make sure to use SVN commands, not plain Windows move/copy! ''' Then SVN Commit.
 
 Only SVN Commit sends your changes to the server. The other operations work locally on your computer.
 
-I think that's enough for the beginning. Any questions?
-
 == Viewing changes ==
 
-Install TortoiseSvnDiff. It is optional but strongly recommended.
+Install the [wiki:TortoiseSvnDiff]. It is optional but strongly recommended.