# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1299190866 -7200
# Node ID 061a87405014ea37a12215ce832cd7ce4ad00cd0
# Parent  c7002e98c1d5ccd42e0847a9c58d23c6fb81361a# Parent  a6d2c01cc279bbea139c9d8d438c249fade11a5d
merged

diff -r a6d2c01cc279 -r 061a87405014 autotools.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/autotools.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -0,0 +1,6 @@
+-*- mode: outline; coding: utf-8 -*-
+
+* Regenerate all autotools confetti.
+
+  $ autoreconf
+
diff -r a6d2c01cc279 -r 061a87405014 cpp.rst
--- a/cpp.rst	Wed Mar 02 20:32:01 2011 +0200
+++ b/cpp.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -32,3 +32,13 @@
 ** Sun Studio C/C++ compiler.
 
   $ cc -## EMPTY.c
+
+** IBM AIX XL C/C++ compiler.
+
+  $ cc -qshowmacros -E EMPTY.c
+
+** Visual Studio compiler.
+
+  http://msdn.microsoft.com/en-us/library/b0084kay.aspx
+                Predefined Macros
+
diff -r a6d2c01cc279 -r 061a87405014 docbook.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docbook.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -0,0 +1,11 @@
+-*- mode: outline; coding: utf-8; fill-column: 80 -*-
+
+* About.
+
+* DocBook Project.
+
+The DocBook Project supports the open-source development of a variety of DocBook
+resources; in particular, the DocBook XSL stylesheets.
+
+  http://docbook.sourceforge.net/
+
diff -r a6d2c01cc279 -r 061a87405014 emacs.rst
--- a/emacs.rst	Wed Mar 02 20:32:01 2011 +0200
+++ b/emacs.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -302,6 +302,7 @@
 
   (message "%S" '(a b 123 "hello" 'set))
   (pp '(a b 123 "hello" 'set))
+  (prin1-to-string '(1 2))
 
 * File manager.
 
diff -r a6d2c01cc279 -r 061a87405014 git.rst
--- a/git.rst	Wed Mar 02 20:32:01 2011 +0200
+++ b/git.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -24,6 +24,8 @@
 
 *** Cygwin.
 
+  $ setup.exe -p git
+
 *** MSys.
 
 Native port.
@@ -35,6 +37,17 @@
 
   http://code.google.com/p/msysgit
 
+* git over proxy.
+
+Only http:// protocol support proxy (not git://).
+
+  $ export http_proxy="http://username:password@proxy:port/"
+  $ git clone http://github.com/$user/$proj.git $proj
+
+You can store proxy settings under repository local config file:
+
+  $ git config http.proxy http://$user:$passwd@$ip:$port
+
 * Start your project.
 
 Setup proj space on fs.
@@ -107,7 +120,7 @@
 
 * Doing changes.
 
-  $ printf "clean:\n<TAB>rm $(wildcard *.o)" >>Makefile
+  $ printf "clean:\n<TAB>rm $(wildcard *.o)\n" >>Makefile
   $ git diff
 diff --git a/Makefile b/Makefile
 index e84f7e9..cd2438a 100644
@@ -120,7 +133,6 @@
 +
 +clean:
 +       rm -f *.o
-\ No newline at end of file
   $ git add Makefile
   $ git commit -m "Added clean target."
 Created commit 11272b9: Added clean target.
@@ -131,6 +143,32 @@
 
   $ git commit -a -m "Added clean target."
 
+* git analog of 'hg incoming'.
+
+git does not directly support such feature. You can emulate it by:
+
+  $ git fetch
+  $ git log master..origin/master   # or just '..origin/master'
+
+By previous commands you grab changes from remote server! You can apply them:
+
+  TODO
+  $ git merge
+
+* git analog of 'hg outgoing'.
+
+git does not directly support such feature. You can emulate it by:
+
+  $ git fetch
+  $ git log origin/master..master   # or just 'origin/master..'
+
+* Debug git network operation.
+
+Git uses libcurl for network operation.
+
+  $ export GIT_CURL_VERBOSE=1
+  $ git ...
+
 * Using git to work with SVN offline.
 
 Prepare SVN and git utilities:
diff -r a6d2c01cc279 -r 061a87405014 printer.rst
--- a/printer.rst	Wed Mar 02 20:32:01 2011 +0200
+++ b/printer.rst	Fri Mar 04 00:21:06 2011 +0200
@@ -108,3 +108,13 @@
  * добавить пользователей, которые имеют право на печать - "Set Allowed User"
 
 Пробуем напечатать пробную страницу.
+
+* Virtual printer.
+
+** PDFCreator.
+
+Free/GPL virtual printer for Windows.
+
+  http://www.pdfforge.org/
+                home page
+  http://ru.wikipedia.org/wiki/PDFCreator