<newsletter:master> Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

[Russell Dickenson]

Updating branch refs/heads/master
         to 5595e54291477ecbe5cc8280b1ad42ab7267c1b5 (commit)
       from f774a2aec1a64552dcc87a3e568fe4edff10069d (commit)

commit 5595e54291477ecbe5cc8280b1ad42ab7267c1b5
Merge: f774a2a 9c3ef34
Author: Russell Dickenson <russelldickenson at gmail.com>
Date:   Mon Apr 18 22:00:57 2011 +1000

    Merge branch 'master' of git+ssh://git.geany.org/git/newsletter

commit 9c3ef34d064fbd26fd1a3c0f87a1b4b28e9a1d09
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Sun Apr 17 15:19:24 2011 +0200

    Small update to try to reflect refactoring of geanycfp plugin with its new childs.
    
    Still some work need at end when William's work is done.

commit fed15dc89d3950077a749bce34dbaecf07220bbc
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Sun Apr 17 15:12:25 2011 +0200

    Add a stub for geanyVC stats

commit b8acb06fcf1609b9c49e258901b4e3e60bd03bdf
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Tue Apr 12 21:27:03 2011 +0200

    Fix a minor typo

commit 9c825cdcce948f4ca145972c4053b2cc62dba682
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Tue Apr 12 21:25:47 2011 +0200

    Fix path for images.
    
    Still pending is configuring of image size on pdf creation

 vol_2/newsletter_2.rst |   47 +++++++++++++++++++++++++++++------------------
 1 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/vol_2/newsletter_2.rst b/vol_2/newsletter_2.rst
index 9313fa1..8a65853 100644
--- a/vol_2/newsletter_2.rst
+++ b/vol_2/newsletter_2.rst
@@ -62,6 +62,7 @@ To enable automatic detection of indentation width, open the Preferences
 dialog and check `Detect width from file` in the `Editor->Indentation`
 section.
 
+
 Fixes to template encoding
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -77,12 +78,23 @@ New plugins
 
 geanycfp
 ********
+Back in January, William Frasser added with
+geanycfp a new plugin which added a couple of new functions to
+Geany's plugin pool which might be interesting to users.
+
+Remembering fold states:
+
+By default, Geany does not remember the status of folding when
+reloading a file e.g. on startup. This can be annoying if you have a
+huge number of nested structures e.g. inside an XML-document. This
+feature helps you to remember these states so you don't need to fold
+up after loading.
 
-Back in January, William Frasser added with geanycfp a new plugin
-which added a couple of new functions to Geany's plugin pool
-which might be interesting to users.
+After some time this plugin has bee splitted up into
+GeanyNumberedBookmarks and GeanyMacro.
 
-Numbered Bookmarks:
+GeanyNumberedBookmarks
+######################
 
 The plugin adds an option to store bookmarks in files and
 directly access them via a keybinding.
@@ -94,7 +106,9 @@ number then it removes the bookmark, otherwise it will move the
 bookmark there if it was set on a different line, or create it if it
 had not already been set.
 
-Macros:
+
+GeanyMacro
+##########
 
 Macros are well known from other tools. Users of Photoshop are
 always saying how amazing the batch processing is for
@@ -105,13 +119,7 @@ could be very helpful if you e.g. need to remove the last two letters
 of a line and search & replace or rectangle selection are not able
 to solve the request.
 
-Remembering fold states:
 
-By default, Geany does not remember the status of folding when
-reloading a file e.g. on startup. This can be annoying if you have a
-huge number of nested structures e.g. inside an XML-document. This
-feature helps you to remember these states so you don't need to
-fold up after loading.
 
 
 
@@ -149,6 +157,9 @@ upstream.  Geany is no longer required to use the previously mentioned trick,
 and so the plugin will be re-enabled for the Windows build, with equivalent
 functionality as it has on other platforms.
 
+A view onto GeanyVC usage
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
 
 Let us introduce you...
 =======================
@@ -162,9 +173,9 @@ Plugin Focus
 Save Actions
 ************
 
-The Save Actions plugin adds options available to you when saving files, 
+The Save Actions plugin adds options available to you when saving files,
 including: Auto Save, Instant Save and Backup Copy. Each of the options
-can be enabled idepdendently of the others but they can be even more
+can be enabled interdependently of the others but they can be even more
 powerful when used in combination. Read on, discover their functions, and
 judge for yourself if this plugin might make your use of Geany easier and
 more productive.
@@ -194,16 +205,16 @@ Backup Copy
 
 .. image:: ../img/issue2_saveactions_3.png
 
-Backup Copy will keep backup copies of files as you save them. Instead of 
-cluttering the file's own directory, the backups are stored in a specific 
-directory. So that you can identify when each backup was created, the backup 
+Backup Copy will keep backup copies of files as you save them. Instead of
+cluttering the file's own directory, the backups are stored in a specific
+directory. So that you can identify when each backup was created, the backup
 files have the current date and time added to the end of their names, with
 the date and time format being configurable. To make finding your backups
 even easier there is even an option to recreate the directory structure in
 which the current file is stored.
 
-When combined with the Auto Save option, the Backup Copy option can provide 
-a basic form of versioning with a backup copy of your file(s) every time 
+When combined with the Auto Save option, the Backup Copy option can provide
+a basic form of versioning with a backup copy of your file(s) every time
 they were saved. A version control system such as git, Subversion or Mercurial
 is definitely recommended instead when possible.