Automated merge with file:///e:\srv\hg\admin-doc
authorOleksandr Gavenko <gavenkoa@gmail.com>
Wed, 13 Jan 2010 21:52:17 +0200
changeset 278 a58e223b692f
parent 273 47bd3ab92f6f (current diff)
parent 277 5c7e19c15332 (diff)
child 279 061995ef35d2
Automated merge with file:///e:\srv\hg\admin-doc
--- a/bash.rst	Sun Jan 10 22:09:53 2010 +0200
+++ b/bash.rst	Wed Jan 13 21:52:17 2010 +0200
@@ -13,13 +13,13 @@
 
   $ xterm -e bash -i -c "mc -x"
 
-That make bash interactive and init file read.
+That make bash interactive and init file was readed.
 
 * Command history.
 
-Bash allow accessing to command that you type previously. There are exist
-several options to control command history behavior. Set corresponding
-variables in your ~/.bashrc file (which is read by interactive shell):
+Bash allow accessing to command that you type previously. There are several
+options to control command history behavior. Set corresponding variables in
+your ~/.bashrc file (which is read by interactive shell):
 
   #   ignorespace do not save lines that start with space
   #   erasedups all previous lines matching the current line to be removed from
@@ -27,7 +27,7 @@
   export HISTCONTROL=igrorespace:erasedups
   export HISTIGNORE=" ?cd *":"e *":"sudo mv *":"sudo rm *":"sudo cp *":"sudo mkdir *":"sudo chmod *":"sudo chown *":ls:pwd:"vlc*"
 
-There are another options, with default values (which satisfy my neediness, so
+There are another options, with default values (which satisfy my needs, so
 I don't put they to ~/.bashrc):
 
   export HISTFILE=~/.bash_history  # where is command history stored
--- a/emacs.rst	Sun Jan 10 22:09:53 2010 +0200
+++ b/emacs.rst	Wed Jan 13 21:52:17 2010 +0200
@@ -105,7 +105,7 @@
 
   $ cmd
   $ cd emacs\nt
-  $ configure.bat --with-gcc --cflags -Ic:/opt/gnuwin32/include
+  $ configure.bat --prefix %INST_ROOT% --with-gcc --cflags -I%GNUWIN32_ROOT%/include --ldflags -L%GNUWIN32_ROOT%/lib  --ldflags -lregex
   $ make bootstrap
   $ make info
   $ make install