Skip to content

Commit 3ca1eac

Browse files
authored
Merge pull request #3 from notepad-plus-plus/master
re-sync pryrt's fork with master
2 parents bd5037c + d0062ab commit 3ca1eac

File tree

9 files changed

+1936
-10
lines changed

9 files changed

+1936
-10
lines changed

CONTRIBUTION.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Your pull requests are welcome; however, they may not be accepted for various re
88

99
### Guidelines for pull requests
1010

11+
0. KISS - Keep It Simple, Stupid.
1112
1. Respect Notepad++ User Manuel style.
1213
2. Create a new branch for each PR.
1314

@@ -25,4 +26,4 @@ Your pull requests are welcome; however, they may not be accepted for various re
2526

2627
## Cross-Links
2728

28-
To properly link from one page in the user-manual docs to another, use the syntax `[link name](../page/)` to link to the top level, or `[link name](../page/#anchor)` to link to an anchor (like a heading) in another document. Note that `page` does _not_ include the `.md` extension. The anchor names are the lower-case version of the section headers, with spaces replaced by hyphens. Thus, from the [Themes](content/docs/themes/) page, link to the [**Preferences > Style Configurator**](content/docs/preferences/#style-configurator) using the syntax `[**Preferences > Style Configurator**](../preferences/#style-configurator)
29+
To properly link from one page in the user-manual docs to another, use the syntax `[link name](../page/)` to link to the top level, or `[link name](../page/#anchor)` to link to an anchor (like a heading) in another document. Note that `page` does _not_ include the `.md` extension. The anchor names are the lower-case version of the section headers, with spaces replaced by hyphens. Thus, from the [Themes](content/docs/themes/) page, link to the [**Preferences > Style Configurator**](content/docs/preferences/#style-configurator) using the syntax `[**Preferences > Style Configurator**](../preferences/#style-configurator)`.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ Summary
2222
* [Auto-completion](content/docs/auto-completion.md)
2323
* [Function List](content/docs/function-list.md)
2424
* [Plugins](content/docs/plugins.md)
25+
* [Plugin Communication](content/docs/plugin-communication.md)
2526
* [Preferences](content/docs/preferences.md)
2627
* [Themes](content/docs/themes.md)
28+
* [Configuration Files Details](content/docs/config-files.md)
2729
* [Command Line Arguments](content/docs/command-prompt.md)
2830
* [Shell Extension](content/docs/shell-extension.md)
2931
* [Binary Translation](content/docs/binary-translation.md)

content/docs/binary-translation.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ For modifying an existing xml files, here is the way to visualize your modificat
2525

2626
<div>
2727

28-
<div align="center"align="center" style="margin: 20px; display: inline-block;">
28+
<div align="center" style="margin: 20px; display: inline-block;">
2929
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/chinese.xml" target="_blank"> <img src="/docs/images/flags/fTaiwan.png" alt="" border="0" /><br /> Chinese</a>
3030
</div>
3131

32-
<div align="center"align="center" style="margin: 20px; display: inline-block;">
32+
<div align="center" style="margin: 20px; display: inline-block;">
3333
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/french.xml" target="_blank"><img src="/docs/images/flags/fFrance.png" alt="" border="0" /><br /> French</a>
3434
</div>
3535

36-
<div align="center"align="center" style="margin: 20px; display: inline-block;">
36+
<div align="center" style="margin: 20px; display: inline-block;">
3737
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/spanish.xml" target="_blank"><img src="/docs/images/flags/fSpain.png" alt="" border="0" /><br /> Spanish</a>
3838
</div>
3939

40-
<div align="center"align="center" style="margin: 20px; display: inline-block;">
40+
<div align="center" style="margin: 20px; display: inline-block;">
4141
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/hungarian.xml" target="_blank"><img src="/docs/images/flags/fHungary.png" alt="" border="0" /><br /> Hungarian</a>
4242
</div>
4343

@@ -282,7 +282,7 @@ For modifying an existing xml files, here is the way to visualize your modificat
282282
</div>
283283

284284
<div align="center" style="margin: 20px; display: inline-block;">
285-
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/uyghur.xml" target="_blank"><img src="/docs/images/flags/fChina.png" alt="" border="0" /><br /> Uyghur</a>
285+
<a href="https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/installer/nativeLang/uyghur.xml" target="_blank"><img src="/docs/images/flags/fEastTurkestan.png" alt="" border="0" /><br /> Uyghur</a>
286286
</div>
287287

288288
<div align="center" style="margin: 20px; display: inline-block;">

content/docs/command-prompt.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Notepad++ supports a few command line parameters to control its startup. The syn
1111
```
1212
notepad++ [--help] [-multiInst] [-noPlugin] [-l<lang>] [-n<line>] [-c<column>]
1313
[-p<pos>] [-x<left-pos>] [-y<TopPos>] [-nosession] [-notabbar] [-ro]
14-
[-systemtray] [-loadingTime] [-alwaysOnTop] [-openSession] [-r]
14+
[-systemtray] [-loadingTime] [-alwaysOnTop] [-openSession] [-openFoldersAsWorkspace] [-r]
1515
[-qn<EasterEggName> | -qt<Text> | -qf<ContentFileName>]
1616
[-qSpeed(1|2|3)] [-quickPrint]
1717
[filepath]
@@ -43,6 +43,7 @@ notepad++ [--help] [-multiInst] [-noPlugin] [-l<lang>] [-n<line>] [-c<column>]
4343
* `-loadingTime`: Display Notepad++ loading time.
4444
* `-alwaysOnTop`: Make Notepad++ always on top.
4545
* `-openSession`: Open a session. `filepath` must be a session file.
46+
* `-openFoldersAsWorkspace`: Any folders listed as arguments will be opened as a workspace, rather than opening all the contained files individually (new to v7.8)
4647
* `-r`: Open files recursively. This argument will be ignored if
4748
`filepath` contain no wildcard character.
4849
* `-qn`: Launch ghost typing to display easter egg via its *EasterEggName*.

0 commit comments

Comments
 (0)