[roller] branch roller-6.0.x updated: Cleanup the docs directory.

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-6.0.x by this push:
     new 269736d  Cleanup the docs directory.
269736d is described below

commit 269736db9da31f8da3fc67f7d6f7d7f1045fd67a
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Fri May 8 16:23:15 2020 -0400

    Cleanup the docs directory.
---
 assembly-release/sign-release.sh                      |   2 +-
 docs/before-and-after/entries.png                     | Bin 1656714 -> 0 bytes
 docs/before-and-after/entry-edit.png                  | Bin 1764121 -> 0 bytes
 docs/before-and-after/main-menu.png                   | Bin 1402108 -> 0 bytes
 docs/before-and-after/media-file-view.png             | Bin 2194673 -> 0 bytes
 .../i18n/check-default-resource-file.py               |   0
 .../i18n/compare-vs-default-file.py                   |   0
 {docs/testing => testing}/junit-cleartables-mysql.sql |   0
 {docs/testing => testing}/roller-junit.properties     |   0
 {docs/testing => testing}/roller-load-test.jmx        |   0
 {docs/testing => testing}/test-plan.sxc               | Bin
 11 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 0f39725..1847d6d 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export rcstring="-rc-2"
+export rcstring=""
 export vstring="6.0.1"
 
 # for rc releases we rename the release files
diff --git a/docs/before-and-after/entries.png b/docs/before-and-after/entries.png
deleted file mode 100644
index 4a87986..0000000
Binary files a/docs/before-and-after/entries.png and /dev/null differ
diff --git a/docs/before-and-after/entry-edit.png b/docs/before-and-after/entry-edit.png
deleted file mode 100644
index fcea48e..0000000
Binary files a/docs/before-and-after/entry-edit.png and /dev/null differ
diff --git a/docs/before-and-after/main-menu.png b/docs/before-and-after/main-menu.png
deleted file mode 100644
index 8c8d7fa..0000000
Binary files a/docs/before-and-after/main-menu.png and /dev/null differ
diff --git a/docs/before-and-after/media-file-view.png b/docs/before-and-after/media-file-view.png
deleted file mode 100644
index c958976..0000000
Binary files a/docs/before-and-after/media-file-view.png and /dev/null differ
diff --git a/docs/examples/i18n/check-default-resource-file.py b/testing/i18n/check-default-resource-file.py
similarity index 100%
rename from docs/examples/i18n/check-default-resource-file.py
rename to testing/i18n/check-default-resource-file.py
diff --git a/docs/examples/i18n/compare-vs-default-file.py b/testing/i18n/compare-vs-default-file.py
similarity index 100%
rename from docs/examples/i18n/compare-vs-default-file.py
rename to testing/i18n/compare-vs-default-file.py
diff --git a/docs/testing/junit-cleartables-mysql.sql b/testing/junit-cleartables-mysql.sql
similarity index 100%
rename from docs/testing/junit-cleartables-mysql.sql
rename to testing/junit-cleartables-mysql.sql
diff --git a/docs/testing/roller-junit.properties b/testing/roller-junit.properties
similarity index 100%
rename from docs/testing/roller-junit.properties
rename to testing/roller-junit.properties
diff --git a/docs/testing/roller-load-test.jmx b/testing/roller-load-test.jmx
similarity index 100%
rename from docs/testing/roller-load-test.jmx
rename to testing/roller-load-test.jmx
diff --git a/docs/testing/test-plan.sxc b/testing/test-plan.sxc
similarity index 100%
rename from docs/testing/test-plan.sxc
rename to testing/test-plan.sxc