Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

[UPDATE] (Author : Christian Cuvier) Update NppHelp. [#45] Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
npp-community · Sep 30, 2010 · c69ffb5 · c69ffb5
2 parents 92e1692 + 5329e12
commit c69ffb5
Show file tree

Hide file tree

Showing 20 changed files with 124 additions and 44 deletions.
diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm
diff --git a/PowerEditor/misc/npp.help/HTML/Auto Completion.html b/PowerEditor/misc/npp.help/HTML/Auto Completion.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Auto Completion</title>
+<html><head><meta content="text/html; charset=utf-8" http-equiv="content-type"><title>Auto Completion</title>
 <link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body><h1>Auto completion</h1>
@@ -18,7 +18,7 @@
 typed (see also&nbsp;<a href="Preferences.html#Backup_Auto-Completion">Preferences</font></a>).<br><img src="images\screenshots\autocomp.png">
 </li><li>The second one retrieves
 all the words from the current file and provides hinting on that,
-named <span style="font-weight: bold;">Word Completion</span>. This is triggered by selecting <span class="menu_item">Edit-&gt;Auto-Completion->&gt;Word
+named <span style="font-weight: bold;">Word Completion</span>. This is triggered by selecting <span class="menu_item">Edit-&gt;Auto-Completion-&gt;Word
 Completion</span>, or by entering a set number of characters (again, see&nbsp;<a href="Preferences.html#Backup_Auto-Completion">Preferences</a>). Word completion is the only type that can
 automatically finish a word without displaying a list of options
 first.
@@ -32,5 +32,5 @@
 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 <span class="menu_item">Edit-&gt;Auto-Completion-&gt;Function parameters hint</span>.<p>Autocompletion
 is language based (see <a href="Languages.html">Languages</a>) and has different API files for
-each language. For more details on these API files and how to make your own, refer to <a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Auto_Completion">NpWiki++</a>.
+each language. For more details on these XML files and how to make your own ones, please refer to <a target="_blank" href="http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Auto_Completion">NpWiki++</a>.
 </body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html b/PowerEditor/misc/npp.help/HTML/Column Mode Editing.html
@@ -4,7 +4,7 @@
 </head>
 <body>
 <h1>Column Mode editing</h1>
-
+<h2>Editing rectangilar areas</h2>
 <p>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 @@ <h1>Column Mode editing</h1>
 Column mode selection, depress the <span class="shortcut">Alt</span> key (default) when selecting
 text (using <span class="shortcut">mouse</span> or <span class="shortcut">cursor keys</span>), 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&nbsp;<a href="Styler%20Configurator.html">Styler Configurator</a> 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&nbsp;<a href="Styler%20Configurator.html">Styler Configurator</a> for more
 information).
 <p>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 <span class="menu_item">Edit-&gt;Undo</span> feature, instead of the <span class="shortcut">Backspace</span> key.
-<p><img style="width: 341px; height: 357px;" alt="" src="Images/Screenshots/column_editor.png"><p>
-
+<p>
+<table align="center" border="1">
+<th><tr><td>Before typing "done"<td>After typing "dne"</th>
+<tr>
+<td><img  alt="" src="Images/Screenshots/col_edit_before.png">
+<td><img  alt="" src="Images/Screenshots/col_edit_after.png">
+</tr></table>
+<h2>The column editor</h2>
 <p>The
 <span style="font-weight: bold;">Column Editor dialog</span> is designed to make working with columns easier.
 It can be opened by selecting <span class="menu_item">Edit-&gt;Column Editor</span>.
+<p><img style="width: 341px; height: 357px;" alt="" src="Images/Screenshots/column_editor.png"><p>
+
 <p>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
@@ -24,6 +24,9 @@ <h1>Command
 <dd> Start editing in Column mode.
 <dt>--help
 <dd> Displays this list, i.e. all the command line switches
+<dt>-loadingTime
+<dd> 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.
 <dt>-multiInst
 <dd> 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 @@ <h1>Command
 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</td></tr></tbody></table>
+yaml,r, jsp</td></tr></tbody></table>
 <dt>Files
 <dd>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
@@ -3,7 +3,8 @@
 <link rel="stylesheet" href="styles.css" type="text/css"></head>
 <body>
 <h1>Context Menu</h1>
-<p>The
+<img align="left" src="Images/Screenshots/contextmenu.png" alt="" style="width:120px; height:240px;"/>
+The
 context menu can be reached by <span class="shortcut">rightclicking</span> 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
@@ -3,5 +3,8 @@
 <link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body><h1>Display</h1>
