upstream/mercurial-mirror Commit - r19435:d3611374

doc: bump copyright year

Siddharth Agarwal -

r19435:d3611374 default

parent child

contrib/win32/ReadMe.html

0 +1 -1

             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
             <html>
               <head>
                 <title>Mercurial for Windows</title>
                 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
                 <style type="text/css">
                   <!--
                   html {
                     font-family: sans-serif;
                     margin: 1em 2em;
                   }
                   p {
                     margin-top: 0.5em;
                     margin-bottom: 0.5em;
                   }
                   pre {
                     margin: 0.25em 0em;
                     padding: 0.5em;
                     background-color: #EEE;
                     border: thin solid #CCC;
                   }
                   .indented {
                     padding-left: 10pt;
                   }
                   -->
                 </style>
               </head>
               <body>
                 <h1>Mercurial for Windows</h1>
                 <p>Welcome to Mercurial for Windows!</p>
                 <p>
                   Mercurial is a command-line application. You must run it from
                   the Windows command prompt (or if you're hard core, a <a
                   href="http://www.mingw.org/">MinGW</a> shell).
                 </p>
                 <p class="indented">
                   <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a>
                   msys startup script uses rxvt which has problems setting up
                   standard input and output. Running bash directly works
                   correctly.</i>
                 </p>
                 <p>
                   For documentation, please visit the <a
                   href="http://mercurial.selenic.com/">Mercurial web site</a>.
                   You can also download a free book, <a
                   href="http://hgbook.red-bean.com/">Mercurial: The Definitive
                   Guide</a>.
                 </p>
                 <p>
                   By default, Mercurial installs to <tt>C:\Program
                   Files\Mercurial</tt>. The Mercurial command is called
                   <tt>hg.exe</tt>.
                 </p>
                 <h1>Testing Mercurial after you've installed it</h1>
                 <p>
                   The easiest way to check that Mercurial is installed properly is
                   to just type the following at the command prompt:
                 </p>
                 <pre>
             hg
             </pre>
                 <p>
                   This command should print a useful help message. If it does,
                   other Mercurial commands should work fine for you.
                 </p>
                 <h1>Configuration notes</h1>
                 <h4>Default editor</h4>
                 <p>
                   The default editor for commit messages is 'notepad'. You can set
                   the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable
                   to specify your preference or set it in <tt>mercurial.ini</tt>:
                 </p>
                 <pre>
             [ui]
             editor = whatever
             </pre>
                 <h4>Configuring a Merge program</h4>
                 <p>
                   It should be emphasized that Mercurial by itself doesn't attempt
                   to do a Merge at the file level, neither does it make any
                   attempt to Resolve the conflicts.
                 </p>
                 <p>
                   By default, Mercurial will use the merge program defined by the
                   <tt>HGMERGE</tt> environment variable, or uses the one defined
                   in the <tt>mercurial.ini</tt> file. (see <a
                   href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a>
                   on the Mercurial Wiki for more information)
                 </p>
                 <h1>Reporting problems</h1>
                 <p>
                   Before you report any problems, please consult the <a
                   href="http://mercurial.selenic.com/">Mercurial web site</a>
                   and see if your question is already in our list of <a
                   href="http://mercurial.selenic.com/wiki/FAQ">Frequently
                   Answered Questions</a> (the "FAQ").
                 </p>
                 <p>
                   If you cannot find an answer to your question, please feel free
                   to send mail to the Mercurial mailing list, at <a
                   href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
                   <b>Remember</b>, the more useful information you include in your
                   report, the easier it will be for us to help you!
                 </p>
                 <p>
                   If you are IRC-savvy, that's usually the fastest way to get
                   help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>.
                 </p>
                 <h1>Author and copyright information</h1>
                 <p>
                   Mercurial was written by <a href="http://www.selenic.com">Matt
                   Mackall</a>, and is maintained by Matt and a team of volunteers.
                 </p>
                 <p>
                   The Windows installer was written by <a
                   href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
                 </p>
                 <p>
-                  Mercurial is Copyright 2005-2012 Matt Mackall and others. See
+                  Mercurial is Copyright 2005-2013 Matt Mackall and others. See
                   the <tt>Contributors.txt</tt> file for a list of contributors.
                 </p>
                 <p>
                   Mercurial is free software; you can redistribute it and/or
                   modify it under the terms of the <a
                   href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
                   General Public License version 2</a> or any later version.
                 </p>
                 <p>
                   Mercurial is distributed in the hope that it will be useful, but
                   <b>without any warranty</b>; without even the implied warranty
                   of <b>merchantability</b> or <b>fitness for a particular
                   purpose</b>. See the GNU General Public License for more
                   details.
                 </p>
               </body>
             </html>

mercurial/help/hg.1.txt

