# HG changeset patch
# User Josef "Jeff" Sipek <jeffpc@optonline.net>
# Date 1124337587 18000
# Node ID 5197fb9d65d5f858cffa91967fbc247a4b969a02
# Parent  87d40e085e08d17ffe0422fdcb35928fe581d091# Parent  1300271ba8dee502315bb8a3391e57f33c7f371f
Merge with MPM


diff --git a/doc/hg.1.txt b/doc/hg.1.txt
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -203,6 +203,8 @@ incoming [source]::
 
     Currently only local repositories are supported.
 
+    aliases: in
+
 init [dest]::
     Initialize a new repository in the given directory.  If the given
     directory does not exist, it is created.
@@ -262,6 +264,8 @@ outgoing [dest]::
     default push repo. These are the changesets that would be pushed
     if a push was requested.
 
+    aliases: out
+
 parents::
     Print the working directory's parent revisions.
 
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1312,7 +1312,7 @@ table = {
          [('p', 'strip', 1, 'path strip'),
           ('b', 'base', "", 'base path')],
          "hg import [-p NUM] [-b BASE] PATCH..."),
-    "incoming": (incoming, [], 'hg incoming [SOURCE]'),
+    "incoming|in": (incoming, [], 'hg incoming [SOURCE]'),
     "^init": (init, [], 'hg init [DEST]'),
     "locate":
         (locate,
@@ -1328,7 +1328,7 @@ table = {
           ('p', 'patch', None, 'show patch')],
          'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
     "manifest": (manifest, [], 'hg manifest [REV]'),
-    "outgoing": (outgoing, [], 'hg outgoing [DEST]'),
+    "outgoing|out": (outgoing, [], 'hg outgoing [DEST]'),
     "parents": (parents, [], 'hg parents [REV]'),
     "paths": (paths, [], 'hg paths [NAME]'),
     "^pull":
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
--- a/mercurial/hgweb.py
+++ b/mercurial/hgweb.py
@@ -558,7 +558,7 @@ class hgweb:
                 yield {"parity": parity,
                        "path": os.path.join(path, f),
                        "manifest": mnode,
-		       "basename": f[:-1]}
+                       "basename": f[:-1]}
                 parity = 1 - parity
         
         yield self.t("manifest",
@@ -738,7 +738,6 @@ def create_server(path, name, templates,
     if not address:
         address = u.config("web", "address", "")
     if not port:
-        print port
         port = int(u.config("web", "port", 8000))
     if not use_ipv6:
         use_ipv6 = u.configbool("web", "ipv6")
diff --git a/templates/changelog.tmpl b/templates/changelog.tmpl
diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl
diff --git a/templates/filelog.tmpl b/templates/filelog.tmpl
diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl
diff --git a/templates/manifest.tmpl b/templates/manifest.tmpl
diff --git a/templates/tags.tmpl b/templates/tags.tmpl