You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/12/07 20:17:46 UTC
[03/14] celix-site git commit: update fork
update fork
Project: http://git-wip-us.apache.org/repos/asf/celix-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix-site/commit/f9a9dcbc
Tree: http://git-wip-us.apache.org/repos/asf/celix-site/tree/f9a9dcbc
Diff: http://git-wip-us.apache.org/repos/asf/celix-site/diff/f9a9dcbc
Branch: refs/heads/asf-site
Commit: f9a9dcbc5797f829047edfd3e30c5bb54e35af1a
Parents: 404ed81 7e241a0
Author: ESmink <ed...@nl.thalesgroup.com>
Authored: Tue Nov 21 12:53:27 2017 +0100
Committer: ESmink <ed...@nl.thalesgroup.com>
Committed: Tue Nov 21 12:53:27 2017 +0100
----------------------------------------------------------------------
.gitmodules | 3 +
README.md | 15 ++++-
build.py | 6 +-
celix/documentation/fivetwoone | 12 ----
celix/documentation/index.md | 14 ----
celix/documentation/seventwozero | 11 ----
celix/importFile | 3 -
celix/nineeightfive | 10 ---
site/contributing.html | 118 ++++++++++++++++++++++++++++++++++
site/doc/one/file_one.html | 0
site/doc/two/file_three.html | 0
site/doc/two/file_two.html | 0
src/markdown/contributing.md | 5 ++
13 files changed, 144 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix-site/blob/f9a9dcbc/build.py
----------------------------------------------------------------------
diff --cc build.py
index e9bd8f2,5bb0238..fabb410
--- a/build.py
+++ b/build.py
@@@ -55,11 -55,9 +55,15 @@@ if not os.path.exists(out)
#register site markdown
for f in os.listdir(markdown):
ref[markdown + '/' + f] = f[:-3] + '.html'
+ref[celixIndex + '/index.md'] = 'doc/index.html'
#read index document
++<<<<<<< HEAD
+with open(celixIndex + '/index.md') as f:
+ docT = '<div id=docTable><table>'
++=======
+ with open(celixIndex) as f:
++>>>>>>> upstream/asf-site
for line in f:
if(line[0] is '#' and line[1] is '#'):
if(line[2] != '#'):