<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch release-2.5
in repository macports-guide.

</pre>
<p><a href="https://github.com/macports/macports-guide/commit/748003836f40b3ae5e657ba8bae1f9e2fa53f540">https://github.com/macports/macports-guide/commit/748003836f40b3ae5e657ba8bae1f9e2fa53f540</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 748003836f40b3ae5e657ba8bae1f9e2fa53f540
</span>Merge: 7a24b76 c51b45a
Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon May 28 15:11:11 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    Merge branch 'master' of https://github.com/macports/macports-guide into release-2.5
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/56546
</span>
 .gitignore                            |    3 +-
 .travis.yml                           |   14 +-
 Makefile                              |   61 +-
 README                                |   12 -
 README.md                             |   56 +
 guide/adoc/README.md                  |  117 +++
 guide/adoc/glossary.adoc              |  477 +++++++++
 guide/adoc/guide.adoc                 |   62 ++
 guide/adoc/installing.adoc            |  419 ++++++++
 guide/adoc/internals-hier.adoc        |  374 +++++++
 guide/adoc/internals-tests.adoc       |  206 ++++
 guide/adoc/internals.adoc             |  257 +++++
 guide/adoc/intro.adoc                 |   50 +
 guide/adoc/macports.conf.adoc         |  238 +++++
 guide/adoc/macros.adoc                |   15 +
 guide/adoc/portfile-dependencies.adoc |   76 ++
 guide/adoc/portfile-keywords.adoc     |  221 ++++
 guide/adoc/portfile-livecheck.adoc    |  123 +++
 guide/adoc/portfile-phase.adoc        | 1855 +++++++++++++++++++++++++++++++++
 guide/adoc/portfile-startupitem.adoc  |  311 ++++++
 guide/adoc/portfile-tcl.adoc          |  169 +++
 guide/adoc/portfile-variables.adoc    |   73 ++
 guide/adoc/portfile-variants.adoc     |  146 +++
 guide/adoc/portfiledev.adoc           |  970 +++++++++++++++++
 guide/adoc/portfileref.adoc           |  111 ++
 guide/adoc/portgroup-github.adoc      |  118 +++
 guide/adoc/portgroup-gnustep.adoc     |  117 +++
 guide/adoc/portgroup-haskell.adoc     |   60 ++
 guide/adoc/portgroup-perl.adoc        |   68 ++
 guide/adoc/portgroup-python.adoc      |  136 +++
 guide/adoc/portgroup-ruby.adoc        |   24 +
 guide/adoc/portgroup-xcode.adoc       |  164 +++
 guide/adoc/portgroups.adoc            |   41 +
 guide/adoc/project.adoc               |  631 +++++++++++
 guide/adoc/using.adoc                 | 1555 +++++++++++++++++++++++++++
 guide/resources/chunk.xsl             |    2 +-
 guide/resources/single-page.xsl       |    2 +-
 guide/xml/glossary.xml                |    2 +-
 guide/xml/guide.xml                   |    6 +-
 guide/xml/installing.xml              |   18 +-
 guide/xml/internals-hier.xml          |    2 +-
 guide/xml/internals-tests.xml         |    2 +-
 guide/xml/internals.xml               |    2 +-
 guide/xml/intro.xml                   |    2 +-
 guide/xml/macports.conf.xml           |    2 +-
 guide/xml/macros.xml                  |    2 +-
 guide/xml/portfile-dependencies.xml   |    2 +-
 guide/xml/portfile-keywords.xml       |    2 +-
 guide/xml/portfile-livecheck.xml      |    2 +-
 guide/xml/portfile-phase.xml          |    8 +-
 guide/xml/portfile-startupitem.xml    |   15 +-
 guide/xml/portfile-tcl.xml            |    8 +-
 guide/xml/portfile-variables.xml      |    2 +-
 guide/xml/portfile-variants.xml       |    5 +-
 guide/xml/portfiledev.xml             |    2 +-
 guide/xml/portfileref.xml             |    2 +-
 guide/xml/portgroup-github.xml        |    2 +-
 guide/xml/portgroup-gnustep.xml       |    2 +-
 guide/xml/portgroup-haskell.xml       |    2 +-
 guide/xml/portgroup-perl.xml          |    2 +-
 guide/xml/portgroup-python.xml        |    2 +-
 guide/xml/portgroup-ruby.xml          |    2 +-
 guide/xml/portgroup-xcode.xml         |    2 +-
 guide/xml/portgroups.xml              |    2 +-
 guide/xml/project.xml                 |  152 +--
 guide/xml/using.xml                   |    8 +-
 66 files changed, 9407 insertions(+), 189 deletions(-)

</pre><pre style='margin:0'>

</pre>