-<p>The subjects described here control the appearance of the text in the screen.<br><p><a href="Viewing%20modes.html">Viewing modes</a></p><p><a href="Unprintable%20characters.html">Unprintable Characters</a></p><p><a href="Wrapping.html">Line Wrapping</a></p><p><a href="Zooming.html">Zooming</a></p><p><a href="Folding.html">Folding</a></p><p><a href="Hiding%20lines.html">Hiding Lines</a></p><p><a href="Multi%20View.html">Multi View</a></p><p><a href="RTL.html">Right-to-Left modus</a></p><p><a href="System%20Tray.html">System tray</a></p><p><a href="RTL.html">Right-to-Left modus</a></p>
+<p>The subjects described here control the appearance of the text in the screen.<br><p><a href="Viewing%20modes.html">Viewing modes</a></p><p><a href="Unprintable%20characters.html">Unprintable Characters</a></p><p><a href="Wrapping.html">Line Wrapping</a></p><p><a href="Zooming.html">Zooming</a></p><p><a href="Folding.html">Folding</a></p><p><a href="Hiding%20lines.html">Hiding Lines</a></p><p><a href="Multi%20View.html">Multi View</a></p><p><a href="RTL.html">Right-to-Left modus</a></p><p><a href="System%20Tray.html">System tray</a></p>
+<p><a href="RTL.html">Right-to-Left modus</a></p>
+<p><a href="Display%20Shortcuts.html">Shortcuts related with the View menu</a></p>
+
 </body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/Editing_Scint.html b/PowerEditor/misc/npp.help/HTML/Editing_Scint.html
@@ -7,4 +7,16 @@
 needed. However, Notepad++ has many tools and aids to assist in editing
 files, mainly to automate repetitive tasks or speed up development.<p>Notepad++
 is based on the Scintilla edit control and relies on it to perform many
-editing tasks, supplementing it if useful.<br><p><a href="Standard%20Operations.html">Standard Operations</a></p><p><a href="Indentation.html">Indentation</a></p><p><a href="Selecting.html">Selecting text</a></p><p><a href="Overtype.html">Overtype</a></p><p><a href="Auto%20Completion.html">Auto Completion</a></p><p><a href="Column%20Mode%20Editing.html">Column Mode Editing</a></p><p><a href="Commenting.html">Commenting</a></p><p><a href="Other%20editing%20tools.html">Other editing tools</a></p></body></html>
+editing tasks, supplementing it if useful.<br>
+<p><a href="Standard%20Operations.html">Standard Operations</a></p>
+<p><a href="Indentation.html">Indentation</a></p>
+<p><a href="Selecting.html">Selecting text</a></p>
+<p><a href="Overtype.html">Overtype</a></p>
+<p><a href="Auto%20Completion.html">Auto Completion</a></p>
+<p><a href="Column%20Mode%20Editing.html">Column Mode Editing</a></p>
+<p><a href="Commenting.html">Commenting</a></p>
+<p><a href="Other%20editing%20tools.html">Other editing tools</a></p
+<p><a href="Mouse%20Gestures.html">Mouse gestures</a></p
+<p><a href="Edit%20Shortcuts.html">Shortcuts related to Editing</a></p
+
+></body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/Encoding.html b/PowerEditor/misc/npp.help/HTML/Encoding.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Encoding</title>
+<html><head><meta content="text/html; charset=utf-8" http-equiv="content-type"><title>Encoding</title>
 <link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body>
@@ -34,9 +34,9 @@ <h1>Encoding</h1>
 <dt>UTF-8 without BOM
 <dd> Like UTF-8, but no BOM is added. Saves three bytes, but makes encoding detection harder.
 <dt>UTF-16 Little Endian
-<dd> All characters are two bytes in size, pairs are Little Endian ordered. A 4 byte BOM is added upon save.
+<dd> All characters are two bytes in size, pairs are Little Endian ordered. A 2 byte BOM is added upon save.
 <dt>UTF-16 Big Endian
-<dd> All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save.
+<dd> All characters are two bytes in size, pairs are Big Endian ordered. A 2 byte BOM is added upon save.
 </dl>
 <p>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 <span class="menu_item">Character sets</span> menu entry which comes right after the <span class="menu_item">Encode in ...</span> family items.
 <p>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
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>File Creation</title>
+<html><head><meta content="text/html; charset=utf-8" http-equiv="content-type"><title>File Creation</title>
 <link rel="stylesheet" href="styles.css" type="text/css">
 </head>
 <body>
 <h1>Creating
 new files:</h1>
 <p>To
 create a new file, go to <span class="menu_item">File-&gt;New</span> or press  <img style="width: 16px; height: 16px;" alt="" src="Images/Toolbar/newFile.png">. A new empty tab
-will appear with the title &#8220;New 1&#8221;, 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.
 </body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/File Management.html b/PowerEditor/misc/npp.help/HTML/File Management.html
@@ -6,7 +6,9 @@
 <h1>File
 management</h1>
 <p>How to manage your files:
-<p style="margin-bottom: 0in;"><a href="File%20Creation.html"><font face="Times New Roman, serif">Creating new files</font></a></p><p style="margin-bottom: 0in;"><font face="Times New Roman, serif"><a href="Opening%20and%20Saving.html">Opening &nbsp;and Saving files</a></font></p><p style="margin-bottom: 0in;"><a href="Closing.html"><font face="Times New Roman, serif">Closing files</font></a></p><p style="margin-bottom: 0in;"><a href="Activating.html"><font face="Times New Roman, serif">Activating a file</font></a></p><p style="margin-bottom: 0in;"><a href="Editing.html"><font face="Times New Roman, serif">Editing files</font></a></p><p style="margin-bottom: 0in;"><a href="Read-Only.html"><font face="Times New Roman, serif">Read-only files</font></a>
+<p style="margin-bottom: 0in;"><a href="File%20Creation.html"><font face="Times New Roman, serif">Creating new files</font></a></p><p style="margin-bottom: 0in;"><font face="Times New Roman, serif"><a href="Opening%20and%20Saving.html">Opening &nbsp;and Saving files</a></font></p><p style="margin-bottom: 0in;"><a href="Closing.html"><font face="Times New Roman, serif">Closing files</font></a></p><p style="margin-bottom: 0in;"><a href="Activating.html"><font face="Times New Roman, serif">Activating a file</font></a></p><p style="margin-bottom: 0in;"><a href="Editing.html"><font face="Times New Roman, serif">Editing files</font></a></p>
+<p style="margin-bottom: 0in;"><a href="Read-Only.html"><font face="Times New Roman, serif">Read-only files</font></a>
+<p style="margin-bottom: 0in;"><a href="File%20Shortcuts.html"><font face="Times New Roman, serif">Shortcuts related to the File menu</font></a>
 
 <p>
 Note:

diff --git a/PowerEditor/misc/npp.help/HTML/GUI elements.html b/PowerEditor/misc/npp.help/HTML/GUI elements.html
@@ -1,16 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>GUI elements</title>
+<html><head><meta content="text/html; charset=utf-8" http-equiv="content-type"><title>GUI elements</title>
 <link rel="stylesheet" href="styles.css" type="text/css">
+
 </head>
-<body><h1>GUI elements</h1>The main Notepad++ view consists of a few GUI elements. These sections elaborate a bit on them.<p><img style="width: 840px; height: 551px;" alt="" src="Images/Screenshots/main.png" usemap="#main" class="annotated"><br><p><a href="Tab%20Bar.html">Tab Bar</a></p><p><a href="Status%20Bar.html">Status Bar</a></p><p><a href="Tool%20Bar.html">Tool Bar</a></p><p><a href="Menu.html">Menu</a></p><p><a href="Context%20Menu.html">Context Menu</a></p>
+<body><h1>GUI elements</h1>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:
+<p><img style="width: 630px; height: 413px;" alt="" src="Images/Screenshots/main.png" usemap="#main"
+class="annotated"><br><p><a href="Tab%20Bar.html">Tab Bar</a></p><p><a href="Status%20Bar.html">Status Bar</a></p><p><a href="Tool%20Bar.html">Tool Bar</a></p><p><a href="Menu.html">Menu</a></p><p><a href="Context%20Menu.html">Context Menu</a></p>
 <p><a href="Dockable%20Windows.html">Dockable Windows</a></p>
 <div>
 <map id="main" name="main">
-<area shape="rect" alt="Menu" coords="5,23,835,41" href="Menu.html" title="Menu" />
-<area shape="rect" alt="Tool Bar" coords="5,43,835,67" href="Tool%20Bar.html" title="Tool Bar" />
-<area shape="rect" alt="Tab Bar" coords="5,70,835,91" href="Tab%20Bar.html" title="Tab Bar" />
-<area shape="rect" alt="Status Bar" coords="4,528,835,547" href="Status%20Bar.html" title="Status Bar" />
-<area shape="rect" alt="Context Menu" coords="191,204,337,449" href="Context%20Menu.html" title="Context Menu" />
+<area shape="rect" alt="Menu" coords="4,17,626,31" href="Menu.html" title="Menu" />
+<area shape="rect" alt="Tool Bar" coords="4,32,626,50" href="Tool%20Bar.html" title="Tool Bar" />
+<area shape="rect" alt="Tab Bar" coords="4,53,626,68" href="Tab%20Bar.html" title="Tab Bar" />
+<area shape="rect" alt="Status Bar" coords="3,396,626,410" href="Status%20Bar.html" title="Status Bar" />
+<area shape="rect" alt="Context Menu" coords="143,153,253,337" href="Context%20Menu.html" title="Context Menu" />
 </map>
 </div>
 </body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/Loading Sessions.html b/PowerEditor/misc/npp.help/HTML/Loading Sessions.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><title>Loading Sessions</title>
+<html><head><meta content="text/html; charset=utf-8" http-equiv="content-type"><title>Loading Sessions</title>
 <link rel="stylesheet" href="styles.css" type="text/css"></head>
 <body><h1>Loading sessions</h1>
 <p>To load a session, simply go to
@@ -10,5 +10,5 @@
 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 <a href="Preferences.html#MISC">Preferences</a>
-<p>Depending if you have set a default extension for session files, you can filter for those files in the Load Session dialog.
+<p>Depending on whether you have set a default extension for session files, you can filter for those files in the Load Session dialog.
 </body></html>
diff --git a/PowerEditor/misc/npp.help/HTML/Multi View.html b/PowerEditor/misc/npp.help/HTML/Multi View.html
@@ -37,9 +37,9 @@ <h1>Multi
 Also, only the active view can have the caret. You can switch the
 active view by selecting <span class="menu_item">View-&gt;Focus on other view</span>. 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.
 <p>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
@@ -70,6 +70,8 @@ <h1>Normal search</h1>
 – NULL character;</font>
 </li><li><font face="Times New Roman, serif">\x##
 - Hexadecimal value (between 00 and FF);</font>
+</li><li><font face="Times New Roman, serif">\u####
+- Extended hexadecimal value (between 0000 and FFFF, meant for Unicode characters);</font>
 </li><li><font face="Times New Roman, serif">\d###
 - Decimal value (between 000 and 255);</font>
 </li><li><font face="Times New Roman, serif">\o###

diff --git a/PowerEditor/misc/npp.help/HTML/Preferences.html b/PowerEditor/misc/npp.help/HTML/Preferences.html
@@ -323,7 +323,7 @@ <h2><a name="MISC"></a>MISC</h2><p>
 MRU behavior</span> - Enables the MRU style sort of files in the document
 switcher.</li></ul></span>
 <dt>Clickable link settings:
-<dd>This feature optionally makes web addresses starting with http:// clickable. Double clicking opens that address in your browser, if any is
+<dd>This feature optionally makes web addresses (all protocols) clickable. Double clicking opens that address in your browser, if any is
 installed and registered.
 <ul><li>
 <span class="checkbox">Enable</span>

diff --git a/PowerEditor/misc/npp.help/HTML/Searching.html b/PowerEditor/misc/npp.help/HTML/Searching.html
@@ -6,4 +6,7 @@
 <h1>Searching</h1>
 <p>There
 are multiple methods to search (and replace) text in files. You can
-also mark search results with bookmarks, or highlight them.<p><a href="Normal%20Search.html">Normal Search</a></p><p><a href="Replacing.html">Replacing</a></p><p><a href="Searching%20in%20Files.html">Searching in Files</a></p><p><a href="Search%20window.html">Search results window</a></p><p><a href="Continued%20search.html">Continued Search</a></p><p><a href="Volatile%20Search.html">Volatile Search</a></p><p><a href="Marking%20search%20results.html">Marking Search Results</a></p><p><a href="Incremental%20search.html">Incremental Search</a></p><p><a href="Go%20to%20dialog.html">Go to dialog</a></p><p><a href="Smart%20Highlighting.html">Smart Highlighting</a></p><p><a href="Brace%20Matching.html">Brace Matching</a></p><p><a href="Bookmarks.html">Bookmarks</a></p></body></html>
+also mark search results with bookmarks, or highlight them.<p><a href="Normal%20Search.html">Normal Search</a></p><p><a href="Replacing.html">Replacing</a></p><p><a href="Searching%20in%20Files.html">Searching in Files</a></p><p><a href="Search%20window.html">Search results window</a></p><p><a href="Dialog%20free%20search.html">Dialog free Search</a></p><p><a href="Volatile%20Search.html">Volatile Search</a></p><p><a href="Marking%20search%20results.html">Marking Search Results</a></p><p><a href="Incremental%20search.html">Incremental Search</a></p><p><a href="Go%20to%20dialog.html">Go to dialog</a></p><p><a href="Smart%20Highlighting.html">Smart Highlighting</a></p><p><a href="Brace%20Matching.html">Brace Matching</a></p>
+<p><a href="Bookmarks.html">Bookmarks</a></p>
+<p><a href="Search%20Shortcuts.html">Shortcuts related with the Search menu</a></p>
+</body></html>