Skip to content

Commit 61a6b50

Browse files
authored
Merge pull request #4520 from shaedrich/patch-1
fix(docs): Fix nested lists after paragraphs
2 parents 747ccd1 + 52f846a commit 61a6b50

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

docs/topics/The Dating Game.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ Open/Libre Office and Gnumeric don't have this limitation, and negative date/tim
1414
To write a date in a cell using PhpSpreadsheet, we need to calculate the serialized Excel datestamp for that date. Methods to do this are available in the Shared\Date class, which provides a number of methods for conversion between different date options typically used in PHP applications (Unix timestamp, PHP DateTime objects and some recognisable formatted strings) and the Excel serialized value; and vice versa.
1515

1616
- Shared\Date::convertIsoDate()
17-
- Converts a date/time in [ISO-8601 standard format](https://en.wikipedia.org/wiki/ISO_8601) to an Excel serialized timestamp
17+
- Converts a date/time in [ISO-8601 standard format](https://en.wikipedia.org/wiki/ISO_8601) to an Excel serialized timestamp
1818
- Shared\Date::PHPToExcel()
19-
- Converts a Unix timestamp, a PHP DateTime object, or a recognisable formatted string to an Excel serialized timestamp
19+
- Converts a Unix timestamp, a PHP DateTime object, or a recognisable formatted string to an Excel serialized timestamp
2020
- Shared\Date::dateTimeToExcel()
21-
- Converts a Unix timestamp to an Excel serialized timestamp
21+
- Converts a Unix timestamp to an Excel serialized timestamp
2222
- Shared\Date::timestampToExcel()
23-
- Converts a PHP DateTime object to an Excel serialized timestamp
23+
- Converts a PHP DateTime object to an Excel serialized timestamp
2424
- Shared\Date::formattedPHPToExcel()
25-
- Converts year, month, day, hour, minute, and second to an Excel serialized timestamp
25+
- Converts year, month, day, hour, minute, and second to an Excel serialized timestamp
2626
- Shared\Date::excelToDateTimeObject()
27-
- Converts an Excel serialized timestamp to a PHP DateTime object
27+
- Converts an Excel serialized timestamp to a PHP DateTime object
2828
- Shared\Date::excelToTimestamp()
29-
- Converts an Excel serialized timestamp to a Unix timestamp.
30-
- The use of Unix timestamps, and therefore this function, is discouraged: they are not Y2038-safe on a 32-bit system, and have no timezone info.
29+
- Converts an Excel serialized timestamp to a Unix timestamp.
30+
- The use of Unix timestamps, and therefore this function, is discouraged: they are not Y2038-safe on a 32-bit system, and have no timezone info.
3131

3232
We probably also want to set the number format mask for the cell so that it will be displayed as a human-readable date.
3333
```php

docs/topics/defined-names.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -545,17 +545,18 @@ $this->spreadsheet->addDefinedName(
545545
### Naming Names
546546

547547
The names that you assign to Defined Name must follow the following set of rules:
548+
548549
- The first character of a name must be one of the following characters:
549-
- letter (including UTF-8 letters)
550-
- underscore (`_`)
550+
- letter (including UTF-8 letters)
551+
- underscore (`_`)
551552
- Remaining characters in the name can be
552-
- letters (including UTF-8 letters)
553-
- numbers (including UTF-8 numbers)
554-
- periods (`.`)
555-
- underscore characters (`_`)
553+
- letters (including UTF-8 letters)
554+
- numbers (including UTF-8 numbers)
555+
- periods (`.`)
556+
- underscore characters (`_`)
556557
- The following are not allowed:
557-
- Space characters are not allowed as part of a name.
558-
- Names can't look like cell addresses, such as A35 or R2C2
558+
- Space characters are not allowed as part of a name.
559+
- Names can't look like cell addresses, such as A35 or R2C2
559560
- Names are not case sensitive. For example, `North` and `NORTH` are treated as the same name.
560561

561562
### Limitations

0 commit comments

Comments
 (0)