diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm index f9543d99c..b6f75dc47 100644 Binary files a/PowerEditor/bin/NppHelp.chm and b/PowerEditor/bin/NppHelp.chm differ diff --git a/PowerEditor/misc/npp.help/HTML/Auto Completion.html b/PowerEditor/misc/npp.help/HTML/Auto Completion.html index 9cd82b121..13ac58448 100644 --- a/PowerEditor/misc/npp.help/HTML/Auto Completion.html +++ b/PowerEditor/misc/npp.help/HTML/Auto Completion.html @@ -1,5 +1,5 @@ -Auto Completion +Auto Completion

Auto completion

@@ -18,7 +18,7 @@ Completion or automatically when a certain amount of characters is typed (see also Preferences).
  • The second one retrieves all the words from the current file and provides hinting on that, -named Word Completion. This is triggered by selecting Edit->Auto-Completion->>Word +named Word Completion. This is triggered by selecting Edit->Auto-Completion->Word Completion, or by entering a set number of characters (again, see Preferences). Word completion is the only type that can automatically finish a word without displaying a list of options first. @@ -32,5 +32,5 @@ tasks. The calltip will highlight the current parameter being edited for a quick emphasis on what is actually needed. It is purely passive and will not modify the text in any way. To trigger a calltip (if one can be found), select Edit->Auto-Completion->Function parameters hint.

    Autocompletion is language based (see Languages) and has different API files for -each language. For more details on these API files and how to make your own, refer to NpWiki++. +each language. For more details on these XML files and how to make your own ones, please refer to NpWiki++. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html b/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html index ee92c31a4..f447ee9fd 100644 --- a/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html +++ b/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html @@ -4,7 +4,7 @@

    Column Mode editing

    - +

    Editing rectangilar areas

    A special way of editing files is column mode editing. This means that text can be selected in columns, rather than rows (effectively @@ -13,17 +13,25 @@ Scintilla, but with a few supplements of Notepad++. To initiate a Column mode selection, depress the Alt key (default) when selecting text (using mouse or cursor keys), moving the cursor downwards or upwards as needed. This works best if a non-proportional (monospaced) -font is used, because then each character will be aligned with the -ones above and below it (refer to Styler Configurator for more +font is used, because then each character will be visually aligned with the +ones in the same column above and below it (refer to Styler Configurator for more information).

    When text is selected in this so called rectangilar mode, typing will change each selected column of characters into the typed character, or insert such a column. Use the ESC key to exit this special typing mode. To back up one column, use the Edit->Undo feature, instead of the Backspace key. -

    - +

    + + +
    Before typing "done"After typing "dne" +
    + +
    +

    The column editor

    The Column Editor dialog is designed to make working with columns easier. It can be opened by selecting Edit->Column Editor. +

    +

    There are two types of insertions that the column editor supports, regular text or number sequences. diff --git a/PowerEditor/misc/npp.help/HTML/Command Line.html b/PowerEditor/misc/npp.help/HTML/Command Line.html index 1bab15de7..decb8fa43 100644 --- a/PowerEditor/misc/npp.help/HTML/Command Line.html +++ b/PowerEditor/misc/npp.help/HTML/Command Line.html @@ -24,6 +24,9 @@ p>

    Start editing in Column mode.
    --help
    Displays this list, i.e. all the command line switches +
    -loadingTime +
    Displays the loading time of all files Notepad++ is started with. +The result is displayed in a message box, with a 0.01 second resolution.
    -multiInst
    allow Notpead++ to start more than one instance. By default, if Notepad++ is already started files wil lbe opened in that instance, @@ -50,7 +53,7 @@ java, rc, html, xml, makefile, pascal, batch, ini, nfo, asp, sql, vb, javascript, css, perl, python, lua, tex, cobol, fortran, bash, actionscript, nsis, tcl, lisp, scheme, asm, diff, props, postscript, ruby, smalltalk, vhdl, kix, autoit, Gui4Cli, powershell, caml, ada, verilog, matlab, haskell, inno, cmake, -yaml, r +yaml,r, jsp
    Files
    Anything else will be interpreted as a filename. Always quote your filename to allow the path to contain spaces, otherwise Notepad++ diff --git a/PowerEditor/misc/npp.help/HTML/Context Menu.html b/PowerEditor/misc/npp.help/HTML/Context Menu.html index 8c370fcd1..f7eca31d5 100644 --- a/PowerEditor/misc/npp.help/HTML/Context Menu.html +++ b/PowerEditor/misc/npp.help/HTML/Context Menu.html @@ -3,7 +3,8 @@

    Context Menu

    -

    The + +The context menu can be reached by rightclicking anywhere in the edit screen. The context menu allows for quick access to commonly used commands and is user configurable. To change the contents of the diff --git a/PowerEditor/misc/npp.help/HTML/Display.html b/PowerEditor/misc/npp.help/HTML/Display.html index 0a96bf529..8a5c4014e 100644 --- a/PowerEditor/misc/npp.help/HTML/Display.html +++ b/PowerEditor/misc/npp.help/HTML/Display.html @@ -3,5 +3,8 @@

    Display

    -

    The subjects described here control the appearance of the text in the screen.

    Viewing modes

    Unprintable Characters

    Line Wrapping

    Zooming

    Folding

    Hiding Lines

    Multi View

    Right-to-Left modus

    System tray

    Right-to-Left modus

    +

    The subjects described here control the appearance of the text in the screen.

    Viewing modes

    Unprintable Characters

    Line Wrapping

    Zooming

    Folding

    Hiding Lines

    Multi View

    Right-to-Left modus

    System tray

    +

    Right-to-Left modus

    +

    Shortcuts related with the View menu

    + \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Editing_Scint.html b/PowerEditor/misc/npp.help/HTML/Editing_Scint.html index dba547675..9a31ab25a 100644 --- a/PowerEditor/misc/npp.help/HTML/Editing_Scint.html +++ b/PowerEditor/misc/npp.help/HTML/Editing_Scint.html @@ -7,4 +7,16 @@ the keyboard (or the standard Input Method Editor (IME) for eastern asian langua needed. However, Notepad++ has many tools and aids to assist in editing files, mainly to automate repetitive tasks or speed up development.

    Notepad++ is based on the Scintilla edit control and relies on it to perform many -editing tasks, supplementing it if useful.

    Standard Operations

    Indentation

    Selecting text

    Overtype

    Auto Completion

    Column Mode Editing

    Commenting

    Other editing tools

    \ No newline at end of file +editing tasks, supplementing it if useful.
    +

    Standard Operations

    +

    Indentation

    +

    Selecting text

    +

    Overtype

    +

    Auto Completion

    +

    Column Mode Editing

    +

    Commenting

    +

    Other editing tools

    Mouse gestures

    Shortcuts related to Editing

    \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Encoding.html b/PowerEditor/misc/npp.help/HTML/Encoding.html index c340958ec..8f6b3a5d9 100644 --- a/PowerEditor/misc/npp.help/HTML/Encoding.html +++ b/PowerEditor/misc/npp.help/HTML/Encoding.html @@ -1,5 +1,5 @@ -Encoding +Encoding @@ -34,9 +34,9 @@ byte BOM will be added upon save.
    UTF-8 without BOM
    Like UTF-8, but no BOM is added. Saves three bytes, but makes encoding detection harder.
    UTF-16 Little Endian -
    All characters are two bytes in size, pairs are Little Endian ordered. A 4 byte BOM is added upon save. +
    All characters are two bytes in size, pairs are Little Endian ordered. A 2 byte BOM is added upon save.
    UTF-16 Big Endian -
    All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save. +
    All characters are two bytes in size, pairs are Big Endian ordered. A 2 byte BOM is added upon save.

    In addition, since version 5.6, Notepad++ supports changing the character set being used to display the text, exactly the way you can change it on most web browsers. Thiese encodings are available using the Character sets menu entry which comes right after the Encode in ... family items.

    Note that, for HTML and XML files, Notepad++ attempts to detect the encoding being used when the file is opened, thus avoiding a number of errors which may not show before the file is being used on a server. diff --git a/PowerEditor/misc/npp.help/HTML/File Creation.html b/PowerEditor/misc/npp.help/HTML/File Creation.html index 2f59e9c97..48a924719 100644 --- a/PowerEditor/misc/npp.help/HTML/File Creation.html +++ b/PowerEditor/misc/npp.help/HTML/File Creation.html @@ -1,12 +1,12 @@ - -File Creation - + +File Creation +

    Creating new files:

    To create a new file, go to File->New or press . A new empty tab -will appear with the title “New 1”, where the number depends on -how many new files you have created. +will appear with the title “New 1”, where the number depends on +how many new files you have created since you opened the current Notepad++ instance. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/File Management.html b/PowerEditor/misc/npp.help/HTML/File Management.html index 4bf812c76..aaa76cc00 100644 --- a/PowerEditor/misc/npp.help/HTML/File Management.html +++ b/PowerEditor/misc/npp.help/HTML/File Management.html @@ -1,15 +1,17 @@ - -File Management - + +File Management +

    File -management

    -

    How to manage your files: -

    Creating new files

    Opening  and Saving files

    Closing files

    Activating a file

    Editing files

    Read-only files - -

    +management +

    How to manage your files: +

    Creating new files

    Opening  and Saving files

    Closing files

    Activating a file

    Editing files

    +

    Read-only files +

    Shortcuts related to the File menu + +

    Note: See the section about the Windows dialog to see other methods to -manage your files. +manage your files. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/GUI elements.html b/PowerEditor/misc/npp.help/HTML/GUI elements.html index 43413ebf2..50e093b5a 100644 --- a/PowerEditor/misc/npp.help/HTML/GUI elements.html +++ b/PowerEditor/misc/npp.help/HTML/GUI elements.html @@ -1,16 +1,19 @@ -GUI elements - +GUI elements + + -

    GUI elements

    The main Notepad++ view consists of a few GUI elements. These sections elaborate a bit on them.


    Tab Bar

    Status Bar

    Tool Bar

    Menu

    Context Menu

    +

    GUI elements

    The main Notepad++ view consists of a few GUI elements. These sections elaborate a bit on them. Their names will display as a tooltip as the mouse hovers over the corresponding clickable areas on the big picture: +


    Tab Bar

    Status Bar

    Tool Bar

    Menu

    Context Menu

    Dockable Windows

    -Menu -Tool Bar -Tab Bar -Status Bar -Context Menu +Menu +Tool Bar +Tab Bar +Status Bar +Context Menu
    \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Loading Sessions.html b/PowerEditor/misc/npp.help/HTML/Loading Sessions.html index 912d3602f..6194fbbc9 100644 --- a/PowerEditor/misc/npp.help/HTML/Loading Sessions.html +++ b/PowerEditor/misc/npp.help/HTML/Loading Sessions.html @@ -1,14 +1,14 @@ - -Loading Sessions + +Loading Sessions -

    Loading sessions

    +

    Loading sessions

    To load a session, simply go to File->Load Session. Then select any session you like and it will -open the files contained in it, and restore their state. +open the files contained in it, and restore their state.

    If you have set a default session extension (for example, .session) for Notepad++, you can also open a session using the regular means to open a file. If the file has the extension for a session, Notepad++ will attempt to -load it (see also the section for Preferences -

    Depending if you have set a default extension for session files, you can filter for those files in the Load Session dialog. +load it (see also the section for Preferences +

    Depending on whether you have set a default extension for session files, you can filter for those files in the Load Session dialog. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Multi View.html b/PowerEditor/misc/npp.help/HTML/Multi View.html index b2f901ada..e55569f9a 100644 --- a/PowerEditor/misc/npp.help/HTML/Multi View.html +++ b/PowerEditor/misc/npp.help/HTML/Multi View.html @@ -37,9 +37,9 @@ the active view has a darker color of orange than the inactive view. Also, only the active view can have the caret. You can switch the active view by selecting View->Focus on other view. The active view determines what options are available from the menu or toolbar. -If the main view has a saved document, but the secondary view is -modified, you can only select the Save option if you have the -secondary view active. +If the main view has all documents saved, but the secondary view has +modified tabs, you can only select the Save option if the +secondary view is active.

    If you have the same document open in two views, they will share some properties, but some of them can be modified independently. These diff --git a/PowerEditor/misc/npp.help/HTML/Normal Search.html b/PowerEditor/misc/npp.help/HTML/Normal Search.html index 36406f3f9..37f729d22 100644 --- a/PowerEditor/misc/npp.help/HTML/Normal Search.html +++ b/PowerEditor/misc/npp.help/HTML/Normal Search.html @@ -70,6 +70,8 @@ from: – NULL character;

  • \x## - Hexadecimal value (between 00 and FF); +
  • \u#### +- Extended hexadecimal value (between 0000 and FFFF, meant for Unicode characters);
  • \d### - Decimal value (between 000 and 255);
  • \o### diff --git a/PowerEditor/misc/npp.help/HTML/Preferences.html b/PowerEditor/misc/npp.help/HTML/Preferences.html index 2bfa07261..59f48c571 100644 --- a/PowerEditor/misc/npp.help/HTML/Preferences.html +++ b/PowerEditor/misc/npp.help/HTML/Preferences.html @@ -323,7 +323,7 @@ of networked files.
    • MRU behavior - Enables the MRU style sort of files in the document switcher.
    Clickable link settings: -
    This feature optionally makes web addresses starting with http:// clickable. Double clicking opens that address in your browser, if any is +
    This feature optionally makes web addresses (all protocols) clickable. Double clicking opens that address in your browser, if any is installed and registered.
  • @@ -103,6 +107,14 @@ +
  • + + + +
  • + + +
  • @@ -140,12 +152,9 @@
  • - - - -
  • - - + + +
  • @@ -171,6 +180,10 @@ +
  • + + +
  • @@ -213,6 +226,10 @@ +
  • + + +
  • @@ -222,6 +239,10 @@ +
  • + + +