# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1264490313 -7200
# Node ID b459dde3d002b5e1677db7c0be59ff950d18d6f1
# Parent  74036be9b6f9a10e9cca17b54791cf25681a8d58# Parent  2d8d35916ef77265dbeb303720247b3e9ca61bcc
meged

diff -r 2d8d35916ef7 -r b459dde3d002 emacs.rst
--- a/emacs.rst	Fri Jan 22 15:04:49 2010 +0200
+++ b/emacs.rst	Tue Jan 26 09:18:33 2010 +0200
@@ -114,6 +114,26 @@
 
 ** Elisp documentation.
 
+  ;;; <file-name>.el --- <one-line-description>
+
+  ;; Copyright (C) <years> <person>
+
+  ;; Author: <person> <mail>
+  ;; Maintainer: <person> <mail>
+  ;; Created: <date>
+  ;; Version: <version>
+  ;; Keywords: <look for 'finder-by-keyword' output, separate by comma>
+  ;; URL: <file-location>
+
+  ;;; Commentary:
+  <bla-bla-bla>
+  ;;; Code:
+  <lisp-code>
+  ;;; <file-name> ends here
+
+See
+
+  http://www.gnu.org/software/emacs/elisp-manual/html_node/Library-Headers.html
   http://www.emacswiki.org/cgi-bin/wiki/ElispAreaConventions
 
 *** CheckDoc.
diff -r 2d8d35916ef7 -r b459dde3d002 svn.rst
--- a/svn.rst	Fri Jan 22 15:04:49 2010 +0200
+++ b/svn.rst	Tue Jan 26 09:18:33 2010 +0200
@@ -1,7 +1,26 @@
 -*- outline -*-
 
+* Where palced config files?
+
+The per-user configuration area currently contains three files—two
+configuration files ('config' and 'servers').
+
+  /etc/subversion
+                Unix system wide configurations.
+  $HOME/.subversion
+                Unix per-user configuration area.
+  %APPDATA%\Subversion
+                Windows per-user configuration area.
+
+
 * Copy repo from SourceForge to GoogleCode.
 
   $ svnsync init https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
   $ svnsync --username NAME --password PASSWORD \
                 sync https://PROJ.googlecode.com/svn https://PROJ.svn.sourceforge.net/svnroot/PROJ
+
+* Disable interactive conflict resolution.
+
+Write in '$HOME/.subversion/config'
+
+  interactive-conflicts = no