# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1298116604 -7200
# Node ID 128982e6689b25bff860874411cdc0c62368ed78
# Parent  4ea9da2b200100856e6a20409a578910322f6ec4# Parent  6dfed9a6cf5fa702d64890796358630070301826
Automated merge with file:///cygdrive/e/srv/hg/tips

diff -r 6dfed9a6cf5f -r 128982e6689b emacs.rst
--- a/emacs.rst	Sat Feb 19 13:56:37 2011 +0200
+++ b/emacs.rst	Sat Feb 19 13:56:44 2011 +0200
@@ -163,15 +163,18 @@
   emacs-minor-version
   window-system             - 'nil' if in terminal, 'w32' if native Windows build, 'x' if under X Window
   window-system-version     - for windows only
+  window-size-fixed
   operating-system-release  - release of the operating system Emacs is running on
   system-configuration      - like configuration triplet: cpu-manufacturer-os
+  system-configuration-options
   system-name               - host name of the machine you are running on
   system-time-locale
   system-type               - indicating the type of operating system you are using:
                               'gnu' (GNU Hurd), 'gnu/linux', 'gnu/kfreebsd' (FreeBSD),
                               'darwin' (GNU-Darwin, Mac OS X), 'ms-dos', 'windows-nt', 'cygwin'
   system-uses-terminfo
-  window-size-fixed
+  dynamic-library-alist or deprecated image-library-alist
+                            - alist of image types vs external libraries needed to display them
 
 and check functions:
 
diff -r 6dfed9a6cf5f -r 128982e6689b hg.rst
--- a/hg.rst	Sat Feb 19 13:56:37 2011 +0200
+++ b/hg.rst	Sat Feb 19 13:56:44 2011 +0200
@@ -27,10 +27,16 @@
 Put to your ~/.hgrc:
 
   [extensions]
-  ; To allow fetch command.
-  fetch =
+  ; To allow 'fetch' command.
+  hgext.fetch =
   ; To allow Mercurial Queues.
   hgext.mq =
+  ; To import revisions from foreign VCS repositories into Mercurial.
+  hgext.convert =
+  ; Usage:  hg glog <dir>
+  hgext.graphlog =
+  ; Enable '.hgeol' tracking (fix for CR/LF).
+  hgext.eol =
 
 ** Multiline log message for log command.
 
@@ -279,6 +285,11 @@
 
   $ hg qref -e
 
+* Show supported/loaded plugin.
+
+  $ hg help extensions
+  $ hg showconfig extensions
+
 * Proxy.
 
   $ hg clone --config http_proxy.host=$host:$port \
@@ -288,3 +299,4 @@
 
   http://mercurial.selenic.com/wiki/MercurialHosting
                 Free Hosting of Mercurial Repositories
+
diff -r 6dfed9a6cf5f -r 128982e6689b msvc.rst
--- a/msvc.rst	Sat Feb 19 13:56:37 2011 +0200
+++ b/msvc.rst	Sat Feb 19 13:56:44 2011 +0200
@@ -104,3 +104,28 @@
 v6.1: MSVC 2005, 2008 + express
 v7.0: MSVC 2008 + express
 v7.1: MSVC 2005, 2008, 2010 + express
+
+* Build MSVC project from command line.
+
+  cmd> cd %proj%
+  cmd> %WINDIR%\Microsoft.NET\Framework\v2.0.50727\msbuild.exe  file.sln
+
+'msbuild.exe' can not upgrade Visual Studio project files, so you better use 'vcbuild.exe' (which
+present in MSVC version 8.0/9.0):
+
+  cmd> cd %proj%
+  cmd> %MSVC_ROOT%\VC\vcpackages\vcbuild.exe  file.sln
+  cmd> %MSVC_ROOT%\VC\bin\amd64\vcbuild.exe  file.vcproj
+
+  cmd> cd %proj%
+  cmd> %MSVC_ROOT%\Common7\IDE\devenv.exe  /Clean file.sln
+  cmd> %MSVC_ROOT%\Common7\IDE\devenv.exe  /Build file.sln
+  cmd> %MSVC_ROOT%\Common7\IDE\devenv.exe  /Deploy file.sln
+
+  http://msdn.microsoft.com/en-us/library/ms164311.aspx
+                MSBuild Command Line Reference
+  http://msdn.microsoft.com/en-us/library/kdxzbw9t.aspx
+                VCBUILD Command Line
+  http://msdn.microsoft.com/en-us/library/xee0c8y7.aspx
+                Devenv Command Line Switches
+