SF.net SVN: geany: [788] trunk

[ntrel at users.sourceforge.net]

Revision: 788
          http://svn.sourceforge.net/geany/?rev=788&view=rev
Author:   ntrel
Date:     2006-09-04 06:44:15 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Update command-line options and running instance behaviour

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.docbook

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-09-04 11:16:07 UTC (rev 787)
+++ trunk/ChangeLog	2006-09-04 13:44:15 UTC (rev 788)
@@ -4,6 +4,8 @@
    Rename --no-socket, -s command-line option to --new-instance, -i.
    Add --no-session, -s command-line option to not load session files.
    Only save session when session files were loaded at startup.
+ * doc/geany.docbook:
+   Update command-line options and running instance behaviour.
 
 
 2006-09-03  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook	2006-09-04 11:16:07 UTC (rev 787)
+++ trunk/doc/geany.docbook	2006-09-04 13:44:15 UTC (rev 788)
@@ -239,6 +239,12 @@
 						</thead>
 						<tbody>
 							<row>
+								<entry>-s</entry>
+								<entry>--no-session</entry>
+								<entry>Don't load the previous session's files.
+								</entry>
+							</row>
+							<row>
 								<entry>-n</entry>
 								<entry>--no-ctags</entry>
 								<entry>Do not load auto completion and call tip data.
@@ -253,8 +259,8 @@
 								</entry>
 							</row>
 							<row>
-								<entry>-p</entry>
-								<entry>--no-pipe</entry>
+								<entry>-i</entry>
+								<entry>--new-instance</entry>
 								<entry>Do not open files in a running instance, force opening a new instance.
 								</entry>
 							</row>
@@ -329,20 +335,22 @@
 					on the compile time option GEANY_SESSION_FILES; the default is 15. For details see
 					<xref linkend="cto"/>.
 				</para>
-			</section>
-			<section id="general_fifo">
-				<title>Detection of a running instance</title>
 				<para>
-					&app; detects an already running instance of itself and opens new files in the already running one.
-					So, you can use &app; like an editor to view and edit files by opening them from other
-					programs. If you do not like this for some reason, you can disable it with the appropriate
-					command line option.
+					You can start several instances of Geany, but only the first will load files
+					from the last session. To run a second instance of Geany, do not specify any
+					filenames on the command-line, or disable opening files in a running instance
+					using the appropriate command line option.
 				</para>
+			</section>
+			<section id="general_instance">
+				<title>Opening files from the command-line in a running instance</title>
 				<para>
-					In the case that &app; crashed, you will get a message dialog at the next start,
-					which asks you whether to delete an existing named pipe. If you are sure that there is
-					no other instance of &app; is running, you can say Yes and &app; will start as usual.
-					Otherwise click No and Geany will not start.
+					&app; detects an already running instance of itself and opens files from the
+					command-line in the already running instance.
+					So, &app; can be used to view and edit files by opening them from other
+					programs such as a file manager. If you do not like this for some reason,
+					you can disable using the first instance by using the appropriate command line
+					option - see <xref linkend="clo"/>.
 				</para>
 			</section>
 			<section id="general_vte">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.