contrib/win32/ReadMe.html
changeset 8438 c1ad221a0e97
parent 8437 dbfe321643ce
child 8439 7327f24bfef3
equal deleted inserted replaced
8437:dbfe321643ce 8438:c1ad221a0e97
    16   <body>
    16   <body>
    17     <h1>Mercurial for Windows</h1>
    17     <h1>Mercurial for Windows</h1>
    18 
    18 
    19     <p>Welcome to Mercurial for Windows!</p>
    19     <p>Welcome to Mercurial for Windows!</p>
    20 
    20 
    21     <p>Mercurial is a command-line application.  You must run it from
    21     <p>
       
    22       Mercurial is a command-line application. You must run it from
    22       the Windows command prompt (or if you're hard core, a <a
    23       the Windows command prompt (or if you're hard core, a <a
    23       href="http://www.mingw.org/">MinGW</a> shell).</p>
    24       href="http://www.mingw.org/">MinGW</a> shell).
       
    25     </p>
    24 
    26 
    25     <p class="indented"><i>Note: the standard <a
    27     <p class="indented">
    26       href="http://www.mingw.org/">MinGW</a> msys startup script uses
    28       <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a>
    27       rxvt which has problems setting up standard input and output.
    29       msys startup script uses rxvt which has problems setting up
    28       Running bash directly works correctly.</i></p>
    30       standard input and output. Running bash directly works
       
    31       correctly.</i>
       
    32     </p>
    29 
    33 
    30     <p>For documentation, please visit the <a
    34     <p>
       
    35       For documentation, please visit the <a
    31       href="http://www.selenic.com/mercurial">Mercurial web site</a>.
    36       href="http://www.selenic.com/mercurial">Mercurial web site</a>.
    32       You can also download a free book, <a
    37       You can also download a free book, <a
    33       href="http://hgbook.red-bean.com/">Distributed revision control
    38       href="http://hgbook.red-bean.com/">Distributed revision control
    34       with Mercurial</a>.</p>
    39       with Mercurial</a>.
       
    40     </p>
    35 
    41 
    36     <p>By default, Mercurial installs to <tt>C:\Program Files\Mercurial</tt>.  The
    42     <p>
    37       Mercurial command is called <tt>hg.exe</tt>.</p>
    43       By default, Mercurial installs to <tt>C:\Program
       
    44       Files\Mercurial</tt>. The Mercurial command is called
       
    45       <tt>hg.exe</tt>.
       
    46     </p>
    38 
    47 
    39     <h1>Testing Mercurial after you've installed it</h1>
    48     <h1>Testing Mercurial after you've installed it</h1>
    40 
    49 
    41     <p>The easiest way to check that Mercurial is installed properly is to
    50     <p>
    42       just type the following at the command prompt:</p>
    51       The easiest way to check that Mercurial is installed properly is
       
    52       to just type the following at the command prompt:
       
    53     </p>
    43 
    54 
    44     <pre>
    55     <pre>
    45 hg
    56 hg
    46 </pre>
    57 </pre>
    47 
    58 
    48     <p>This command should print a useful help message.  If it does,
    59     <p>
    49       other Mercurial commands should work fine for you.</p>
    60       This command should print a useful help message. If it does,
       
    61       other Mercurial commands should work fine for you.
       
    62     </p>
    50 
    63 
    51     <h1>Configuration notes</h1>
    64     <h1>Configuration notes</h1>
    52 	<h4>Default editor</h4>
    65     <h4>Default editor</h4>
    53        <p>The default editor for commit messages is 'notepad'. You can set the EDITOR
    66     <p>
    54     (or HGEDITOR) environment variable to specify your preference or set it in
    67       The default editor for commit messages is 'notepad'. You can set
    55     mercurial.ini:</p>
    68       the EDITOR (or HGEDITOR) environment variable to specify your
       
    69       preference or set it in mercurial.ini:
       
    70     </p>
    56     <pre>
    71     <pre>
    57 [ui]
    72 [ui]
    58 editor = whatever
    73 editor = whatever
    59 </pre>
    74 </pre>
    60 
    75 
    61 	<h4>Configuring a Merge program</h4>
    76     <h4>Configuring a Merge program</h4>
    62         <p>It should be emphasized that Mercurial by itself doesn't attempt to do a
    77     <p>
    63 	Merge at the file level, neither does it make any attempt to Resolve the conflicts.</p>
    78       It should be emphasized that Mercurial by itself doesn't attempt
       
    79       to do a Merge at the file level, neither does it make any
       
    80       attempt to Resolve the conflicts.
       
    81     </p>
    64 
    82 
    65     <p>By default, Mercurial will use the merge program defined by the HGMERGE environment
    83     <p>
    66     variable, or uses the one defined in the mercurial.ini file. (see <a href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a> on the Mercurial Wiki for more information)</p>
    84       By default, Mercurial will use the merge program defined by the
       
    85       HGMERGE environment variable, or uses the one defined in the
       
    86       mercurial.ini file. (see <a
       
    87       href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a>
       
    88       on the Mercurial Wiki for more information)
       
    89     </p>
    67 
    90 
    68     <h1>Reporting problems</h1>
    91     <h1>Reporting problems</h1>
    69 
    92 
    70     <p>Before you report any problems, please consult the <a
    93     <p>
    71 	href="http://www.selenic.com/mercurial">Mercurial web site</a> and
    94       Before you report any problems, please consult the <a
    72       see if your question is already in our list of <a
    95       href="http://www.selenic.com/mercurial">Mercurial web site</a>
    73 	href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently
    96       and see if your question is already in our list of <a
    74 	Answered Questions</a> (the "FAQ").</p>
    97       href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently
       
    98       Answered Questions</a> (the "FAQ").
       
    99     </p>
    75 
   100 
    76     <p>If you cannot find an answer to your question, please feel
   101     <p>
    77       free to send mail to the Mercurial mailing list, at <a
   102       If you cannot find an answer to your question, please feel free
    78 	href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
   103       to send mail to the Mercurial mailing list, at <a
       
   104       href="mailto:mercurial@selenic.com">mercurial@selenic.com</a>.
    79       <b>Remember</b>, the more useful information you include in your
   105       <b>Remember</b>, the more useful information you include in your
    80       report, the easier it will be for us to help you!</p>
   106       report, the easier it will be for us to help you!
       
   107     </p>
    81 
   108 
    82     <p>If you are IRC-savvy, that's usually the fastest way to get
   109     <p>
    83       help.  Go to <tt>#mercurial</tt> on
   110       If you are IRC-savvy, that's usually the fastest way to get
    84       <tt>irc.freenode.net</tt>.</p>
   111       help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>.
       
   112     </p>
    85 
   113 
    86     <h1>Author and copyright information</h1>
   114     <h1>Author and copyright information</h1>
    87 
   115 
    88     <p>Mercurial was written by <a href="http://www.selenic.com">Matt
   116     <p>
    89 	Mackall</a>, and is maintained by Matt and a team of
   117       Mercurial was written by <a href="http://www.selenic.com">Matt
    90 	volunteers.</p>
   118       Mackall</a>, and is maintained by Matt and a team of volunteers.
       
   119     </p>
    91 
   120 
    92     <p>The Windows installer was written by <a
   121     <p>
    93 	href="http://www.serpentine.com/blog">Bryan
   122       The Windows installer was written by <a
    94 	O'Sullivan</a>.</p>
   123       href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
       
   124     </p>
    95 
   125 
    96     <p>Mercurial is Copyright 2005-2009 Matt Mackall and others.
   126     <p>
    97 	See the <tt>Contributors.txt</tt> file for a list of contributors.</p>
   127       Mercurial is Copyright 2005-2009 Matt Mackall and others. See
       
   128       the <tt>Contributors.txt</tt> file for a list of contributors.
       
   129     </p>
    98 
   130 
    99     <p>Mercurial is free software; you can redistribute it and/or
   131     <p>
       
   132       Mercurial is free software; you can redistribute it and/or
   100       modify it under the terms of the <a
   133       modify it under the terms of the <a
   101        href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
   134       href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
   102       General Public License version 2</a> as published by the Free
   135       General Public License version 2</a> as published by the Free
   103       Software Foundation.</p>
   136       Software Foundation.
       
   137     </p>
   104 
   138 
   105     <p>Mercurial is distributed in the hope that it will be useful,
   139     <p>
   106       but <b>without any warranty</b>; without even the implied
   140       Mercurial is distributed in the hope that it will be useful, but
   107       warranty of <b>merchantability</b> or <b>fitness for a
   141       <b>without any warranty</b>; without even the implied warranty
   108       particular purpose</b>.  See the GNU General Public License for
   142       of <b>merchantability</b> or <b>fitness for a particular
   109       more details.</p>
   143       purpose</b>. See the GNU General Public License for more
       
   144       details.
       
   145     </p>
   110   </body>
   146   </body>
   111 </html>
   147 </html>