Merge branch 'master' into netstd20-support

BUILDING.md

@@ -36,5 +36,18 @@ Options:
     included which (should) build if you set up AppVeyer to track
     your fork. AppVeyer is free for open-source projects.
     (TODO: should have a link to the official AppVeyer build)
-- build via the CircleCI Windows image. There is included configuration for CircleCI.
-    CicleCI is free (with usage limitations) for open-source projects.
+
+## Updating the site
+
+Log4Net uses Maven to build the site. Source artifacts can be found under `src/site`.
+Building the site can be accomplished with `npm run build-site`. You should have maven
+installed:
+- Windows: get it from Scoop
+- OSX: get it from Homebrew
+- Linux: use your package manager
+
+The site will be generated in `target/site`, and can be viewed locally. Updates should
+be pushed to the `asf-staging` branch of [https://github.com/apache/logging-log4net-site](https://github.com/apache/logging-log4net-site])
+
+Once the site has been pushed to the `asf-staging` branch, it can be viewed at
+[http://logging.staged.apache.org/log4net](http://logging.staged.apache.org/log4net)

README.md

@@ -27,7 +27,6 @@ tracker is no longer accepting new issues but is available at
 https://issues.apache.org/jira/browse/LOG4NET for access to 
 previous issues. 
 
-
 Developing
 ==========
 
@@ -43,3 +42,5 @@ may be installed by using the bundled helper scripts:
 These scripts download the relevant installers from Microsoft servers,
 but you run them at your own risk.
 
+Please see [CONTRIBUTING.md](CONTRIBUTING.md) and 
+[BUILDING.md](BUILDING.md)

src/site/xdoc/download_log4net.xml

@@ -36,7 +36,7 @@ limitations under the License.
 
     </section>
 
-    <section name="log4net 2.0.8">
+    <section name="log4net 2.0.9">
 
       <subsection name="Source">
         <table>
@@ -52,14 +52,14 @@ limitations under the License.
         <p>Binaries are available in a zip file or nupkg, which is also available from <a href="https://www.nuget.org/packages/log4net/">nuget.org</a></p>
         <table>
           <tr>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip">log4net-2.0.8-bin-newkey.zip</a></td>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.sha512">sha512</a></td>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-binaries-2.0.9.zip.asc">pgp</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.9.zip">log4net-binaries-2.0.9.zip</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.9.zip.sha512">sha512</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-2.0.9.zip.asc">pgp</a></td>
           </tr>          
           <tr>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg">log4net-2.0.8-bin-newkey.zip</a></td>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.sha512">sha512</a></td>
-            <td><a href="https://downloads.apache.org/logging/binaries/log4net-2.0.9.nupkg.asc">pgp</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.9.nupkg">log4net-2.0.9.nupkg</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.9.nupkg.sha512">sha512</a></td>
+            <td><a href="https://downloads.apache.org/logging/log4net/binaries/apache-log4net.2.0.9.nupkg.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>