Skip to content

Commit 3c9da36

Browse files
committed
Fixing copy edits
1 parent 7269376 commit 3c9da36

11 files changed

+69
-71
lines changed

mac/block-selection.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ms.date: 04/14/2017
66
ms.topic: article
77
ms.assetid: E8E0831E-E076-44B1-A82A-A325382916A6
88
---
9-
# Block Selection
9+
# Block selection
1010
Visual Studio for Mac makes it straightforward to select, cut, copy, and paste sections of your code. Rectangular blocks of code can be highlighted and selected by using the **Option + Drag** command on the code block. The formatting within this block selection is retained when pasting the block.
1111

12-
Block selections can also be edited, to modify text on multiple lines at once. A zero-width block selection can be used to place the caret in front of many lines at once, and allows typing identical text on multiple lines.
12+
Block selections can also be edited to modify text on multiple lines at once. A zero-width block selection can be used to place the caret in front of many lines at once, and allows typing identical text on multiple lines:
1313

1414
![Block Selection and adding text](media/source-editor-image16.png)

mac/comments.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.assetid: 0FE5E929-1846-4F48-B5E3-70990FAF9504
99

1010
# Comments
1111

12-
When debugging or experimenting with code, it can be very useful to comment a block of code temporarily.
12+
When debugging or experimenting with code, It can be useful to comment blocks of code either temporarily or long term.
1313

1414
To comment out an entire block of code:
1515

@@ -23,7 +23,7 @@ These methods can be used to comment and uncomment sections of code. In C# files
2323

2424
![multi-level comments](media/source-editor-image8.png)
2525

26-
Comments are also useful for documenting code for future developers that may interact with it. These are usually done in the form of multi-line comments, which is added in the following way in each language:
26+
Comments are also useful for documenting code for future developers that may interact with it. These are usually done in the form of multi-line comments, which are added in the following way in each language:
2727

2828
**C#**
2929

mac/customizing-build-system.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ ms.assetid: 6958B102-8527-4B40-BC65-3505DB63F9D3
1010

1111
# Customizing the Build System
1212

13-
MSbuild is a build engine developed by Microsoft, that allows for the building of primarily .NET applications. The Mono framework also has it's own implementation of Microsoft's Build Engine (MSBuild), called **xbuild**.
13+
MSbuild is a build engine developed by Microsoft, that allows for the building of primarily .NET applications. The Mono framework also has it's own implementation of Microsoft's Build Engine (MSBuild), called **xbuild**. However, xbuild has been phased out, in favor of using MSBuild on all operating systems.
1414

15-
**xbuild** is primarily used for build Xamarin projects in Visual Studio for Mac. However, Xamarin will be phasing out xbuild out, in favor of moving towards using MSBuild on all operating systems.
16-
17-
In this document, when a reference is made to MSBuild, it is safe to assume that this also applies to xbuild.
15+
**MSbuild** is primarily used for as the build system for projects in Visual Studio for Mac.
1816

1917
MSBuild works by taking a set of inputs, such as source files, and transforms them to outputs, such as executables, and achieves this output by invoking tools such as the compiler.
2018

mac/data-visualizations.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ ms.topic: article
88
ms.assetid: 527E6BEC-EF15-4002-ACB5-62AE1C16F6B7
99
---
1010

11-
# Data Visualizations
12-
13-
Visual Studio for Mac includes UI support for the debugger allowing visualizations of the values of a variable, field or property while debugging. These data visualizers show an extended version of the data and allow developers to inspect known structures, for example showing the color of a color struct.
11+
# Data visualizations
1412

13+
Visual Studio for Mac includes UI support for the debugger, allowing visualizations of the values of a variable, field, or property while debugging. These data visualizers show an extended version of the data and allow developers to inspect known structures, for example showing the color of a color struct.
1514

1615
Visualizers in the debug **Local** pad can be displayed by clicking on the preview icon that appears to the right of the value, when the user hovers over the row:
1716

@@ -35,10 +34,10 @@ A Rectangle/RectangleF, or CGRect in iOS and Mac, will display the dimensions an
3534

3635
![Rectangle Visualization](media/data-visualizations-image12.png)
3736

38-
## Co-ordinate
39-
Co-ordinates are plotted on a map, with the location pinned to the center:
37+
## Coordinate
38+
Coordinates are plotted on a map, with the location pinned to the center:
4039