0 +1 -1

             ====
              hg
             ====
             ---------------------------------------
             Mercurial source code management system
             ---------------------------------------
             :Author:         Matt Mackall <mpm@selenic.com>
             :Organization:   Mercurial
             :Manual section: 1
             :Manual group:   Mercurial Manual
             .. contents::
                :backlinks: top
                :class: htmlonly
                :depth: 1
             Synopsis
             """"""""
             **hg** *command* [*option*]... [*argument*]...
             Description
             """""""""""
             The **hg** command provides a command line interface to the Mercurial
             system.
             Command Elements
             """"""""""""""""
             files...
                 indicates one or more filename or relative path filenames; see
                 `File Name Patterns`_ for information on pattern matching
             path
                 indicates a path on the local machine
             revision
                 indicates a changeset which can be specified as a changeset
                 revision number, a tag, or a unique substring of the changeset
                 hash value
             repository path
                 either the pathname of a local repository or the URI of a remote
                 repository.
             .. include:: hg.1.gendoc.txt
             Files
             """""
             ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc``
                 This file contains defaults and configuration. Values in
                 ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override
                 settings made in the global ``/etc/mercurial/hgrc`` configuration.
                 See |hgrc(5)|_ for details of the contents and format of these
                 files.
             ``.hgignore``
                 This file contains regular expressions (one per line) that
                 describe file names that should be ignored by **hg**. For details,
                 see |hgignore(5)|_.
             ``.hgsub``
                 This file defines the locations of all subrepositories, and
                 tells where the subrepository checkouts came from. For details, see
                 :hg:`help subrepos`.
             ``.hgsubstate``
                 This file is where Mercurial stores all nested repository states. *NB: This
                 file should not be edited manually.*
             ``.hgtags``
                 This file contains changeset hash values and text tag names (one
                 of each separated by spaces) that correspond to tagged versions of
                 the repository contents. The file content is encoded using UTF-8.
             ``.hg/last-message.txt``
                 This file is used by :hg:`commit` to store a backup of the commit message
                 in case the commit fails.
             ``.hg/localtags``
                 This file can be used to define local tags which are not shared among
                 repositories. The file format is the same as for ``.hgtags``, but it is
                 encoded using the local system encoding.
             Some commands (e.g. revert) produce backup files ending in ``.orig``,
             if the ``.orig`` file already exists and is not tracked by Mercurial,
             it will be overwritten.
             Bugs
             """"
             Probably lots, please post them to the mailing list (see Resources_
             below) when you find them.
             See Also
             """"""""
             |hgignore(5)|_, |hgrc(5)|_
             Author
             """"""
             Written by Matt Mackall <mpm@selenic.com>
             Resources
             """""""""
             Main Web Site: http://mercurial.selenic.com/
             Source code repository: http://selenic.com/hg
             Mailing list: http://selenic.com/mailman/listinfo/mercurial
             Copying
             """""""
-            Copyright (C) 2005-2012 Matt Mackall.
+            Copyright (C) 2005-2013 Matt Mackall.
             Free use of this software is granted under the terms of the GNU General
             Public License version 2 or any later version.
             .. include:: common.txt

mercurial/help/hgignore.5.txt

0 +1 -1

             ==========
              hgignore
             ==========
             ---------------------------------
             syntax for Mercurial ignore files
             ---------------------------------
             :Author:         Vadim Gelfer <vadim.gelfer@gmail.com>
             :Organization:   Mercurial
             :Manual section: 5
             :Manual group:   Mercurial Manual
             .. include:: hgignore.5.gendoc.txt
             Author
             ======
             Vadim Gelfer <vadim.gelfer@gmail.com>
             Mercurial was written by Matt Mackall <mpm@selenic.com>.
             See Also
             ========
             |hg(1)|_, |hgrc(5)|_
             Copying
             =======
             This manual page is copyright 2006 Vadim Gelfer.
-            Mercurial is copyright 2005-2012 Matt Mackall.
+            Mercurial is copyright 2005-2013 Matt Mackall.
             Free use of this software is granted under the terms of the GNU General
             Public License version 2 or any later version.
             .. include:: common.txt

mercurial/help/hgrc.5.txt

0 +1 -1

             ======
              hgrc
             ======
             ---------------------------------
             configuration files for Mercurial
             ---------------------------------
             :Author:         Bryan O'Sullivan <bos@serpentine.com>
             :Organization:   Mercurial
             :Manual section: 5
             :Manual group:   Mercurial Manual
             .. contents::
                :backlinks: top
                :class: htmlonly
             Description
             ===========
             .. include:: hgrc.5.gendoc.txt
             Author
             ======
             Bryan O'Sullivan <bos@serpentine.com>.
             Mercurial was written by Matt Mackall <mpm@selenic.com>.
             See Also
             ========
             |hg(1)|_, |hgignore(5)|_
             Copying
             =======
             This manual page is copyright 2005 Bryan O'Sullivan.
-            Mercurial is copyright 2005-2012 Matt Mackall.
+            Mercurial is copyright 2005-2013 Matt Mackall.
             Free use of this software is granted under the terms of the GNU General
             Public License version 2 or any later version.
             .. include:: common.txt

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages