[107861] branches/release_2_2/base/doc

[larryv at macports.org]

Revision: 107861
          https://trac.macports.org/changeset/107861
Author:   larryv at macports.org
Date:     2013-07-07 14:00:00 -0700 (Sun, 07 Jul 2013)
Log Message:
-----------
Merge base/doc from trunk.
- r107129: archive_sites.conf: Restore suggestion for disabling default
  archive source.
- r107860: macports.conf.in: Fix typo.

Revision Links:
--------------
    https://trac.macports.org/changeset/107129
    https://trac.macports.org/changeset/107860

Modified Paths:
--------------
    branches/release_2_2/base/doc/archive_sites.conf
    branches/release_2_2/base/doc/macports.conf.in

Property Changed:
----------------
    branches/release_2_2/base/doc/


Property changes on: branches/release_2_2/base/doc
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base/doc:37343-46937
/branches/gsoc09-logging/base/doc:51231-60371
/branches/gsoc11-rev-upgrade/base/doc:78828-88375
/branches/universal-sanity/base/doc:51872-52323
/branches/variant-descs-14482/base/doc:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/doc:106800-107097,107127
/users/perry/base-bugs_and_notes/doc:45682-46060
/users/perry/base-select/doc:44044-44692
   + /branches/gsoc08-privileges/base/doc:37343-46937
/branches/gsoc09-logging/base/doc:51231-60371
/branches/gsoc11-rev-upgrade/base/doc:78828-88375
/branches/universal-sanity/base/doc:51872-52323
/branches/variant-descs-14482/base/doc:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base/doc:106800-107860
/users/perry/base-bugs_and_notes/doc:45682-46060
/users/perry/base-select/doc:44044-44692

Modified: branches/release_2_2/base/doc/archive_sites.conf
===================================================================
--- branches/release_2_2/base/doc/archive_sites.conf	2013-07-07 20:44:34 UTC (rev 107860)
+++ branches/release_2_2/base/doc/archive_sites.conf	2013-07-07 21:00:00 UTC (rev 107861)
@@ -38,3 +38,7 @@
 #type               	zip
 #prefix             	/opt/mysource
 #applications_dir   	/opt/mysource/Applications
+
+# To disable the default archive source, uncomment the following dummy
+# entry; it will shadow the one from the ports tree.
+#name               	macports_archives

Modified: branches/release_2_2/base/doc/macports.conf.in
===================================================================
--- branches/release_2_2/base/doc/macports.conf.in	2013-07-07 20:44:34 UTC (rev 107860)
+++ branches/release_2_2/base/doc/macports.conf.in	2013-07-07 21:00:00 UTC (rev 107861)
@@ -163,7 +163,7 @@
 # variables to MacPorts.)
 #proxy_override_env 	no
 
-# Proxies. These have no default values. The analagous environment
+# Proxies. These have no default values. The analogous environment
 # variables are "http_proxy", "HTTPS_PROXY", "FTP_PROXY", and
 # "RSYNC_PROXY".
 #proxy_http         	proxy1:12345
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130707/62f92e99/attachment.html>