Skip to content

Commit 41d88f1

Browse files
committed
fixing copy edits
1 parent c52907e commit 41d88f1

8 files changed

+44
-40
lines changed

mac/create-and-edit-configurations.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,31 @@ ms.topic: article
88
ms.assetid: CC1B72D6-12FF-4CCC-A9D4-00F2DC14589F
99
---
1010

11-
# Creating and Editing Build Configurations
11+
# Creating and editing build configurations
1212

13-
Build Configurations can be create for individual projects or on a solution wide basis. These configurations will give you precise control over your build.
13+
Build configurations can be created for individual projects or on a solution-wide basis. These configurations will give you precise control over a build.
1414

1515
The options menu for both projects and solutions provide you with an area to create and edit new and existing configurations.
1616

17-
## Creating a Project Build Configurations
17+
## Creating a project build configurations
18+
19+
To create a project build configuration, take the following steps:
1820

1921
1. Right-click on the project node and select **Options**.
2022

2123
2. In the Project Options dialog, select **Build > Configurations**:
2224

2325
![Configurations manager in project options](media/create-and-edit-configurations-image2.png)
2426

25-
3. To create a new configuration select **Add**. Alternatively, you can copy one of the existing configurations.
27+
3. To create a new configuration, select **Add**. Alternatively, you can copy one of the existing configurations.
2628

2729
Once the configuration has been created, you can use the **Build** section in the Project Options to adapt properties appropriate to your configuration:
2830

2931
![Configure build options](media/create-and-edit-configurations-image3.png)
3032

31-
## Creating a Solutions Build Configurations
33+
## Creating a solution build configuration
34+
35+
To create a solution build configuration, take the following steps:
3236

3337

3438
1. Right-click on the Solution node and select **Options**.
@@ -37,13 +41,13 @@ Once the configuration has been created, you can use the **Build** section in th
3741

3842
![Configurations manager in solution options](media/create-and-edit-configurations-image1.png)
3943

40-
3. To create a new configuration select **Add**. Alternatively, you can copy one of the existing configurations.
44+
3. To create a new configuration, select **Add**. Alternatively, you can copy one of the existing configurations.
4145

4246
Once the configuration has been created, you can use the **Build** section in each project's options to adapt properties appropriate to your configuration:
4347

4448
![Configure build options](media/create-and-edit-configurations-image3.png)
4549

46-
## Editing a Build Configuration
50+
## Editing a build configuration
4751

4852
To rename a configuration, select it from the Configuration list in the Project or Solution Options:
4953

mac/report-a-problem.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.topic: article
77
ms.assetid: 1C7AC52E-754E-473F-A5B5-00C3A40DAACD
88
---
99

10-
# How to Report a Problem in Visual Studio for Mac
10+
# How to report a problem in Visual Studio for Mac
1111

1212
If you encounter a problem with Visual Studio for Mac, we want to know about it so that we can diagnose and fix it.
1313

@@ -17,7 +17,7 @@ To report a problem with Visual Studio for Mac, use the **Report a Problem** lin
1717

1818
![report a problem link](media/report-problem-image1.png)
1919

20-
This displays the **Report a Problem** web page. You can use this page to view all existing problems, vote on similar problems, and submit solutions to other peoples problems:
20+
This displays the **Report a Problem** web page. You can use this page to view all existing problems, vote on similar problems, and submit solutions to problems reported by other people:
2121

2222
![report a problem webpage](media/report-problem-image2.png)
2323

@@ -27,10 +27,10 @@ If you haven't already logged in to the Developer Community application, you'll
2727

2828
![report a problem webpage](media/report-problem-image3.png)
2929

30-
Give a descriptive title for the issue along with any additional information about that issue that you feel may be useful. When possible, please provide us with reproduction steps as this allows us to understand and fix your issue as quickly as possible.
30+
Give a descriptive title for the issue along with any additional information about that issue that you feel might be useful. When possible, please provide us with reproduction steps as this allows us to understand and fix your issue as quickly as possible.
3131

3232
![report a problem webpage](media/report-problem-image4.png)
3333

34-
## Provide a Suggestion
34+
## Provide a suggestion
3535

3636
Use the **Provide a Suggestion** link on the welcome page to direct you to Visual Studio for Mac's UserVoice page. From here you can add new requests or vote on existing requests.

mac/set-up-git-repository.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ ms.topic: article
88
ms.assetid: E992FA1D-B2AD-4A28-ADC6-47E4FC471060
99
---
1010

11-
# Setting Up a Git Repository
11+
# Setting up a Git repository
1212

1313
Git is a distributed version control system that allows teams to work on the same documents simultaneously. This means that there is a single server that contains all the files, but whenever a repository is checked out from this central source, the entire repository is cloned locally to your machine.
1414

1515
There are many remote hosts that allow you to work with Git for version control, however the most common of these is GitHub. The example below uses a GitHub host, but you can use any Git host for version control in Visual Studio for Mac.
1616

17-
If you wish to use GitHub, ensure that you have your account created and configured before following the steps below.
17+
If you wish to use GitHub, ensure that you have an account created and configured before following the steps below.
1818

1919
To set up a Git repository, execute the following steps:
2020

@@ -41,11 +41,11 @@ To set up a Git repository, execute the following steps:
4141

4242
![](media/version-control-git5.png)
4343

44-
7. Enter the name of the repository as you would like it to display locally, and paste in the URL from step #3. Your Repository Configuration dialog should look similar to the following, press OK:
44+
7. Enter the name of the repository as you would like it to display locally, and paste in the URL from step #3. Your Repository Configuration dialog should look similar to the following. Press OK:
4545

4646
![Enter git details dialog](media/version-control-git6.png)
4747

48-
Note that it is also possible to use SSH to connect to git.
48+
Note that it is also possible to use SSH to connect to Git.
4949

5050
8. To attempt to publish the app to Git, select the repository just created, and ensure that both **Module Name** and **Message** text fields are completed:
5151

mac/set-up-subversion-repository.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ ms.topic: article
88
ms.assetid: 0D58FB37-530E-495B-BED6-FD499477A9B6
99
---
1010

11-
# Setting Up a Subversion Repository
11+
# Setting up a Subversion repository
1212

13-
Subversion is a centralized version control system. This means that there is a single server that contains all files and revisions from which users can check out any version of any file. When files are checked out from a remote Subversion repository, the user will get a snapshot of the repository at that particular point in time.
13+
Subversion is a centralized version control system. This means that there is a single server that contains all files and revisions from which users can check out any version of any file. When files are checked out from a remote Subversion repository, the user will get a snapshot of the repository at that point in time.
1414

15-
Before starting to use Subversion, the Xcode command line tools must be installed, which includes the correct svn packages. You can check that SVN is installed in Terminal with the following command:
15+
Before starting to use Subversion, the Xcode command line tools must be installed as they include the correct svn packages. You can check that SVN is installed in Terminal with the following command:
1616

1717
`svn h`
1818

19-
1. Create a free SVN repository online. For this example [Assembla](https://app.assembla.com/) was used. Once created, a URL will be provided, which will be used to connect to the repository:
19+
1. Create a free SVN repository online. For this example, [Assembla](https://app.assembla.com/) was used. Once created, a URL will be provided, which will be used to connect to the repository:
2020

2121
![Obtain SVN URL and copy it](media/version-control-subversion1-sml.png)
2222

@@ -38,5 +38,5 @@ Before starting to use Subversion, the Xcode command line tools must be install
3838

3939
![](media/version-control-subversion5.png)
4040

41-
8. All of the version control commands available should now be visible in the version control menu.
41+
8. All the version control commands available should now be visible in the version control menu.
4242

mac/troubleshooting.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ ms.assetid: CE860D79-E29E-4B93-B094-BE74B35FC1C2
1010

1111
# Troubleshooting
1212

13-
## Viewing Logs in Visual Studio for Mac
13+
## Viewing logs in Visual Studio for Mac
1414

1515
Logs can be found by browsing to the **Help > Open Log Directory** menu item, as illustrated below:
1616

1717
![Open Log directory menu item](media/troubleshooting-image1.png)
1818

19-
## Viewing Exceptions
19+
## Viewing exceptions
2020

2121
When an exception has been caught, an exception bubble will appear. To view more details, select the **View Details** button:
2222

2323
![View more details about an exception](media/troubleshooting-image2.png)
2424

25-
This will the display Show Details dialog, providing more information regarding the exception:
25+
This will display the **Show Details** dialog, providing more information regarding the exception:
2626

2727
![](media/troubleshooting-image3.png)
2828

@@ -37,7 +37,7 @@ Important sections of the dialog, which are numbered above are described in deta
3737
7. Example of user code entries.
3838
8. Properties view, which shows all properties and fields of the exception. This can be collapsed via a disclosure arrow.
3939
9. Inner exception tree view. Select inner exceptions in this view via keyboard up/down arrows or with the mouse or trackpad.
40-
10. By default, this is set to what the **Debug project code only** option in debugger settings is set. Selecting this box will enable all non-user code to collapse into one line in the stacktrace.
40+
10. By default, this is set to what the **Debug project code only** option in debugger settings is set to. Selecting this box will enable all non-user code to collapse into one line in the stacktrace.
4141
11. A copy button to copy the `exception.ToString()` output to clipboard.
4242

4343
Note that some of these sections will only be visible when exception has an inner exception.

mac/version-control.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ ms.topic: article
88
ms.assetid: 49917483-28AA-4598-A847-71F1F2E0DCB5
99
---
1010

11-
# Version Control
11+
# Version control
1212

13-
Version control is a system of managing files over many different versions, and – in software development – is generally contributed to by many developers. The principal purpose of any version control system (_VCS_) is to find a solution that enables all users to work on the codebase at the same time.
13+
Version control is a system for managing files over many different versions, and – in software development – is generally contributed to by many developers. The principal purpose of any version control system (_VCS_) is to find a solution that enables all users to work on the codebase at the same time.
1414

1515
At the core of any version control system is a _repository_, which acts as the central data store for all the different files – similar to a file server. However, unlike a file server, the repository contains the entire history of the project and all revisions that have been made.
1616

17-
If the repository is the central data store, it is logical for each user to have a local store of the data, allowing them to work on it. This is called a _working copy_. In Visual Studio for Mac your working copy will appear just as any other local directory on your machine, allowing you to read and write from any of the files. However, because Visual Studio for Mac has Version control system integration, you can leverage the power of Subversion and Git without leaving the IDE.
17+
If the repository is the central data store, it is logical for each user to have a local store of the data, allowing them to work on it. This is called a _working copy_. In Visual Studio for Mac your working copy will appear just as any other local directory on your machine, allowing you to read from and write to any of the files. However, because Visual Studio for Mac has Version control system integration, you can leverage the power of Subversion and Git without leaving the IDE.
1818

19-
Subversion is a centralized version control system. This means that there is a single server that contains all files and revisions from which users can check out any version of any file. When files are checked out from a remote Subversion repository, the user will get a snapshot of the repository at that particular point in time.
19+
Subversion is a centralized version control system. This means that there is a single server that contains all files and revisions from which users can check out any version of any file. When files are checked out from a remote Subversion repository, the user will get a snapshot of the repository at that point in time.
2020

2121
Git is a distributed version control system that allows teams to work on the same documents simultaneously. This means that there might a single server that contains all the files, but whenever a repository is checked out from this central source, the entire repository is cloned locally to your machine.
2222

2323
# Basic Concepts
2424

25-
Visual Studio for Mac provides support for both Git and Subversion version control systems. The guides linked below explore setting up Git and Subversion repositories through Visual Studio for Mac, and also simple functionality such as reviewing, committing, and pushing changes.
25+
Visual Studio for Mac provides support for both Git and Subversion version control systems. The guides linked below explore setting up Git and Subversion repositories through Visual Studio for Mac, as well as simple functionality such as reviewing, committing, and pushing changes.
2626

2727
* [Setting Up a Git Repository](~/set-up-git-repository.md)
2828
* [Working with Git](~/working-with-git.md)

mac/working-with-git.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The image below illustrates the options provided by Visual Studio for Mac by the
2424

2525
Pushing and Pulling are two of the most commonly used actions within Git. To synchronize changes that other people have made to the remote repository, you must **Pull** from there. This is done in Visual Studio for Mac by selecting **Version Control > Update Solution**.
2626

27-
Once you have updated your files, reviewed and committed them, you then have to **Push** them to the remote repository to allow others to access your changes. This is done in Visual Studio for Mac by selecting **Version Control > Push Changes**. This will display the Push dialog, allowing you to view the committed changes, and select the branch to push to:
27+
Once you have updated your files, reviewed and committed them, you must then **Push** them to the remote repository to allow others to access your changes. This is done in Visual Studio for Mac by selecting **Version Control > Push Changes**. This will display the Push dialog, allowing you to view the committed changes, and select the branch to push to:
2828

2929
![Dialog showing the branch to commit to](media/version-control-gitPush.png)
3030

@@ -52,11 +52,11 @@ These allow the following actions:
5252

5353
* **Merge** – This can be used if you have a merge conflict when committing your work. It shows a visual representation of the changes made by you and the other developer, allowing you to combine both sections of code cleanly.
5454

55-
## Switching Branches
55+
## Switching branches
5656

5757
By default, the first branch created in a repository is known as the **Master** branch. There isn't technically anything different between the master branch and any other, but the master branch is the one that is most often thought of in development teams as the 'live' or 'production' branch.
5858

59-
An independent line of development can be created by branching off Master (or any other branch, for that matter). This provides a new version of the master branch at a particular point in time, allowing developing independently from that is 'live.' Using branches in this way is often used for features in software development
59+
An independent line of development can be created by branching off Master (or any other branch, for that matter). This provides a new version of the master branch at a point in time, allowing for development independently of what is 'live.' Using branches in this way is often used for features in software development
6060

6161
Users can create as many branches as they like for each repository, but it is recommended that once they have finished using a branch, it is deleted it to keep the repository organized.
6262

@@ -76,9 +76,9 @@ See the current branch in the Solution Pad, next to the project name:
7676

7777
![Current branch displayed in solution pad](media/version-control-gitBranchName.png)
7878

79-
## Reviewing and Committing
79+
## Reviewing and committing
8080

81-
To review changes in the files, use the Changes, Blame, Log, and Merge tabs on each document, illustrated earlier in this document.
81+
To review changes in the files, use the Changes, Blame, Log, and Merge tabs on each document, illustrated earlier in this topic.
8282

8383
Review all changes in your project by browsing to the **Version Control > Review Solution and Commit** menu item:
8484

mac/working-with-subversion.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@ ms.assetid: 2400ED9C-6236-4C0A-A3AB-9D7CBE1F0CF4
1010

1111
# Working with Subversion
1212

13-
As mentioned earlier in this article, Subversion is the centralized version control system that enables you to check out a single master copy of the centralized data. In contrast to Git, checking out a Subversion repository does not clone the entire repository, it only takes a snapshot of that point in time.
13+
As mentioned earlier in this article, Subversion is the centralized version control system that enables you to check out a single master copy of the centralized data. In contrast to Git, checking out a Subversion repository does not clone the entire repository, it only takes a snapshot at that point in time.
1414

1515
Subversion uses a copy-modify-merge model to allow users to work on the same repository simultaneously. This means that each user creates a local, or working, copy of the centralized data, which they can then work on independently. The changes to users working copies are merged in a chronological fashion.
1616

17-
For example, imagine User A and User B each check out a copy from the remote repository and they each modify files. User A finishes the modifications and commits them remotely. Before User B commits their work, they will have to update their working copy with changes from the remote, thereby merging in User A's changes.
17+
For example, imagine that User A and User B both check out a copy from the remote repository and they each modify files. User A finishes the modifications and commits them remotely. Before User B commits their work, they will have to update their working copy with changes from the remote, thereby merging in User A's changes.
1818

1919
In the sections below we will explore how Subversion can be used for version control in Visual Studio for Mac.
2020

2121
The image below illustrates the options provided by Visual Studio for Mac by the Version Control menu item:
2222

2323
![Version Control menu items](media/version-control-svnVersionControlMenu.png)
2424

25-
The sections below will explain each in more detail.
25+
The sections below will explain each option in more detail.
2626

2727
## Checkout…
2828

2929
Before starting to use a remote Subversion repository, you will need to check out the repo to create a local, or working, copy of that directory on your local machine.
3030

31-
To check out using the **Checkout** feature in Visual Studio for Mac, follow the steps in the [Setting up a Subversion repository](~/set-up-subversion-repository.md) section.
31+
To find out about using the **Checkout** feature in Visual Studio for Mac, follow the steps in the [Setting up a Subversion repository](~/set-up-subversion-repository.md) section.
3232

33-
## Update Solution
33+
## Update solution
3434

3535
When using a remote repository, it is important to remember that other users may be modifying files, making your working copy outdated. In anticipation of this, it is always recommended to pull any changes from the repository into your solution before starting work, and before committing. To do this, select the *Version Control > Update Solution* menu item.
3636

37-
## Review Solution and Commit
37+
## Review solution and commit
3838

3939
To review changes in files, use the Changes, Blame, Log, and Merge tabs on each document, as illustrated below:
4040

0 commit comments

Comments
 (0)