Fossil SCM
More documentation clarifications.
Commit
7879c250fb79c6c383751b7ac68cbe672afa09ab
Parent
3c1234c0f25af3a…
1 file changed
+6
-5
+6
-5
| --- www/concepts.wiki | ||
| +++ www/concepts.wiki | ||
| @@ -251,21 +251,21 @@ | ||
| 251 | 251 | to start a new project, or the <b>clone</b> command to make a clone |
| 252 | 252 | of a repository for an existing project. |
| 253 | 253 | </li> |
| 254 | 254 | |
| 255 | 255 | <li> |
| 256 | -Establish one or more source trees by changing your working directory | |
| 257 | -to where you want the root of the source tree to be, then issuing | |
| 256 | +Establish one or more source trees using | |
| 258 | 257 | the <b>open</b> command with the name of the repository file as its |
| 259 | 258 | argument. |
| 260 | 259 | </li> |
| 261 | 260 | |
| 262 | 261 | <li> |
| 263 | 262 | The <b>open</b> command in the previous step populates your local source |
| 264 | 263 | tree with a copy of the latest check-in. Usually this is what you want. |
| 265 | 264 | In the rare cases where it is not, use the <b>update</b> command to |
| 266 | -switch to a new check-in. Use the <b>timeline</b> or <b>leaves</b> commands | |
| 265 | +switch to a different check-in. | |
| 266 | +Use the <b>timeline</b> or <b>leaves</b> commands | |
| 267 | 267 | to identify alternative check-ins to switch to. |
| 268 | 268 | </li> |
| 269 | 269 | |
| 270 | 270 | <li> |
| 271 | 271 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -326,11 +326,12 @@ | ||
| 326 | 326 | |
| 327 | 327 | <li> |
| 328 | 328 | The <b>open</b> command in the previous step populates your local source |
| 329 | 329 | tree with a copy of the latest check-in. Usually this is what you want. |
| 330 | 330 | In the rare cases where it is not, use the <b>update</b> command to |
| 331 | -switch to a new check-in. Use the <b>timeline</b> or <b>leaves</b> commands | |
| 331 | +switch to a different check-in. | |
| 332 | +Use the <b>timeline</b> or <b>leaves</b> commands | |
| 332 | 333 | to identify alternative check-ins to switch to. |
| 333 | 334 | </li> |
| 334 | 335 | |
| 335 | 336 | <li> |
| 336 | 337 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -365,11 +366,11 @@ | ||
| 365 | 366 | or are not to your liking, you can back out the changes using the |
| 366 | 367 | <b>undo</b> command. |
| 367 | 368 | </li> |
| 368 | 369 | |
| 369 | 370 | <li> |
| 370 | -If two or more people ran "commit" against the same baseline, this will | |
| 371 | +If two or more people ran "commit" against the same check-in, this will | |
| 371 | 372 | result in a [./branching.wiki | fork] which you may want to resolve by |
| 372 | 373 | running <b>merge</b> followed by another <b>commit</b>. |
| 373 | 374 | </li> |
| 374 | 375 | |
| 375 | 376 | <li> |
| 376 | 377 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -251,21 +251,21 @@ | |
| 251 | to start a new project, or the <b>clone</b> command to make a clone |
| 252 | of a repository for an existing project. |
| 253 | </li> |
| 254 | |
| 255 | <li> |
| 256 | Establish one or more source trees by changing your working directory |
| 257 | to where you want the root of the source tree to be, then issuing |
| 258 | the <b>open</b> command with the name of the repository file as its |
| 259 | argument. |
| 260 | </li> |
| 261 | |
| 262 | <li> |
| 263 | The <b>open</b> command in the previous step populates your local source |
| 264 | tree with a copy of the latest check-in. Usually this is what you want. |
| 265 | In the rare cases where it is not, use the <b>update</b> command to |
| 266 | switch to a new check-in. Use the <b>timeline</b> or <b>leaves</b> commands |
| 267 | to identify alternative check-ins to switch to. |
| 268 | </li> |
| 269 | |
| 270 | <li> |
| 271 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -326,11 +326,12 @@ | |
| 326 | |
| 327 | <li> |
| 328 | The <b>open</b> command in the previous step populates your local source |
| 329 | tree with a copy of the latest check-in. Usually this is what you want. |
| 330 | In the rare cases where it is not, use the <b>update</b> command to |
| 331 | switch to a new check-in. Use the <b>timeline</b> or <b>leaves</b> commands |
| 332 | to identify alternative check-ins to switch to. |
| 333 | </li> |
| 334 | |
| 335 | <li> |
| 336 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -365,11 +366,11 @@ | |
| 365 | or are not to your liking, you can back out the changes using the |
| 366 | <b>undo</b> command. |
| 367 | </li> |
| 368 | |
| 369 | <li> |
| 370 | If two or more people ran "commit" against the same baseline, this will |
| 371 | result in a [./branching.wiki | fork] which you may want to resolve by |
| 372 | running <b>merge</b> followed by another <b>commit</b>. |
| 373 | </li> |
| 374 | |
| 375 | <li> |
| 376 |
| --- www/concepts.wiki | |
| +++ www/concepts.wiki | |
| @@ -251,21 +251,21 @@ | |
| 251 | to start a new project, or the <b>clone</b> command to make a clone |
| 252 | of a repository for an existing project. |
| 253 | </li> |
| 254 | |
| 255 | <li> |
| 256 | Establish one or more source trees using |
| 257 | the <b>open</b> command with the name of the repository file as its |
| 258 | argument. |
| 259 | </li> |
| 260 | |
| 261 | <li> |
| 262 | The <b>open</b> command in the previous step populates your local source |
| 263 | tree with a copy of the latest check-in. Usually this is what you want. |
| 264 | In the rare cases where it is not, use the <b>update</b> command to |
| 265 | switch to a different check-in. |
| 266 | Use the <b>timeline</b> or <b>leaves</b> commands |
| 267 | to identify alternative check-ins to switch to. |
| 268 | </li> |
| 269 | |
| 270 | <li> |
| 271 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -326,11 +326,12 @@ | |
| 326 | |
| 327 | <li> |
| 328 | The <b>open</b> command in the previous step populates your local source |
| 329 | tree with a copy of the latest check-in. Usually this is what you want. |
| 330 | In the rare cases where it is not, use the <b>update</b> command to |
| 331 | switch to a different check-in. |
| 332 | Use the <b>timeline</b> or <b>leaves</b> commands |
| 333 | to identify alternative check-ins to switch to. |
| 334 | </li> |
| 335 | |
| 336 | <li> |
| 337 | Edit the code. Add new files to the source tree using the <b>add</b> |
| @@ -365,11 +366,11 @@ | |
| 366 | or are not to your liking, you can back out the changes using the |
| 367 | <b>undo</b> command. |
| 368 | </li> |
| 369 | |
| 370 | <li> |
| 371 | If two or more people ran "commit" against the same check-in, this will |
| 372 | result in a [./branching.wiki | fork] which you may want to resolve by |
| 373 | running <b>merge</b> followed by another <b>commit</b>. |
| 374 | </li> |
| 375 | |
| 376 | <li> |
| 377 |