Merge pull request #23 from jenmalloy/fix-build-errors

fix build errors

buildGuide.sh

@@ -0,0 +1,69 @@
+# Build the guide
+
+# Find the directory name and full path
+CURRENT_GUIDE=${PWD##*/}
+CURRENT_DIRECTORY=$(pwd)
+
+usage(){
+  cat <<EOM
+USAGE: $0 [OPTION]
+
+DESCRIPTION: Build the documentation in this directory.
+
+OPTIONS:
+  -h       Print help.
+
+EOM
+}
+
+while getopts "ht:" c
+ do
+     case "$c" in
+       h)         usage
+                  exit 1;;
+       \?)        echo "Unknown option: -$OPTARG." >&2
+                  usage
+                  exit 1;;
+     esac
+done
+
+if [ ! -d target ]; then
+   echo "You must run 'python gitlab-conversion.py' to convert the content before you run this script."
+   exit
+fi
+
+# Remove the html and build directories and then recreate the html/images/ directory
+if [ -d target/html ]; then
+-   rm -r target/html/
+fi
+if [ -d target/html ]; then
+   rm -r target/html/
+fi
+
+mkdir -p html
+cp -r target/images/ target/html/
+
+echo ""
+echo "********************************************"
+echo " Building $CURRENT_GUIDE                "
+echo "********************************************"
+echo ""
+echo "Building an asciidoctor version of the guide"
+asciidoctor -t -dbook -a toc -o target/html/$CURRENT_GUIDE.html target/master.adoc
+
+echo ""
+echo "Building a ccutil version of the guide"
+ccutil compile --lang en_US --format html-single --main-file target/master.adoc
+
+cd ..
+
+echo "View the asciidoctor build here: " file://$CURRENT_DIRECTORY/target/html/$CURRENT_GUIDE.html
+
+if [ -d  $CURRENT_DIRECTORY/build/tmp/en-US/html-single/ ]; then
+  echo "View the ccutil build here: " file://$CURRENT_DIRECTORY/build/tmp/en-US/html-single/index.html
+  exit 0
+else
+  echo -e "${RED}Build using ccutil failed!"
+  echo -e "${BLACK}See the log above for details."
+  exit 1
+fi

topics/proxy.adoc

@@ -146,7 +146,7 @@ error-page::
 adapter-config::
   _REQUIRED._.
   Same configuration as any other {{book.project.name}} adapter.
-  See <<_adapter_config,Adapter Config>>                                        
+// See <<_adapter_config,Adapter Config>>                                        
 
 ==== Constraint Config
 
@@ -158,9 +158,11 @@ More specific constraints will take precedence over more general ones.
 
 pattern::
   URL pattern to match relative to the base-path of the application.
-  Must start with '/' _REQUIRED._.
+  Must start with '/' _REQUIRED._
   You may only have one wildcard and it must come at the end of the pattern.
-  Valid `/foo/bar/*` and  `/foo/*.txt`                                    Not valid: `/*/foo/*`. 
+  
+  * Valid: [x-]`/foo/bar/*` and  [x-]`/foo/*.txt`
+  * Not valid: [x-]`/*/foo/*`. 
 
 roles-allowed::
   Array of strings of roles allowed to access this url pattern. _OPTIONAL._. 
@@ -228,6 +230,7 @@ KEYCLOAK_NAME::
 KEYCLOAK_ACCESS_TOKEN::
   Send the access token in this header if the proxy was configured to send it.
   This token can be used to make bearer token requests.             Header field names can be configured using a map of `header-names` in configuration file: 
++
 [source]
 ----