Skip to content

Commit 8a8c76f

Browse files
author
Colin Robertson
committed
Change linefeed to line feed
1 parent ce65317 commit 8a8c76f

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

docs/error-messages/tool-errors/resource-compiler-fatal-error-rw1004.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ ms.assetid: 89cfcb02-a5d3-4271-be4f-df2ec3f94f3e
99

1010
Unexpected end of file
1111

12-
This error can be caused by missing linefeed and carriage-return characters on the last line of a text file.
12+
This error can be caused by missing line feed and carriage-return characters on the last line of a text file.

docs/mfc/reference/carchive-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,9 @@ In the version that returns an `LPTSTR`, a pointer to the buffer containing the
610610

611611
### Remarks
612612

613-
In the version of the member function with the *nMax* parameter, the buffer will hold up to a limit of *nMax* - 1 characters. Reading is stopped by a carriage return-linefeed pair. Trailing newline characters are always removed. A null character ('\0') is appended in either case.
613+
In the version of the member function with the *nMax* parameter, the buffer will hold up to a limit of *nMax* - 1 characters. Reading is stopped by a carriage return-line feed pair. Trailing newline characters are always removed. A null character ('\0') is appended in either case.
614614

615-
[CArchive::Read](#read) is also available for text-mode input, but it does not terminate on a carriage return-linefeed pair.
615+
[CArchive::Read](#read) is also available for text-mode input, but it does not terminate on a carriage return-line feed pair.
616616

617617
### Example
618618

docs/mfc/reference/cedit-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ Nonzero if any formatting occurs; otherwise 0.
348348

349349
### Remarks
350350

351-
A soft line break consists of two carriage returns and a linefeed inserted at the end of a line that is broken because of word wrapping. A hard line break consists of one carriage return and a linefeed. Lines that end with a hard line break are not affected by `FmtLines`.
351+
A soft line break consists of two carriage returns and a line feed inserted at the end of a line that is broken because of word wrapping. A hard line break consists of one carriage return and a line feed. Lines that end with a hard line break are not affected by `FmtLines`.
352352

353353
Windows will only respond if the `CEdit` object is a multiple-line edit control.
354354

docs/mfc/reference/cfile-class.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Choose one of the following character mode options.
162162
|Value|Description|
163163
|-----------|-----------------|
164164
|`CFile::typeBinary`|Sets binary mode (used in derived classes only).|
165-
|`CFile::typeText`|Sets text mode with special processing for carriage return-linefeed pairs (used in derived classes only).|
165+
|`CFile::typeText`|Sets text mode with special processing for carriage return-line feed pairs (used in derived classes only).|
166166
|`CFile::typeUnicode`|Sets Unicode mode (used in derived classes only). Text is written to the file in Unicode format when the application is built in a Unicode configuration. No BOM is written to the file.|
167167

168168
Choose only one of the following file share mode options. The default file share mode is `CFile::shareExclusive`, which is exclusive.
@@ -573,7 +573,7 @@ virtual UINT Read(
573573
Pointer to the user-supplied buffer that is to receive the data read from the file.
574574

575575
*nCount*<br/>
576-
The maximum number of bytes to be read from the file. For text-mode files, carriage return-linefeed pairs are counted as single characters.
576+
The maximum number of bytes to be read from the file. For text-mode files, carriage return-line feed pairs are counted as single characters.
577577

578578
### Return Value
579579

@@ -842,7 +842,7 @@ virtual void Write(
842842
A pointer to the user-supplied buffer that contains the data to be written to the file.
843843

844844
*nCount*<br/>
845-
The number of bytes to be transferred from the buffer. For text-mode files, carriage return-linefeed pairs are counted as single characters.
845+
The number of bytes to be transferred from the buffer. For text-mode files, carriage return-line feed pairs are counted as single characters.
846846

847847
### Remarks
848848

docs/mfc/reference/cstdiofile-class.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CStdioFile : public CFile
4242

4343
Stream files are buffered and can be opened in either text mode (the default) or binary mode.
4444

45-
Text mode provides special processing for carriage return-linefeed pairs. When you write a newline character (0x0A) to a text-mode `CStdioFile` object, the byte pair (0x0D, 0x0A) is sent to the file. When you read, the byte pair (0x0D, 0x0A) is translated to a single 0x0A byte.
45+
Text mode provides special processing for carriage return-line feed pairs. When you write a line feed (newline) character (0x0A) to a text-mode `CStdioFile` object, the byte pair (0x0D, 0x0A) is sent to the file. When you read, the byte pair (0x0D, 0x0A) is translated to a single 0x0A byte.
4646

4747
The [CFile](../../mfc/reference/cfile-class.md) functions [Duplicate](../../mfc/reference/cfile-class.md#duplicate), [LockRange](../../mfc/reference/cfile-class.md#lockrange), and [UnlockRange](../../mfc/reference/cfile-class.md#unlockrange) are not supported for `CStdioFile`.
4848

@@ -193,7 +193,7 @@ A pointer to the buffer containing the text data. NULL if end-of-file was reache
193193

194194
Reading is stopped by the first newline character. If, in that case, fewer than *nMax*-1 characters have been read, a newline character is stored in the buffer. A null character ('\0') is appended in either case.
195195

196-
[CFile::Read](../../mfc/reference/cfile-class.md#read) is also available for text-mode input, but it does not terminate on a carriage return-linefeed pair.
196+
[CFile::Read](../../mfc/reference/cfile-class.md#read) is also available for text-mode input, but it does not terminate on a carriage return-line feed pair.
197197

198198
> [!NOTE]
199199
> The `CString` version of this function removes the `'\n'` if present; the LPTSTR version does not.
@@ -259,7 +259,7 @@ Specifies a pointer to a buffer that contains a null-terminated string.
259259

260260
### Remarks
261261

262-
The terminating null character ( `\0`) is not written to the file. This method writes newline characters in *lpsz* to the file as a carriage return/linefeed pair.
262+
The terminating null character ( `\0`) is not written to the file. This method writes newline characters in *lpsz* to the file as a carriage return-line feed pair.
263263

264264
If you want to write data that is not null-terminated to a file, use `CStdioFile::Write` or [CFile::Write](../../mfc/reference/cfile-class.md#write).
265265

docs/standard-library/binary-output-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.assetid: 180954af-8cd6-444b-9a76-2f630a3389d8
66
---
77
# Binary Output Files
88

9-
Streams were originally designed for text, so the default output mode is text. In text mode, the newline character (hexadecimal 10) expands to a carriage return-linefeed (16-bit only). The expansion can cause problems, as shown here:
9+
Streams were originally designed for text, so the default output mode is text. In text mode, the line feed (newline) character expands to a carriage return-line feed pair. The expansion can cause problems, as shown here:
1010

1111
```cpp
1212
// binary_output_files.cpp

docs/standard-library/effects-of-buffering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To make the program work logically, the `cout` object must empty itself when the
3131
cout <<"Please wait..." <<flush;
3232
```
3333

34-
This step flushes the buffer, ensuring the message prints before the wait. You can also use the `endl` manipulator, which flushes the buffer and outputs a carriage return-linefeed, or you can use the `cin` object. This object (with the `cerr` or `clog` objects) is usually tied to the `cout` object. Thus, any use of `cin` (or of the `cerr` or `clog` objects) flushes the `cout` object.
34+
This step flushes the buffer, ensuring the message prints before the wait. You can also use the `endl` manipulator, which flushes the buffer and outputs a carriage return-line feed, or you can use the `cin` object. This object (with the `cerr` or `clog` objects) is usually tied to the `cout` object. Thus, any use of `cin` (or of the `cerr` or `clog` objects) flushes the `cout` object.
3535

3636
## See also
3737

docs/standard-library/input-stream-member-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ int main()
127127
}
128128
```
129129

130-
The program assumes that the data records are formatted exactly as specified by the structure with no terminating carriage-return or linefeed characters.
130+
The program assumes that the data records are formatted exactly as specified by the structure with no terminating carriage return or line feed characters.
131131

132132
## <a name="vclrftheseekgandtellgfunctionsanchor7"></a> The seekg and tellg Functions
133133

0 commit comments

Comments
 (0)