41-
![Co-ordinate Visualization](media/data-visualizations-image13.png)
40+
![Coordinate Visualization](media/data-visualizations-image13.png)
4241

4342
## Color
4443
This will display UIColor, CGColor, and Color properties, depicting the color preview, RGBA components, Hue-Saturation-Lightness values, and the hex value of the color:
@@ -61,8 +60,8 @@ The visualizer will display an `NSBezierPath`:
6160

6261

6362
## String
64-
A string will be displayed of less than 100 characters will be displayed in full, without a preview. Longer strings will be displayed in full in the preview. Strings are editable, and the visualizer is accompanied by an edit button allowing the string value to be edited either in the preview or in the String Value Editor, shown beneath.
6563

64+
A string of less than 100 characters will be displayed in full, without a preview. Longer strings will be displayed in full in the preview. Strings are editable, and the visualizer is accompanied by an edit button, allowing the string value to be edited either in the preview or in the String Value Editor, shown below:
6665

6766
![String Visualization](media/data-visualizations-image17.png)
6867

mac/debugging.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ ms.assetid: BB7A084D-9AC2-48B5-8076-6C8518796BBA
1212
# Debugging with Xamarin
1313

1414

15-
Visual Studio for Mac has a native debugger allowing debugging support for Xamarin.iOS, Xamarin.Mac and Xamarin.Android applications.
16-
Visual Studio for Mac uses the [*Mono Soft Debugger*](http://www.mono-project.com/docs/advanced/runtime/docs/soft-debugger/), which is implemented into the Mono runtime allowing Visual Studio for Mac to debug managed code across all platforms.
15+
Visual Studio for Mac has a native debugger allowing debugging support for Xamarin.iOS, Xamarin.Mac, and Xamarin.Android applications.
16+
Visual Studio for Mac uses the [*Mono Soft Debugger*](http://www.mono-project.com/docs/advanced/runtime/docs/soft-debugger/), which is implemented into the Mono runtime, allowing Visual Studio for Mac to debug managed code across all platforms.
1717

1818
## The Debugger
1919

20-
Visual Studio for Mac uses the Mono Soft Debugger to debug managed (C# or F#) code in all Xamarin applications. The Mono Soft debugger is different to regular debuggers in that in that it is a co-operative debugger that is built into the Mono runtime; the generated code and Mono runtime co-operate with the IDE to provide a debugging experience. The Mono runtime exposes the debugging functionality through a wire protocol; you can read more about this [in the Mono documentation]( http://www.mono-project.com/docs/advanced/runtime/docs/soft-debugger-wire-format/).
20+
Visual Studio for Mac uses the Mono Soft Debugger to debug managed (C# or F#) code in all Xamarin applications. The Mono Soft debugger is different from regular debuggers in that it is a co-operative debugger that is built into the Mono runtime; the generated code and Mono runtime co-operate with the IDE to provide a debugging experience. The Mono runtime exposes the debugging functionality through a wire protocol, which you can read more about [in the Mono documentation](http://www.mono-project.com/docs/advanced/runtime/docs/soft-debugger-wire-format/).
2121

2222

23-
Hard debuggers, such as [LLDB]( http://lldb.llvm.org/index.html) or [GDB]( https://www.gnu.org/software/gdb/) control a program without the knowledge or cooperation from the debugged program, but can still be useful when debugging Xamarin applications, in the event that you need to debug native iOS or Android code.
23+
Hard debuggers, such as [LLDB]( http://lldb.llvm.org/index.html) or [GDB]( https://www.gnu.org/software/gdb/), control a program without the knowledge or cooperation from the debugged program, but can still be useful when debugging Xamarin applications in the event that you need to debug native iOS or Android code.
2424

25-
## Using the Debugger
25+
## Using the debugger
2626

27-
To start debugging any application, always ensure that the configuration is set to **Debug**. This contains a helpful set of tools to support debugging such as breakpoints, using data visualizers, and viewing the call stack:
27+
To start debugging any application, always ensure that the configuration is set to **Debug**. The debug configuration provides a helpful set of tools to support debugging, such as breakpoints, using data visualizers, and viewing the call stack:
2828

2929
![Debug configuration](media/debugging-image_0.png)
3030

3131
## Setting a breakpoint
3232

33-
To set a breakpoint in your IDE, click on the margin area of your editor, next to the line number of the code you wish to break at:
33+
To set a breakpoint in your IDE, click on the margin area of your editor, next to the line number of the code where you wish to break:
3434

3535
![Setting breakpoint in margin](media/debugging-image0.png)
3636

@@ -40,7 +40,7 @@ You can view all the breakpoints that have been set in your code by going to the
4040
![List of breakpoints](media/debugging-image0a.png)
4141

4242

43-
## Start Debugging
43+
## Start debugging
4444

4545
To start debugging, select the target device or similar/emulator in your IDE:
4646

@@ -50,51 +50,51 @@ Then deploy your application by pressing the **Play** button, or **Cmd + retur
5050

5151
![Highlight showing breakpoint has been hit](media/debugging-image2.png)
5252

53-
Debugging tools, such as inspecting the values of objects, can be used at this point to get more information about what is happening in your code:
53+
Debugging tools, such as the one used to inspect the values of objects, can be used at this point to get more information about what is happening in your code:
5454

5555
![Debug visualizations](media/debugging-image3.png)
5656

57-
## Conditional Breakpoints
57+
## Conditional breakpoints
5858

59-
You can also set rules dictating the circumstances under which a breakpoint should occur, this is know as adding a *conditional breakpoint*. To set a conditional breakpoint, access the **Breakpoint Properties window**, which can be done in two ways:
59+
You can also set rules dictating the circumstances under which a breakpoint should occur, this is known as adding a *conditional breakpoint*. To set a conditional breakpoint, access the **Breakpoint Properties window**, which can be done in two ways:
6060

6161

6262
* To add a new conditional breakpoint, right-click on the editor margin, to the left of the line number for the code you wish to set a breakpoint on, and select New Breakpoint:
6363

6464

6565
![Breakpoint context menu](media/debugging-image4.png)
6666

67-
* To add a condition to an existing breakpoint, right-click on the breakpoint and select **Breakpoint Properties** _OR_ in the **Breakpoints Pad** select the Edit Breakpoint button illustrated below:
67+
* To add a condition to an existing breakpoint, right-click on the breakpoint and select **Breakpoint Properties**, or, in the **Breakpoints Pad**, select the Edit Breakpoint button illustrated below:
6868

6969

7070
![Edit existing Breakpoint in Breakpoints Pad](media/debugging-image5.png)
7171

7272

73-
You can then enter the condition under which you want to breakpoint to occur:
73+
You can then enter the condition under which you want the breakpoint to occur:
7474

7575
![Edit Breakpoint conditions](media/debugging-image6.png)
7676

7777
## Stepping through code
78-
When a breakpoint has been reached, the Debug tools enable you to get control over the program’s execution. Visual Studio for Mac will display four buttons, allowing you to run and step through the code. In Visual Studio for Mac they will look like the following:
7978

80-
![Buttons to step through code](media/debugging-image7.png)
79+
When a breakpoint has been reached, the Debug tools enable you to get control over the program’s execution. Visual Studio for Mac will display four buttons, allowing you to run and step through the code. In Visual Studio for Mac, they will look like the following:
8180

82-
These are:
81+
![Buttons to step through code](media/debugging-image7.png)
8382

83+
Here are the four buttons:
8484

8585
* **Play** – This will begin executing the code, until the next breakpoint.
86-
* **Step Over** – This will execute the next line of code. If the next line is a function call, step over will execute the function, and will stop at the next line of code *after* the function.
86+
* **Step Over** – This will execute the next line of code. If the next line is a function call, Step Over will execute the function, and will stop at the next line of code *after* the function.
8787
* **Step Into** – This will also execute the next line of code. If the next line is a function call, Step Into will stop at the first line of the function, allowing you to continue line-by-line debugging of the function. If the next line is not a function, it will behave the same as Step Over.
8888
* **Step Out** – This will return to the line where the current function was called.
8989

9090

91-
## Debugging Mono’s Class Libraries
91+
## Debugging Mono’s class libraries
9292
Xamarin products ship with the source code for Mono's class libraries, and you can use this to single step from the debugger to inspect how things are working under the hood.
9393

9494
Since this feature consumes more memory during debugging, it is turned off by default.
9595

96-
To enable this feature, browse to **Visual Studio for Mac > Preferences > Debugger** and ensure that the "**Debug project code only; do not step into framework code**" option is **unselected**, as illustrated below:
96+
To enable this feature, browse to **Visual Studio for Mac > Preferences > Debugger** and ensure that the "**Debug project code only; do not step into framework code.**" option is **unselected**, as illustrated below:
9797

98-
![Do not step into framework code oprtion](media/debugging-image8.png)
98+
![Do not step into framework code option](media/debugging-image8.png)
9999

100100

mac/editor-behavior.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ Editor behaviors can be set to allow code to be formatted as it is written. Thes
1515
![Editor Behavior options](media/source-editor-image9.png)
1616

1717
* Matching closing braces can be added automatically to code when creating new classes, methods, or properties. When this option is selected, typing `{` will automatically add `}`.
18-
* On the fly code formatting is triggered by particular character presses such as semi-colon or braces, which will emulate the formatting preferences that are set.
18+
* On-the-fly code formatting is triggered by character presses, such as semi-colon or braces, which will emulate the formatting preferences that are set.
1919
* You can also choose to format the file when saving it, which allows the writing of code as desired and leaves the IDE responsible for formatting code as set by existing preferences.
2020
* Indentation can be set to None, Auto, or Smart. These do the following:
2121
* None – sets the caret to the start of the next line
2222
* Auto – sets the caret to the same column on the next line
2323
* Smart – indents on the following line based on the code
24-
* Word breaking behavior differs between OSes, and for navigation purposes, the text editor needs to know where words begin or end. The formatting can be set to Unix or Windows.
24+
* Word-breaking behavior differs between OSes, and for navigation purposes, the text editor needs to know where words begin or end. The formatting can be set to Unix or Windows.
2525

2626
You can also set formatting rules for XML, CSS, HTML, and JSON.

mac/editor-themes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ ms.topic: article
77
ms.assetid: 4C1B7952-CD45-4132-AD6B-01CF993D83F8
88
---
99

10-
# Editor Themes
10+
# Editor themes
1111
Editor themes can be changed to any of the ten color schemes provided by default in Visual Studio for Mac via the **Visual Studio > Preferences… > Text Editor > Color Themes** menu options:
1212

1313
![Color Theme Selection](media/source-editor-image17.png)
1414

15-
## Adding new Themes
15+
## Adding new themes
1616

1717
New color themes can be added, provided they are in one of the supported formats. These are:
1818

mac/keyboard-shortcuts.md

+13-12
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,25 @@ ms.topic: article
88
ms.assetid: 48E06A61-7294-4EC8-A09D-1763C32AD910
99
---
1010

11-
# Common Keyboard Shortcuts in Visual Studio for Mac
11+
# Common keyboard shortcuts in Visual Studio for Mac
1212

13-
## Show Code Generation Window
13+
## Show code generation window
1414

15-
This contextually generates code.
15+
16+
This contextually generates code:
1617

1718
**⌘ + 1**
1819

1920
![This contextually generates code](media/keyboard-shortcuts-image8.png)
2021

21-
## Autocomplete
22+
## Autocomplete
2223

2324
`ctrl + /`
2425

2526

26-
## Quick fixes and Actions
27+
## Quick fixes and actions
2728

28-
Displays [refactoring](~/refactoring.md) context actions.
29+
Displays [refactoring](~/refactoring.md) context actions:
2930

3031
`Option + Enter`
3132

@@ -37,25 +38,25 @@ Displays [refactoring](~/refactoring.md) context actions.
3738

3839
## File Switcher
3940

40-
Allows quick switching between files
41+
Allows quick switching between files:
4142

4243
`ctrl + tab`
4344

44-
## Move Lines Around in Editor
45+
## Move lines around in Editor
4546

4647
`alt up / alt down`
4748

48-
Use the Alt-Up command to move the current line or current selected lines up, and use the Alt-Down command to move the lines down. If the language add-in supports it, the lines will be re-indented to match the context when they move in and out of scopes.
49+
Use the Alt-Up command to move the current line or current selected lines up, and use the Alt-Down command to move the lines down. If the language add-in supports it, the lines will be re-indented to match the context when they move in and out of scope.
4950

50-
## Word Navigation
51+
## Word navigation
5152

52-
Moves the caret to the next or previous word.
53+
Moves the caret to the next or previous word:
5354

5455
`⌘ + Left/Right`
5556

5657
## Expands the Selection
5758

58-
Expands word, sub-expressions, statement, and line member selection in a logical way
59+
Expands word, sub-expressions, statement, and line member selection in a logical way:
5960

6061
`alt shift up` to select
6162
`alt shift down` to de-select

0 commit comments

Comments
 (0)